diff --git a/.github/actions/install-swift/action.yml b/.github/actions/install-swift/action.yml
index d6fbcc969..c2803206c 100644
--- a/.github/actions/install-swift/action.yml
+++ b/.github/actions/install-swift/action.yml
@@ -32,6 +32,12 @@ runs:
         zlib1g-dev
         curl
 
+    # Keep the toolchain's `<root>/usr/bin` layout intact. Flattening it into
+    # /usr/local breaks toolchain discovery in the swiftbuild build system,
+    # which derives the toolchain root by stripping `usr/bin` from `swiftc`.
     - name: Install Swift
       shell: bash
-      run: curl -fL ${{ inputs.download-url }} | sudo tar xfz - --strip-components=2 -C /usr/local
+      run: |
+        sudo mkdir -p /opt/swift
+        curl -fL ${{ inputs.download-url }} | sudo tar xfz - --strip-components=1 -C /opt/swift
+        echo "/opt/swift/usr/bin" >> "$GITHUB_PATH"
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index baba9c79b..a9e90c175 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -12,35 +12,33 @@ jobs:
     strategy:
       matrix:
         entry:
-          - os: ubuntu-22.04
-            toolchain:
-              download-url: https://download.swift.org/swift-6.1-release/ubuntu2204/swift-6.1-RELEASE/swift-6.1-RELEASE-ubuntu22.04.tar.gz
-            wasi-backend: Node
-            target: "wasm32-unknown-wasi"
-            env: |
-              JAVASCRIPTKIT_DISABLE_TRACING_TRAIT=1
           - os: ubuntu-24.04
             toolchain:
-              download-url: https://download.swift.org/development/ubuntu2404/swift-DEVELOPMENT-SNAPSHOT-2025-12-01-a/swift-DEVELOPMENT-SNAPSHOT-2025-12-01-a-ubuntu24.04.tar.gz
+              download-url: https://download.swift.org/development/ubuntu2404/swift-DEVELOPMENT-SNAPSHOT-2026-08-11-a/swift-DEVELOPMENT-SNAPSHOT-2026-08-11-a-ubuntu24.04.tar.gz
             wasi-backend: Node
             target: "wasm32-unknown-wasip1"
+            build-system: swiftbuild
+            env: |
+              JAVASCRIPTKIT_DISABLE_TRACING_TRAIT=1
           - os: ubuntu-24.04
             toolchain:
               download-url: https://download.swift.org/swift-6.3-branch/ubuntu2404/swift-6.3-DEVELOPMENT-SNAPSHOT-2026-03-05-a/swift-6.3-DEVELOPMENT-SNAPSHOT-2026-03-05-a-ubuntu24.04.tar.gz
             wasi-backend: Node
             target: "wasm32-unknown-wasip1"
+            build-system: native
           - os: ubuntu-22.04
             toolchain:
-              download-url: https://download.swift.org/development/ubuntu2204/swift-DEVELOPMENT-SNAPSHOT-2025-12-01-a/swift-DEVELOPMENT-SNAPSHOT-2025-12-01-a-ubuntu22.04.tar.gz
+              download-url: https://download.swift.org/development/ubuntu2204/swift-DEVELOPMENT-SNAPSHOT-2026-08-11-a/swift-DEVELOPMENT-SNAPSHOT-2026-08-11-a-ubuntu22.04.tar.gz
             wasi-backend: Node
             target: "wasm32-unknown-wasip1-threads"
+            build-system: swiftbuild
 
     runs-on: ${{ matrix.entry.os }}
     env:
       JAVASCRIPTKIT_WASI_BACKEND: ${{ matrix.entry.wasi-backend }}
     steps:
       - name: Checkout
-        uses: actions/checkout@v6
+        uses: actions/checkout@v7
       - name: Export matrix env
         if: ${{ matrix.entry.env != '' && matrix.entry.env != null }}
         run: |
@@ -59,7 +57,8 @@ jobs:
           echo "SWIFT_SDK_ID=${{ steps.setup-swiftwasm.outputs.swift-sdk-id }}" >> $GITHUB_ENV
           echo "SWIFT_BIN_PATH=$(dirname $(which swiftc))" >> $GITHUB_ENV
       - run: make bootstrap
-      - run: make unittest
+      - run: npm run test:runtime
+      - run: make unittest BUILD_SYSTEM=${{ matrix.entry.build-system }}
         # Skip unit tests with uwasi because its proc_exit throws
         # unhandled promise rejection.
         if: ${{ matrix.entry.wasi-backend != 'MicroWASI' }}
@@ -77,19 +76,15 @@ jobs:
     strategy:
       matrix:
         entry:
-          - image: "swift:6.1.2"
-            swift-syntax-version: "601.0.0"
-          - image: "swift:6.2"
-            swift-syntax-version: "602.0.0"
           - image: "swift:6.3"
             swift-syntax-version: "603.0.0"
     runs-on: ubuntu-latest
     container:
       image: ${{ matrix.entry.image }}
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v7
       - name: Setup Node.js
-        uses: actions/setup-node@v6
+        uses: actions/setup-node@v7
         with:
           node-version: '20'
       - name: Install TypeScript
@@ -110,10 +105,10 @@ jobs:
       matrix:
         include:
           - os: macos-15
-            xcode: Xcode_16.4
+            xcode: Xcode_26.0.1
     runs-on: ${{ matrix.os }}
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v7
       - run: swift build --product BridgeJSTool
         env:
           DEVELOPER_DIR: /Applications/${{ matrix.xcode }}.app/Contents/Developer/
@@ -124,8 +119,8 @@ jobs:
   prettier:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v6
-      - uses: actions/setup-node@v6
+      - uses: actions/checkout@v7
+      - uses: actions/setup-node@v7
         with:
           node-version: '20'
       - run: npm install
@@ -134,9 +129,9 @@ jobs:
   format:
     runs-on: ubuntu-latest
     container:
-      image: swift:6.1.2
+      image: swift:6.3
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v7
       - run: ./Utilities/format.swift
       - name: Check for formatting changes
         run: |
@@ -149,10 +144,10 @@ jobs:
   check-bridgejs-generated:
     runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v7
       - uses: ./.github/actions/install-swift
         with:
-          download-url: https://download.swift.org/development/ubuntu2204/swift-DEVELOPMENT-SNAPSHOT-2025-09-14-a/swift-DEVELOPMENT-SNAPSHOT-2025-09-14-a-ubuntu22.04.tar.gz
+          download-url: https://download.swift.org/development/ubuntu2204/swift-DEVELOPMENT-SNAPSHOT-2026-08-11-a/swift-DEVELOPMENT-SNAPSHOT-2026-08-11-a-ubuntu22.04.tar.gz
       - run: make bootstrap
       - run: ./Utilities/bridge-js-generate.sh
       - name: Check if BridgeJS generated files are up-to-date
@@ -163,22 +158,57 @@ jobs:
             exit 1
           }
 
+  # Pull requests: compile every example in parallel just to catch breakage.
+  # One job per example avoids rebuilding JavaScriptKit + swift-syntax 6x in series,
+  # which collapses the wall-clock time from ~1h to that of the slowest single example.
   build-examples:
+    if: github.event_name == 'pull_request'
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        example:
+          - ActorOnWebWorker
+          - Basic
+          - Embedded
+          - Multithreading
+          - OffscrenCanvas
+          - PlayBridgeJS
+    steps:
+      - uses: actions/checkout@v7
+      - uses: ./.github/actions/install-swift
+        with:
+          download-url: https://download.swift.org/development/ubuntu2204/swift-DEVELOPMENT-SNAPSHOT-2026-08-11-a/swift-DEVELOPMENT-SNAPSHOT-2026-08-11-a-ubuntu22.04.tar.gz
+      - uses: swiftwasm/setup-swiftwasm@v2
+        id: setup-wasm32-unknown-wasip1
+        with: { target: wasm32-unknown-wasip1 }
+      - uses: swiftwasm/setup-swiftwasm@v2
+        id: setup-wasm32-unknown-wasip1-threads
+        with: { target: wasm32-unknown-wasip1-threads }
+      # build.sh resolves the package relative to the working directory, so run it
+      # from the example directory (mirroring Utilities/build-examples.sh's `cd`).
+      - run: ./build.sh release
+        working-directory: Examples/${{ matrix.example }}
+        env:
+          SWIFT_SDK_ID_wasm32_unknown_wasip1_threads: ${{ steps.setup-wasm32-unknown-wasip1-threads.outputs.swift-sdk-id }}
+          SWIFT_SDK_ID_wasm32_unknown_wasip1: ${{ steps.setup-wasm32-unknown-wasip1.outputs.swift-sdk-id }}
+
+  # main: build all examples in release and publish them to GitHub Pages.
+  build-examples-deploy:
+    if: github.event_name == 'push' && github.ref == 'refs/heads/main'
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v7
       - uses: ./.github/actions/install-swift
         with:
-          download-url: https://download.swift.org/development/ubuntu2204/swift-DEVELOPMENT-SNAPSHOT-2026-03-09-a/swift-DEVELOPMENT-SNAPSHOT-2026-03-09-a-ubuntu22.04.tar.gz
+          download-url: https://download.swift.org/development/ubuntu2204/swift-DEVELOPMENT-SNAPSHOT-2026-08-11-a/swift-DEVELOPMENT-SNAPSHOT-2026-08-11-a-ubuntu22.04.tar.gz
       - uses: swiftwasm/setup-swiftwasm@v2
         id: setup-wasm32-unknown-wasip1
         with: { target: wasm32-unknown-wasip1 }
       - uses: swiftwasm/setup-swiftwasm@v2
         id: setup-wasm32-unknown-wasip1-threads
         with: { target: wasm32-unknown-wasip1-threads }
-      - run: |
-          swift --version
-          ./Utilities/build-examples.sh
+      - run: ./Utilities/build-examples.sh
         env:
           SWIFT_SDK_ID_wasm32_unknown_wasip1_threads: ${{ steps.setup-wasm32-unknown-wasip1-threads.outputs.swift-sdk-id }}
           SWIFT_SDK_ID_wasm32_unknown_wasip1: ${{ steps.setup-wasm32-unknown-wasip1.outputs.swift-sdk-id }}
@@ -194,7 +224,7 @@ jobs:
     environment:
       name: github-pages
       url: ${{ steps.deployment.outputs.page_url }}
-    needs: build-examples
+    needs: build-examples-deploy
     permissions:
       pages: write
       id-token: write
diff --git a/Benchmarks/Sources/Generated/BridgeJS.swift b/Benchmarks/Sources/Generated/BridgeJS.swift
index 384ca35a2..5e3e11db8 100644
--- a/Benchmarks/Sources/Generated/BridgeJS.swift
+++ b/Benchmarks/Sources/Generated/BridgeJS.swift
@@ -2179,6 +2179,34 @@ fileprivate func _bjs_ArrayRoundtrip_wrap_extern(_ pointer: UnsafeMutableRawPoin
     return _bjs_ArrayRoundtrip_wrap_extern(pointer)
 }
 
+extension SimpleStruct: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = SimpleStruct.bridgeJSMakeTypeHandle()
+}
+
+extension Address: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = Address.bridgeJSMakeTypeHandle()
+}
+
+extension Person: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = Person.bridgeJSMakeTypeHandle()
+}
+
+extension ComplexStruct: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = ComplexStruct.bridgeJSMakeTypeHandle()
+}
+
+extension Point: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = Point.bridgeJSMakeTypeHandle()
+}
+
+extension APIResult: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = APIResult.bridgeJSMakeTypeHandle()
+}
+
+extension ComplexResult: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = ComplexResult.bridgeJSMakeTypeHandle()
+}
+
 #if arch(wasm32)
 @_extern(wasm, module: "Benchmarks", name: "bjs_benchmarkHelperNoop")
 fileprivate func bjs_benchmarkHelperNoop_extern() -> Void
@@ -2238,4 +2266,25 @@ func _$benchmarkRunner(_ name: String, _ body: JSObject) throws(JSException) ->
     if let error = _swift_js_take_exception() {
         throw error
     }
-}
\ No newline at end of file
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "bjs_Benchmarks_register_type_handles")
+fileprivate func _bjs_Benchmarks_register_type_handles_extern(_ base: UnsafePointer<Int32>?, _ count: Int32)
+
+@_expose(wasm, "bjs_Benchmarks_register_type_handles")
+public func _bjs_Benchmarks_register_type_handles() {
+    let typeIds: [Int32] = [
+        SimpleStruct.bridgeJSTypeID,
+        Address.bridgeJSTypeID,
+        Person.bridgeJSTypeID,
+        ComplexStruct.bridgeJSTypeID,
+        Point.bridgeJSTypeID,
+        APIResult.bridgeJSTypeID,
+        ComplexResult.bridgeJSTypeID,
+    ]
+    typeIds.withUnsafeBufferPointer { buffer in
+        _bjs_Benchmarks_register_type_handles_extern(buffer.baseAddress, Int32(buffer.count))
+    }
+}
+#endif
\ No newline at end of file
diff --git a/Benchmarks/Sources/Generated/JavaScript/BridgeJS.json b/Benchmarks/Sources/Generated/JavaScript/BridgeJS.json
index 7209c62f7..124e817ba 100644
--- a/Benchmarks/Sources/Generated/JavaScript/BridgeJS.json
+++ b/Benchmarks/Sources/Generated/JavaScript/BridgeJS.json
@@ -1,5 +1,8 @@
 {
   "exported" : {
+    "aliases" : [
+
+    ],
     "classes" : [
       {
         "constructor" : {
diff --git a/Examples/ActorOnWebWorker/build.sh b/Examples/ActorOnWebWorker/build.sh
index 4def77883..66c10a2c4 100755
--- a/Examples/ActorOnWebWorker/build.sh
+++ b/Examples/ActorOnWebWorker/build.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
 set -euxo pipefail
-swift package --swift-sdk "${SWIFT_SDK_ID_wasm32_unknown_wasip1_threads:-${SWIFT_SDK_ID:-wasm32-unknown-wasip1-threads}}" \
+swift package --build-system native --swift-sdk "${SWIFT_SDK_ID_wasm32_unknown_wasip1_threads:-${SWIFT_SDK_ID:-wasm32-unknown-wasip1-threads}}" \
     plugin --allow-writing-to-package-directory \
     js --use-cdn --output ./Bundle -c release
diff --git a/Examples/Basic/build.sh b/Examples/Basic/build.sh
index 2351f4e2d..07f436c4b 100755
--- a/Examples/Basic/build.sh
+++ b/Examples/Basic/build.sh
@@ -1,3 +1,3 @@
 #!/bin/bash
 set -euxo pipefail
-swift package --swift-sdk "${SWIFT_SDK_ID_wasm32_unknown_wasip1:-${SWIFT_SDK_ID:-wasm32-unknown-wasip1}}" js --use-cdn -c "${1:-debug}"
+swift package --build-system native --swift-sdk "${SWIFT_SDK_ID_wasm32_unknown_wasip1:-${SWIFT_SDK_ID:-wasm32-unknown-wasip1}}" js --use-cdn -c "${1:-debug}"
diff --git a/Examples/Embedded/Package.swift b/Examples/Embedded/Package.swift
index 42702394a..1f88a8947 100644
--- a/Examples/Embedded/Package.swift
+++ b/Examples/Embedded/Package.swift
@@ -16,6 +16,9 @@ let package = Package(
             swiftSettings: [
                 .enableExperimentalFeature("Extern")
             ],
+            plugins: [
+                .plugin(name: "BridgeJS", package: "JavaScriptKit")
+            ]
         )
     ],
     swiftLanguageModes: [.v5]
diff --git a/Examples/Embedded/README.md b/Examples/Embedded/README.md
index e99d659ff..97e2490b7 100644
--- a/Examples/Embedded/README.md
+++ b/Examples/Embedded/README.md
@@ -1,6 +1,6 @@
 # Embedded example
 
-Requires a recent DEVELOPMENT-SNAPSHOT toolchain. (tested with swift-6.1-DEVELOPMENT-SNAPSHOT-2025-02-21-a)
+Requires a recent DEVELOPMENT-SNAPSHOT toolchain.
 
 ```sh
 $ ./build.sh
diff --git a/Examples/Embedded/Sources/EmbeddedApp/main.swift b/Examples/Embedded/Sources/EmbeddedApp/main.swift
index 5e7f01a3c..c3e0dd3cd 100644
--- a/Examples/Embedded/Sources/EmbeddedApp/main.swift
+++ b/Examples/Embedded/Sources/EmbeddedApp/main.swift
@@ -1,5 +1,12 @@
 import JavaScriptKit
 
+@JS struct CounterLabel {
+    var count: Int
+    var text: String
+}
+
+@JSFunction func echoValue<T: BridgedSwiftGenericBridgeable>(_ value: T) throws(JSException) -> T
+
 let alert = JSObject.global.alert.object!
 let document = JSObject.global.document
 
@@ -46,6 +53,17 @@ _ = encoderContainer.appendChild(textInputElement)
 _ = encoderContainer.appendChild(encodeResultElement)
 _ = document.body.appendChild(encoderContainer)
 
+let genericResultElement = document.createElement("pre")
+do {
+    let number = try echoValue(42)
+    let text = try echoValue("hello")
+    let label = try echoValue(CounterLabel(count: number, text: text))
+    genericResultElement.innerText = .string("Generic import round-trip: \(label.text) \(label.count)")
+} catch {
+    genericResultElement.innerText = "Generic import round-trip failed"
+}
+_ = document.body.appendChild(genericResultElement)
+
 func print(_ message: String) {
     _ = JSObject.global.console.log(message)
 }
diff --git a/Examples/Embedded/build.sh b/Examples/Embedded/build.sh
index d756d8d1e..486f3581d 100755
--- a/Examples/Embedded/build.sh
+++ b/Examples/Embedded/build.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
 set -euxo pipefail
 package_dir="$(cd "$(dirname "$0")" && pwd)"
-swift package --package-path "$package_dir" \
+swift package --build-system native --package-path "$package_dir" \
   --swift-sdk "${SWIFT_SDK_ID_wasm32_unknown_wasip1:-${SWIFT_SDK_ID:-wasm32-unknown-wasip1}}-embedded" js -c release
diff --git a/Examples/Embedded/index.html b/Examples/Embedded/index.html
index 93868214d..d280d7067 100644
--- a/Examples/Embedded/index.html
+++ b/Examples/Embedded/index.html
@@ -8,7 +8,13 @@
 <body>
   <script type="module">
     import { init } from "./.build/plugins/PackageToJS/outputs/Package/index.js";
-    init();
+    init({
+      getImports() {
+        return {
+          echoValue: (value) => value,
+        };
+      },
+    });
   </script>
 </body>
 
diff --git a/Examples/Multithreading/build.sh b/Examples/Multithreading/build.sh
index 4def77883..66c10a2c4 100755
--- a/Examples/Multithreading/build.sh
+++ b/Examples/Multithreading/build.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
 set -euxo pipefail
-swift package --swift-sdk "${SWIFT_SDK_ID_wasm32_unknown_wasip1_threads:-${SWIFT_SDK_ID:-wasm32-unknown-wasip1-threads}}" \
+swift package --build-system native --swift-sdk "${SWIFT_SDK_ID_wasm32_unknown_wasip1_threads:-${SWIFT_SDK_ID:-wasm32-unknown-wasip1-threads}}" \
     plugin --allow-writing-to-package-directory \
     js --use-cdn --output ./Bundle -c release
diff --git a/Examples/OffscrenCanvas/build.sh b/Examples/OffscrenCanvas/build.sh
index 4def77883..66c10a2c4 100755
--- a/Examples/OffscrenCanvas/build.sh
+++ b/Examples/OffscrenCanvas/build.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
 set -euxo pipefail
-swift package --swift-sdk "${SWIFT_SDK_ID_wasm32_unknown_wasip1_threads:-${SWIFT_SDK_ID:-wasm32-unknown-wasip1-threads}}" \
+swift package --build-system native --swift-sdk "${SWIFT_SDK_ID_wasm32_unknown_wasip1_threads:-${SWIFT_SDK_ID:-wasm32-unknown-wasip1-threads}}" \
     plugin --allow-writing-to-package-directory \
     js --use-cdn --output ./Bundle -c release
diff --git a/Examples/PlayBridgeJS/Sources/PlayBridgeJS/Generated/BridgeJS.swift b/Examples/PlayBridgeJS/Sources/PlayBridgeJS/Generated/BridgeJS.swift
index 920f2cc2f..328ae0610 100644
--- a/Examples/PlayBridgeJS/Sources/PlayBridgeJS/Generated/BridgeJS.swift
+++ b/Examples/PlayBridgeJS/Sources/PlayBridgeJS/Generated/BridgeJS.swift
@@ -188,7 +188,7 @@ public func _bjs_PlayBridgeJS_updateDetailed(_ _self: UnsafeMutableRawPointer, _
                 _swift_js_throw(Int32(bitPattern: $0.id))
             }
         } else {
-            let jsError = JSError(message: String(describing: error))
+            let jsError = JSError(message: error.description)
             withExtendedLifetime(jsError.jsObject) {
                 _swift_js_throw(Int32(bitPattern: $0.id))
             }
@@ -231,6 +231,18 @@ fileprivate func _bjs_PlayBridgeJS_wrap_extern(_ pointer: UnsafeMutableRawPointe
     return _bjs_PlayBridgeJS_wrap_extern(pointer)
 }
 
+extension PlayBridgeJSOutput: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = PlayBridgeJSOutput.bridgeJSMakeTypeHandle()
+}
+
+extension PlayBridgeJSDiagnostic: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = PlayBridgeJSDiagnostic.bridgeJSMakeTypeHandle()
+}
+
+extension PlayBridgeJSResult: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = PlayBridgeJSResult.bridgeJSMakeTypeHandle()
+}
+
 #if arch(wasm32)
 @_extern(wasm, module: "PlayBridgeJS", name: "bjs_createTS2Swift")
 fileprivate func bjs_createTS2Swift_extern() -> Int32
@@ -264,8 +276,8 @@ fileprivate func bjs_TS2Swift_convert_extern(_ self: Int32, _ tsBytes: Int32, _
 }
 
 func _$TS2Swift_convert(_ self: JSObject, _ ts: String) throws(JSException) -> String {
-    let selfValue = self.bridgeJSLowerParameter()
     let ret0 = ts.bridgeJSWithLoweredParameter { (tsBytes, tsLength) in
+        let selfValue = self.bridgeJSLowerParameter()
         let ret = bjs_TS2Swift_convert(selfValue, tsBytes, tsLength)
         return ret
     }
@@ -274,4 +286,21 @@ func _$TS2Swift_convert(_ self: JSObject, _ ts: String) throws(JSException) -> S
         throw error
     }
     return String.bridgeJSLiftReturn(ret)
-}
\ No newline at end of file
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "bjs_PlayBridgeJS_register_type_handles")
+fileprivate func _bjs_PlayBridgeJS_register_type_handles_extern(_ base: UnsafePointer<Int32>?, _ count: Int32)
+
+@_expose(wasm, "bjs_PlayBridgeJS_register_type_handles")
+public func _bjs_PlayBridgeJS_register_type_handles() {
+    let typeIds: [Int32] = [
+        PlayBridgeJSOutput.bridgeJSTypeID,
+        PlayBridgeJSDiagnostic.bridgeJSTypeID,
+        PlayBridgeJSResult.bridgeJSTypeID,
+    ]
+    typeIds.withUnsafeBufferPointer { buffer in
+        _bjs_PlayBridgeJS_register_type_handles_extern(buffer.baseAddress, Int32(buffer.count))
+    }
+}
+#endif
\ No newline at end of file
diff --git a/Examples/PlayBridgeJS/Sources/PlayBridgeJS/Generated/JavaScript/BridgeJS.json b/Examples/PlayBridgeJS/Sources/PlayBridgeJS/Generated/JavaScript/BridgeJS.json
index 6f1fc940c..9beee9031 100644
--- a/Examples/PlayBridgeJS/Sources/PlayBridgeJS/Generated/JavaScript/BridgeJS.json
+++ b/Examples/PlayBridgeJS/Sources/PlayBridgeJS/Generated/JavaScript/BridgeJS.json
@@ -1,5 +1,8 @@
 {
   "exported" : {
+    "aliases" : [
+
+    ],
     "classes" : [
       {
         "constructor" : {
@@ -16,6 +19,7 @@
         "methods" : [
           {
             "abiName" : "bjs_PlayBridgeJS_updateDetailed",
+            "documentation" : "Structured entry point used by the playground so JS doesn't need to parse diagnostics.",
             "effects" : {
               "isAsync" : false,
               "isStatic" : false,
diff --git a/Examples/PlayBridgeJS/Sources/PlayBridgeJS/main.swift b/Examples/PlayBridgeJS/Sources/PlayBridgeJS/main.swift
index a30eb3b06..3a4063945 100644
--- a/Examples/PlayBridgeJS/Sources/PlayBridgeJS/main.swift
+++ b/Examples/PlayBridgeJS/Sources/PlayBridgeJS/main.swift
@@ -70,7 +70,7 @@ import class Foundation.JSONDecoder
             let importTS = ImportTS(progress: .silent, moduleName: moduleName, skeleton: $0)
             return try importTS.finalize()
         }
-        let linker = BridgeJSLink(skeletons: [skeleton], sharedMemory: false)
+        let linker = BridgeJSLink(skeletons: [skeleton])
         let linked = try linker.link()
 
         return PlayBridgeJSOutput(
diff --git a/Examples/PlayBridgeJS/build.sh b/Examples/PlayBridgeJS/build.sh
index 31c07896c..eb444a899 100755
--- a/Examples/PlayBridgeJS/build.sh
+++ b/Examples/PlayBridgeJS/build.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
 set -euxo pipefail
-swift package --swift-sdk "${SWIFT_SDK_ID_wasm32_unknown_wasip1:-${SWIFT_SDK_ID:-wasm32-unknown-wasip1}}" \
+swift package --build-system native --swift-sdk "${SWIFT_SDK_ID_wasm32_unknown_wasip1:-${SWIFT_SDK_ID:-wasm32-unknown-wasip1}}" \
     plugin --allow-writing-to-package-directory \
     js --use-cdn --output ./Bundle -c "${1:-debug}"
diff --git a/Makefile b/Makefile
index 270eb9b36..bbf031a00 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,5 @@
 SWIFT_SDK_ID ?=
+BUILD_SYSTEM ?= swiftbuild
 ifeq ($(JAVASCRIPTKIT_DISABLE_TRACING_TRAIT),1)
 	TRACING_ARGS :=
 else
@@ -16,7 +17,7 @@ unittest:
 		echo "SWIFT_SDK_ID is not set. Run 'swift sdk list' and pass a matching SDK, e.g. 'make unittest SWIFT_SDK_ID=<id>'."; \
 		exit 2; \
 	}
-	swift package --swift-sdk "$(SWIFT_SDK_ID)" \
+	swift package --build-system "$(BUILD_SYSTEM)" --swift-sdk "$(SWIFT_SDK_ID)" \
 	    $(TRACING_ARGS) \
 	    --disable-sandbox \
 	    js test --prelude ./Tests/prelude.mjs -Xnode --expose-gc
diff --git a/Package.swift b/Package.swift
index 3d0f1e943..0504d4505 100644
--- a/Package.swift
+++ b/Package.swift
@@ -82,7 +82,7 @@ let package = Package(
 
         .testTarget(
             name: "JavaScriptKitTests",
-            dependencies: ["JavaScriptKit"],
+            dependencies: ["JavaScriptKit", "JavaScriptEventLoopTestSupport"],
             swiftSettings: [
                 .enableExperimentalFeature("Extern"),
                 .define("Tracing", .when(traits: ["Tracing"])),
@@ -191,13 +191,14 @@ let package = Package(
         ),
         .testTarget(
             name: "BridgeJSRuntimeTests",
-            dependencies: ["JavaScriptKit", "JavaScriptEventLoop"],
+            dependencies: ["JavaScriptKit", "JavaScriptEventLoop", "JavaScriptEventLoopTestSupport"],
             exclude: [
                 "bridge-js.config.json",
                 "bridge-js.d.ts",
                 "bridge-js.global.d.ts",
                 "Generated/JavaScript",
                 "JavaScript",
+                "Modules",
             ],
             swiftSettings: [
                 .enableExperimentalFeature("Extern")
@@ -219,7 +220,7 @@ let package = Package(
         ),
         .testTarget(
             name: "BridgeJSIdentityTests",
-            dependencies: ["JavaScriptKit", "JavaScriptEventLoop"],
+            dependencies: ["JavaScriptKit", "JavaScriptEventLoop", "JavaScriptEventLoopTestSupport"],
             exclude: [
                 "bridge-js.config.json",
                 "Generated/JavaScript",
diff --git a/Package@swift-6.1.swift b/Package@swift-6.1.swift
deleted file mode 100644
index fe98ec529..000000000
--- a/Package@swift-6.1.swift
+++ /dev/null
@@ -1,222 +0,0 @@
-// swift-tools-version:6.1
-
-import CompilerPluginSupport
-import PackageDescription
-
-// NOTE: needed for embedded customizations, ideally this will not be necessary at all in the future, or can be replaced with traits
-let shouldBuildForEmbedded = Context.environment["JAVASCRIPTKIT_EXPERIMENTAL_EMBEDDED_WASM"].flatMap(Bool.init) ?? false
-let useLegacyResourceBundling =
-    Context.environment["JAVASCRIPTKIT_USE_LEGACY_RESOURCE_BUNDLING"].flatMap(Bool.init) ?? false
-
-let testingLinkerFlags: [LinkerSetting] = [
-    .unsafeFlags(
-        [
-            "-Xlinker", "--stack-first",
-            "-Xlinker", "--global-base=524288",
-            "-Xlinker", "-z",
-            "-Xlinker", "stack-size=524288",
-        ],
-        .when(platforms: [.wasi])
-    )
-]
-
-let package = Package(
-    name: "JavaScriptKit",
-    platforms: [
-        .macOS(.v13),
-        .iOS(.v13),
-        .tvOS(.v13),
-        .watchOS(.v6),
-        .macCatalyst(.v13),
-    ],
-    products: [
-        .library(name: "JavaScriptKit", targets: ["JavaScriptKit"]),
-        .library(name: "JavaScriptEventLoop", targets: ["JavaScriptEventLoop"]),
-        .library(name: "JavaScriptBigIntSupport", targets: ["JavaScriptBigIntSupport"]),
-        .library(name: "JavaScriptFoundationCompat", targets: ["JavaScriptFoundationCompat"]),
-        .library(name: "JavaScriptEventLoopTestSupport", targets: ["JavaScriptEventLoopTestSupport"]),
-        .plugin(name: "PackageToJS", targets: ["PackageToJS"]),
-        .plugin(name: "BridgeJS", targets: ["BridgeJS"]),
-        .plugin(name: "BridgeJSCommandPlugin", targets: ["BridgeJSCommandPlugin"]),
-    ],
-    dependencies: [
-        .package(url: "https://github.com/swiftlang/swift-syntax", "600.0.0"..<"603.0.0")
-    ],
-    targets: [
-        .target(
-            name: "JavaScriptKit",
-            dependencies: ["_CJavaScriptKit", "BridgeJSMacros"],
-            exclude: useLegacyResourceBundling ? [] : ["Runtime"],
-            resources: useLegacyResourceBundling ? [.copy("Runtime")] : [],
-            cSettings: shouldBuildForEmbedded
-                ? [
-                    .unsafeFlags(["-fdeclspec"])
-                ] : nil,
-            swiftSettings: [
-                .enableExperimentalFeature("Extern")
-            ]
-                + (shouldBuildForEmbedded
-                    ? [
-                        .enableExperimentalFeature("Embedded"),
-                        .unsafeFlags(["-Xfrontend", "-emit-empty-object-file"]),
-                    ] : [])
-        ),
-        .target(name: "_CJavaScriptKit"),
-        .macro(
-            name: "BridgeJSMacros",
-            dependencies: [
-                .product(name: "SwiftSyntaxMacros", package: "swift-syntax"),
-                .product(name: "SwiftCompilerPlugin", package: "swift-syntax"),
-            ]
-        ),
-
-        .testTarget(
-            name: "JavaScriptKitTests",
-            dependencies: ["JavaScriptKit"],
-            swiftSettings: [
-                .enableExperimentalFeature("Extern")
-            ],
-            linkerSettings: testingLinkerFlags
-        ),
-
-        .target(
-            name: "JavaScriptBigIntSupport",
-            dependencies: ["_CJavaScriptBigIntSupport", "JavaScriptKit"],
-            swiftSettings: shouldBuildForEmbedded
-                ? [
-                    .enableExperimentalFeature("Embedded"),
-                    .unsafeFlags(["-Xfrontend", "-emit-empty-object-file"]),
-                ] : []
-        ),
-        .target(name: "_CJavaScriptBigIntSupport", dependencies: ["_CJavaScriptKit"]),
-        .testTarget(
-            name: "JavaScriptBigIntSupportTests",
-            dependencies: ["JavaScriptBigIntSupport", "JavaScriptKit"],
-            linkerSettings: testingLinkerFlags
-        ),
-
-        .target(
-            name: "JavaScriptEventLoop",
-            dependencies: ["JavaScriptKit", "_CJavaScriptEventLoop"],
-            swiftSettings: shouldBuildForEmbedded
-                ? [
-                    .enableExperimentalFeature("Embedded"),
-                    .unsafeFlags(["-Xfrontend", "-emit-empty-object-file"]),
-                ] : []
-        ),
-        .target(name: "_CJavaScriptEventLoop"),
-        .testTarget(
-            name: "JavaScriptEventLoopTests",
-            dependencies: [
-                "JavaScriptEventLoop",
-                "JavaScriptKit",
-                "JavaScriptEventLoopTestSupport",
-            ],
-            swiftSettings: [
-                .enableExperimentalFeature("Extern")
-            ],
-            linkerSettings: testingLinkerFlags
-        ),
-        .target(
-            name: "JavaScriptEventLoopTestSupport",
-            dependencies: [
-                "_CJavaScriptEventLoopTestSupport",
-                "JavaScriptEventLoop",
-            ]
-        ),
-        .target(name: "_CJavaScriptEventLoopTestSupport"),
-        .testTarget(
-            name: "JavaScriptEventLoopTestSupportTests",
-            dependencies: [
-                "JavaScriptKit",
-                "JavaScriptEventLoopTestSupport",
-            ],
-            linkerSettings: testingLinkerFlags
-        ),
-        .target(
-            name: "JavaScriptFoundationCompat",
-            dependencies: [
-                "JavaScriptKit"
-            ]
-        ),
-        .testTarget(
-            name: "JavaScriptFoundationCompatTests",
-            dependencies: [
-                "JavaScriptFoundationCompat"
-            ],
-            linkerSettings: testingLinkerFlags
-        ),
-        .plugin(
-            name: "PackageToJS",
-            capability: .command(
-                intent: .custom(verb: "js", description: "Convert a Swift package to a JavaScript package")
-            ),
-            path: "Plugins/PackageToJS/Sources"
-        ),
-        .plugin(
-            name: "BridgeJS",
-            capability: .buildTool(),
-            dependencies: ["BridgeJSTool"],
-            path: "Plugins/BridgeJS/Sources/BridgeJSBuildPlugin"
-        ),
-        .plugin(
-            name: "BridgeJSCommandPlugin",
-            capability: .command(
-                intent: .custom(verb: "bridge-js", description: "Generate bridging code"),
-                permissions: [.writeToPackageDirectory(reason: "Generate bridging code")]
-            ),
-            dependencies: ["BridgeJSTool"],
-            path: "Plugins/BridgeJS/Sources/BridgeJSCommandPlugin"
-        ),
-        .executableTarget(
-            name: "BridgeJSTool",
-            dependencies: [
-                .product(name: "SwiftParser", package: "swift-syntax"),
-                .product(name: "SwiftSyntax", package: "swift-syntax"),
-                .product(name: "SwiftBasicFormat", package: "swift-syntax"),
-                .product(name: "SwiftSyntaxBuilder", package: "swift-syntax"),
-            ],
-            exclude: ["TS2Swift/JavaScript", "README.md"]
-        ),
-        .testTarget(
-            name: "BridgeJSRuntimeTests",
-            dependencies: ["JavaScriptKit", "JavaScriptEventLoop"],
-            exclude: [
-                "bridge-js.config.json",
-                "bridge-js.d.ts",
-                "bridge-js.global.d.ts",
-                "Generated/JavaScript",
-                "JavaScript",
-            ],
-            swiftSettings: [
-                .enableExperimentalFeature("Extern")
-            ],
-            linkerSettings: testingLinkerFlags
-        ),
-        .testTarget(
-            name: "BridgeJSGlobalTests",
-            dependencies: ["JavaScriptKit", "JavaScriptEventLoop"],
-            exclude: [
-                "bridge-js.config.json",
-                "bridge-js.d.ts",
-                "Generated/JavaScript",
-            ],
-            swiftSettings: [
-                .enableExperimentalFeature("Extern")
-            ],
-            linkerSettings: testingLinkerFlags
-        ),
-        .testTarget(
-            name: "BridgeJSIdentityTests",
-            dependencies: ["JavaScriptKit", "JavaScriptEventLoop"],
-            exclude: [
-                "bridge-js.config.json",
-                "Generated/JavaScript",
-            ],
-            swiftSettings: [
-                .enableExperimentalFeature("Extern")
-            ],
-            linkerSettings: testingLinkerFlags
-        ),
-    ]
-)
diff --git a/Plugins/BridgeJS/README.md b/Plugins/BridgeJS/README.md
index 9e1e0aa08..0905695c5 100644
--- a/Plugins/BridgeJS/README.md
+++ b/Plugins/BridgeJS/README.md
@@ -98,7 +98,7 @@ graph LR
 | `Dictionary<K, V>` | `Record<K, V>` | - | [#495](https://github.com/swiftwasm/JavaScriptKit/issues/495) |
 | `Set<T>` | `Set<T>` | - | [#397](https://github.com/swiftwasm/JavaScriptKit/issues/397) |
 | `Foundation.URL` | `string` | - | [#496](https://github.com/swiftwasm/JavaScriptKit/issues/496) |
-| Generics | - | - | [#398](https://github.com/swiftwasm/JavaScriptKit/issues/398) |
+| Generic function or method (`T`, `[T]`, `T?`, `[String: T]`) | `<T>(value: T): T` | Depends on `T` | ✅ imports only ([#398](https://github.com/swiftwasm/JavaScriptKit/issues/398) for exports) |
 
 ### Import-specific (TypeScript -> Swift)
 
diff --git a/Plugins/BridgeJS/Sources/BridgeJSCore/ClosureCodegen.swift b/Plugins/BridgeJS/Sources/BridgeJSCore/ClosureCodegen.swift
index 45cfb73f1..969b3c01e 100644
--- a/Plugins/BridgeJS/Sources/BridgeJSCore/ClosureCodegen.swift
+++ b/Plugins/BridgeJS/Sources/BridgeJSCore/ClosureCodegen.swift
@@ -16,7 +16,7 @@ public struct ClosureCodegen {
         let closureParams = signature.parameters.map { "\(sendingPrefix)\($0.closureSwiftType)" }.joined(
             separator: ", "
         )
-        let swiftEffects = (signature.isAsync ? " async" : "") + (signature.isThrows ? " throws" : "")
+        let swiftEffects = (signature.isAsync ? " async" : "") + (signature.isThrows ? " throws(JSException)" : "")
         let swiftReturnType = signature.returnType.closureSwiftType
         return "(\(closureParams))\(swiftEffects) -> \(swiftReturnType)"
     }
@@ -73,7 +73,17 @@ public struct ClosureCodegen {
             helperEnumDeclPrinter.indent {
                 helperEnumDeclPrinter.write("let callback = JSObject.bridgeJSLiftParameter(callbackId)")
                 let parameters: String
-                if signature.parameters.isEmpty {
+                if signature.isThrows || signature.isAsync {
+                    let sendingPrefix = signature.sendingParameters ? "sending " : ""
+                    let typedParams =
+                        signature.parameters.enumerated().map { index, paramType in
+                            "param\(index): \(sendingPrefix)\(paramType.closureSwiftType)"
+                        }.joined(separator: ", ")
+                    let returnType = signature.returnType.closureSwiftType
+                    let effects =
+                        (signature.isAsync ? " async" : "") + (signature.isThrows ? " throws(JSException)" : "")
+                    parameters = " (\(typedParams))\(effects) -> \(returnType)"
+                } else if signature.parameters.isEmpty {
                     parameters = ""
                 } else if signature.parameters.count == 1 {
                     parameters = " param0"
@@ -143,12 +153,22 @@ public struct ClosureCodegen {
             let argNames = liftInfo.parameters.map { (argName, _) in
                 liftInfo.parameters.count > 1 ? "\(paramName)\(argName.capitalizedFirstLetter)" : paramName
             }
-            liftedParams.append("\(paramType.swiftType).bridgeJSLiftParameter(\(argNames.joined(separator: ", ")))")
+            liftedParams.append(
+                "\(paramType.swiftType).bridgeJSLiftParameter(\(argNames.joined(separator: ", ")))"
+            )
         }
 
-        let closureCallExpr = ExprSyntax("closure(\(raw: liftedParams.joined(separator: ", ")))")
+        let tryPrefix = signature.isThrows ? "try " : ""
+        let closureCallExpr = ExprSyntax("\(raw: tryPrefix)closure(\(raw: liftedParams.joined(separator: ", ")))")
+        let asyncTryPrefix = (signature.isThrows ? "try " : "") + "await "
+        let asyncClosureCallExpr = ExprSyntax(
+            "\(raw: asyncTryPrefix)closure(\(raw: liftedParams.joined(separator: ", ")))"
+        )
 
-        let abiReturnWasmType = try signature.returnType.loweringReturnInfo().returnType
+        let abiReturnWasmType =
+            signature.isAsync
+            ? try BridgeType.jsObject(nil).loweringReturnInfo().returnType
+            : try signature.returnType.loweringReturnInfo().returnType
 
         // Build signature using SwiftSignatureBuilder
         let funcSignature = SwiftSignatureBuilder.buildABIFunctionSignature(
@@ -156,12 +176,7 @@ public struct ClosureCodegen {
             returnType: abiReturnWasmType
         )
 
-        // Build function declaration using helper
-        let funcDecl = SwiftCodePattern.buildExposedFunctionDecl(
-            abiName: abiName,
-            signature: funcSignature
-        ) { printer in
-            printer.write("let closure = Unmanaged<\(boxType)>.fromOpaque(boxPtr).takeUnretainedValue().closure")
+        let emitCallAndLower: (CodeFragmentPrinter) -> Void = { printer in
             if signature.returnType == .void {
                 printer.write(closureCallExpr.description)
             } else {
@@ -189,6 +204,79 @@ public struct ClosureCodegen {
             }
         }
 
+        let emitAsyncCallAndLower: (CodeFragmentPrinter) -> Void = { printer in
+            printer.write("let closure = Unmanaged<\(boxType)>.fromOpaque(boxPtr).takeUnretainedValue().closure")
+            let resolveType = signature.returnType
+            let resolveName = "Promise_resolve_\(resolveType.mangleTypeName)"
+            let rejectName = "Promise_reject"
+            let closureHead: String
+            if signature.isThrows {
+                let returnSpelling = resolveType == .void ? "" : " -> \(resolveType.closureSwiftType)"
+                closureHead = " () async throws(JSException)\(returnSpelling) in"
+            } else {
+                closureHead = ""
+            }
+            printer.write("return _bjs_makePromise(resolve: \(resolveName), reject: \(rejectName)) {\(closureHead)")
+            printer.indent {
+                if resolveType == .void {
+                    printer.write(asyncClosureCallExpr.description)
+                } else {
+                    printer.write("return \(asyncClosureCallExpr)")
+                }
+            }
+            printer.write("}")
+        }
+
+        let catchPlaceholderStmt = abiReturnWasmType?.swiftReturnPlaceholderStmt
+
+        // Build function declaration using helper
+        let funcDecl = SwiftCodePattern.buildExposedFunctionDecl(
+            abiName: abiName,
+            signature: funcSignature
+        ) { printer in
+            if signature.isAsync {
+                emitAsyncCallAndLower(printer)
+            } else if signature.isThrows {
+                printer.write(
+                    "let closure = Unmanaged<\(boxType)>.fromOpaque(boxPtr).takeUnretainedValue().closure"
+                )
+                printer.write("do {")
+                printer.indent {
+                    emitCallAndLower(printer)
+                }
+                printer.write("} catch let error {")
+                printer.indent {
+                    printer.write("if let error = error.thrownValue.object {")
+                    printer.indent {
+                        printer.write("withExtendedLifetime(error) {")
+                        printer.indent {
+                            printer.write("_swift_js_throw(Int32(bitPattern: $0.id))")
+                        }
+                        printer.write("}")
+                    }
+                    printer.write("} else {")
+                    printer.indent {
+                        printer.write("let jsError = JSError(message: error.description)")
+                        printer.write("withExtendedLifetime(jsError.jsObject) {")
+                        printer.indent {
+                            printer.write("_swift_js_throw(Int32(bitPattern: $0.id))")
+                        }
+                        printer.write("}")
+                    }
+                    printer.write("}")
+                    if let catchPlaceholderStmt {
+                        printer.write(catchPlaceholderStmt)
+                    }
+                }
+                printer.write("}")
+            } else {
+                printer.write(
+                    "let closure = Unmanaged<\(boxType)>.fromOpaque(boxPtr).takeUnretainedValue().closure"
+                )
+                emitCallAndLower(printer)
+            }
+        }
+
         return DeclSyntax(funcDecl)
     }
 
diff --git a/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift b/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift
index b649b244d..55b5889fe 100644
--- a/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift
+++ b/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift
@@ -90,11 +90,93 @@ public class ExportSwift {
                 decls.append(contentsOf: try renderSingleExportedClass(klass: klass))
             }
         }
+
+        withSpan("Render Generic Bridgeable Conformances") { [self] in
+            let genericConformanceCodegen = GenericConformanceCodegen()
+            for entry in skeleton.genericBridgeableTypeEntries {
+                decls.append(contentsOf: genericConformanceCodegen.renderConformance(typeName: entry.swiftName))
+            }
+        }
+
+        try withSpan("Render Async Promise Helpers") { [self] in
+            let asyncResolveTypes = skeleton.asyncPromiseResolveReturnTypes
+            if !asyncResolveTypes.isEmpty {
+                decls.append(contentsOf: try renderPromiseRejectHelper())
+                for type in asyncResolveTypes {
+                    decls.append(contentsOf: try renderPromiseResolveHelper(type))
+                }
+            }
+        }
+
+        withSpan("Render Aliases") { [self] in
+            let aliasCodegen = AliasCodegen()
+            for alias in skeleton.aliases {
+                if let aliasExtension = aliasCodegen.renderAliasConformance(alias) {
+                    decls.append(aliasExtension)
+                }
+            }
+        }
         return withSpan("Format Export Glue") {
             return decls.map { $0.description }.joined(separator: "\n\n")
         }
     }
 
+    /// Generates the per-type `Promise_resolve_<mangled>` settlement helper.
+    private func renderPromiseResolveHelper(_ type: BridgeType) throws -> [DeclSyntax] {
+        try renderPromiseSettleHelper(
+            functionName: "Promise_resolve_\(type.mangleTypeName)",
+            externName: "promise_resolve_\(moduleName)_\(type.mangleTypeName)",
+            valueType: type
+        )
+    }
+
+    /// Generates the shared `Promise_reject` settlement helper.
+    private func renderPromiseRejectHelper() throws -> [DeclSyntax] {
+        try renderPromiseSettleHelper(
+            functionName: "Promise_reject",
+            externName: "promise_reject_\(moduleName)",
+            valueType: .jsValue
+        )
+    }
+
+    /// Generates a `@JSFunction func <functionName>(_ promise: JSObject, _ value: T)` and its
+    /// glue, lowering `value` through the standard imported-parameter ABI.
+    private func renderPromiseSettleHelper(
+        functionName: String,
+        externName: String,
+        valueType: BridgeType
+    ) throws -> [DeclSyntax] {
+        let effects = Effects(isAsync: false, isThrows: true)
+        // `Void` can't cross the bridge as a parameter, so the void helper takes only the promise.
+        var parameters = [Parameter(label: nil, name: "promise", type: .jsObject(nil))]
+        if valueType != .void {
+            parameters.append(Parameter(label: nil, name: "value", type: valueType))
+        }
+        let builder = try ImportTS.CallJSEmission(
+            moduleName: "bjs",
+            abiName: externName,
+            effects: effects,
+            returnType: .void,
+            context: .importTS
+        )
+        for parameter in parameters {
+            try builder.lowerParameter(param: parameter)
+        }
+        try builder.call()
+        try builder.liftReturnValue()
+
+        let valueParam = valueType == .void ? "" : ", _ value: \(valueType.swiftType)"
+        let macroDecl: DeclSyntax =
+            "@JSFunction func \(raw: functionName)(_ promise: JSObject\(raw: valueParam)) throws(JSException)"
+        let glueDecl = builder.renderThunkDecl(
+            name: "_$\(functionName)",
+            parameters: parameters,
+            returnType: .void,
+            effects: effects
+        )
+        return [macroDecl, builder.renderImportDecl(), glueDecl]
+    }
+
     class ExportedThunkBuilder {
         var body: [CodeBlockItemSyntax] = []
         var liftedParameterExprs: [ExprSyntax] = []
@@ -104,8 +186,22 @@ public class ExportSwift {
         var externDecls: [DeclSyntax] = []
         let effects: Effects
 
-        init(effects: Effects) {
+        /// The async return type settled through `_bjs_makePromise`'s `Promise_resolve_<mangled>`
+        /// helper. Set for every `async` thunk.
+        var asyncResolveReturnType: BridgeType?
+
+        /// Stack-using parameter lifts hoisted ahead of the deferred async closure.
+        var asyncHoistedBindings: [CodeBlockItemSyntax] = []
+
+        init(effects: Effects, returnType: BridgeType) throws {
             self.effects = effects
+            guard effects.isAsync else { return }
+            guard returnType.isAsyncResolvable else {
+                throw BridgeJSCoreError(
+                    "Returning '\(returnType.swiftType)' from an async exported function is not yet supported"
+                )
+            }
+            self.asyncResolveReturnType = returnType
         }
 
         private func append(_ item: CodeBlockItemSyntax) {
@@ -200,7 +296,7 @@ public class ExportSwift {
             }
 
             if effects.isAsync, returnType != .void {
-                return CodeBlockItemSyntax(item: .init(StmtSyntax("return \(raw: callExpr).jsValue")))
+                return CodeBlockItemSyntax(item: .init(StmtSyntax("return \(raw: callExpr)")))
             }
 
             if returnType == .void {
@@ -244,6 +340,22 @@ public class ExportSwift {
                 param.type.isStackUsingParameter ? index : nil
             }
 
+            if effects.isAsync {
+                // Drain stack parameters before the deferred `Task` or the shared stack is corrupted.
+                for index in stackParamIndices.reversed() {
+                    let param = parameters[index]
+                    let expr = liftedParameterExprs[index]
+                    let varName = "_tmp_\(param.name)"
+                    var binding: CodeBlockItemSyntax = "let \(raw: varName) = \(expr)"
+                    if !asyncHoistedBindings.isEmpty {
+                        binding = binding.with(\.leadingTrivia, .newline)
+                    }
+                    asyncHoistedBindings.append(binding)
+                    liftedParameterExprs[index] = ExprSyntax(DeclReferenceExprSyntax(baseName: .identifier(varName)))
+                }
+                return
+            }
+
             guard stackParamIndices.count > 1 else { return }
 
             for index in stackParamIndices.reversed() {
@@ -293,8 +405,7 @@ public class ExportSwift {
                 return
             }
             if effects.isAsync {
-                // The return value of async function (T of `(...) async -> T`) is
-                // handled by the JSPromise.async, so we don't need to do anything here.
+                // The async return value is lowered by the generated `Promise_resolve_*` helper.
                 return
             }
 
@@ -328,25 +439,49 @@ public class ExportSwift {
             }
         }
 
+        /// A throwing async body needs an explicit closure type, otherwise Swift infers
+        /// `throws(any Error)` instead of `throws(JSException)`.
+        /// See: https://github.com/swiftlang/swift/issues/76165
+        private func asyncThrowsClosureHead(returnSpelling: String?, forcesCapture: Bool) -> String {
+            guard effects.isThrows else { return "" }
+            let returns = returnSpelling.map { " -> \($0)" } ?? ""
+            let capture = forcesCapture ? "[__bjs_capture] " : ""
+            return " \(capture)() async throws(JSException)\(returns) in"
+        }
+
+        /// A captureless throwing async body closure lowers via `thin_to_thick_function`,
+        /// which miscompiles typed-error calls on wasm32. Forcing a capture that the body
+        /// reads turns the closure into a partial apply with a context, avoiding the
+        /// broken convention. An unread capture list entry is dropped by capture analysis,
+        /// so the body must also read the captured value.
+        /// See: https://github.com/swiftlang/swift/issues/89320
+        private var asyncThrowsBodyForcesCapture: Bool {
+            effects.isThrows && abiParameterSignatures.isEmpty && asyncHoistedBindings.isEmpty
+        }
+
         func render(abiName: String) -> DeclSyntax {
             let body: CodeBlockItemListSyntax
-            if effects.isAsync {
-                // Explicit closure type annotation needed when throws is present
-                // so Swift infers throws(JSException) instead of throws(any Error)
-                // See: https://github.com/swiftlang/swift/issues/76165
-                let closureHead: String
-                if effects.isThrows {
-                    let hasReturn = self.body.contains { $0.description.contains("return ") }
-                    let ret = hasReturn ? " -> JSValue" : ""
-                    closureHead = " () async throws(JSException)\(ret) in"
-                } else {
-                    closureHead = ""
+            if effects.isAsync, let resolveType = asyncResolveReturnType {
+                let resolveName = "Promise_resolve_\(resolveType.mangleTypeName)"
+                let forcesCapture = asyncThrowsBodyForcesCapture
+                let closureHead = asyncThrowsClosureHead(
+                    returnSpelling: resolveType.swiftType,
+                    forcesCapture: forcesCapture
+                )
+                var hoistedBindings = asyncHoistedBindings
+                var bodyItems = self.body
+                if forcesCapture {
+                    hoistedBindings.append("let __bjs_capture = 0")
+                    if !bodyItems.isEmpty {
+                        bodyItems[0] = bodyItems[0].with(\.leadingTrivia, .newline)
+                    }
+                    bodyItems.insert("_ = __bjs_capture", at: 0)
                 }
                 body = """
-                    let ret = JSPromise.async {\(raw: closureHead)
-                        \(CodeBlockItemListSyntax(self.body))
-                    }.jsObject
-                    return ret.bridgeJSLowerReturn()
+                    \(CodeBlockItemListSyntax(hoistedBindings))
+                    return _bjs_makePromise(resolve: \(raw: resolveName), reject: Promise_reject) {\(raw: closureHead)
+                        \(CodeBlockItemListSyntax(bodyItems))
+                    }
                     """
             } else if effects.isThrows {
                 body = """
@@ -358,7 +493,7 @@ public class ExportSwift {
                                 _swift_js_throw(Int32(bitPattern: $0.id))
                             }
                         } else {
-                            let jsError = JSError(message: String(describing: error))
+                            let jsError = JSError(message: error.description)
                             withExtendedLifetime(jsError.jsObject) {
                                 _swift_js_throw(Int32(bitPattern: $0.id))
                             }
@@ -432,7 +567,7 @@ public class ExportSwift {
         func callName(for property: ExportedProperty) -> String {
             switch self {
             case .enumStatic(let enumDef):
-                return property.callName(prefix: enumDef.swiftCallName)
+                return "\(enumDef.swiftCallName).\(property.name)"
             case .classStatic(let klass):
                 // property.callName() would use staticContext (the ABI name) as prefix;
                 // use swiftCallName directly so the emitted expression is valid Swift.
@@ -440,7 +575,7 @@ public class ExportSwift {
             case .classInstance:
                 return property.callName()
             case .structStatic(let structDef):
-                return property.callName(prefix: structDef.swiftCallName)
+                return "\(structDef.swiftCallName).\(property.name)"
             }
         }
     }
@@ -457,7 +592,10 @@ public class ExportSwift {
         let className = context.className
         let isStatic = context.isStatic
 
-        let getterBuilder = ExportedThunkBuilder(effects: Effects(isAsync: false, isThrows: false, isStatic: isStatic))
+        let getterBuilder = try ExportedThunkBuilder(
+            effects: Effects(isAsync: false, isThrows: false, isStatic: isStatic),
+            returnType: property.type
+        )
 
         if !isStatic {
             try getterBuilder.liftParameter(
@@ -476,8 +614,9 @@ public class ExportSwift {
 
         // Generate property setter if not readonly
         if !property.isReadonly {
-            let setterBuilder = ExportedThunkBuilder(
-                effects: Effects(isAsync: false, isThrows: false, isStatic: isStatic)
+            let setterBuilder = try ExportedThunkBuilder(
+                effects: Effects(isAsync: false, isThrows: false, isStatic: isStatic),
+                returnType: .void
             )
 
             // Lift parameters based on property type
@@ -507,7 +646,7 @@ public class ExportSwift {
     }
 
     func renderSingleExportedFunction(function: ExportedFunction) throws -> DeclSyntax {
-        let builder = ExportedThunkBuilder(effects: function.effects)
+        let builder = try ExportedThunkBuilder(effects: function.effects, returnType: function.returnType)
         for param in function.parameters {
             try builder.liftParameter(param: param)
         }
@@ -536,7 +675,7 @@ public class ExportSwift {
         callName: String,
         returnType: BridgeType
     ) throws -> DeclSyntax {
-        let builder = ExportedThunkBuilder(effects: constructor.effects)
+        let builder = try ExportedThunkBuilder(effects: constructor.effects, returnType: returnType)
         for param in constructor.parameters {
             try builder.liftParameter(param: param)
         }
@@ -550,7 +689,7 @@ public class ExportSwift {
         ownerTypeName: String,
         instanceSelfType: BridgeType
     ) throws -> DeclSyntax {
-        let builder = ExportedThunkBuilder(effects: method.effects)
+        let builder = try ExportedThunkBuilder(effects: method.effects, returnType: method.returnType)
         if !method.effects.isStatic {
             try builder.liftParameter(param: Parameter(label: nil, name: "_self", type: instanceSelfType))
         }
@@ -743,6 +882,57 @@ public class ExportSwift {
     }
 }
 
+// MARK: - GenericConformanceCodegen
+
+struct GenericConformanceCodegen {
+    func renderConformance(typeName: String) -> [DeclSyntax] {
+        let printer = CodeFragmentPrinter()
+        printer.write("extension \(typeName): BridgedSwiftGenericBridgeable {")
+        printer.indent {
+            printer.write(
+                "@_spi(BridgeJS) public static let bridgeJSTypeHandle = \(typeName).bridgeJSMakeTypeHandle()"
+            )
+        }
+        printer.write("}")
+        return ["\(raw: printer.lines.joined(separator: "\n"))"]
+    }
+}
+
+// MARK: - GenericTypeRegistrationCodegen
+
+public struct GenericTypeRegistrationCodegen {
+    public init() {}
+
+    public func render(for skeleton: BridgeJSSkeleton) -> String? {
+        guard let entries = skeleton.typeRegistrationEntries else { return nil }
+        let abiName = ABINameGenerator.typeRegistrationFunctionName(moduleName: skeleton.moduleName)
+        let printer = CodeFragmentPrinter()
+        printer.write("#if arch(wasm32)")
+        printer.write("@_extern(wasm, module: \"bjs\", name: \"\(abiName)\")")
+        printer.write("fileprivate func _\(abiName)_extern(_ base: UnsafePointer<Int32>?, _ count: Int32)")
+        printer.nextLine()
+        printer.write("@_expose(wasm, \"\(abiName)\")")
+        printer.write("public func _\(abiName)() {")
+        printer.indent {
+            printer.write("let typeIds: [Int32] = [")
+            printer.indent {
+                for entry in entries {
+                    printer.write("\(entry.swiftName).bridgeJSTypeID,")
+                }
+            }
+            printer.write("]")
+            printer.write("typeIds.withUnsafeBufferPointer { buffer in")
+            printer.indent {
+                printer.write("_\(abiName)_extern(buffer.baseAddress, Int32(buffer.count))")
+            }
+            printer.write("}")
+        }
+        printer.write("}")
+        printer.write("#endif")
+        return printer.lines.joined(separator: "\n")
+    }
+}
+
 // MARK: - StackCodegen
 
 /// Helper for stack-based lifting and lowering operations.
@@ -754,7 +944,7 @@ struct StackCodegen {
         switch type {
         case .string, .integer, .bool, .float, .double,
             .jsObject(nil), .jsValue, .swiftStruct, .swiftHeapObject, .unsafePointer,
-            .swiftProtocol, .caseEnum, .associatedValueEnum, .rawValueEnum, .array, .dictionary:
+            .swiftProtocol, .caseEnum, .associatedValueEnum, .rawValueEnum, .array, .dictionary, .alias:
             return "\(raw: type.swiftType).bridgeJSStackPop()"
         case .jsObject(let className?):
             return "\(raw: className)(unsafelyWrapping: JSObject.bridgeJSStackPop())"
@@ -764,6 +954,10 @@ struct StackCodegen {
             return "JSObject.bridgeJSStackPop()"
         case .void, .namespaceEnum:
             return "()"
+        case .generic:
+            fatalError(
+                "Generic parameters are only supported on imported declarations, not exported concrete-type codegen"
+            )
         }
     }
 
@@ -772,11 +966,11 @@ struct StackCodegen {
         switch wrappedType {
         case .string, .integer, .bool, .float, .double, .jsObject(nil), .jsValue,
             .swiftStruct, .swiftHeapObject, .caseEnum, .associatedValueEnum, .rawValueEnum,
-            .array, .dictionary:
+            .array, .dictionary, .alias:
             return "\(raw: typeName)<\(raw: wrappedType.swiftType)>.bridgeJSStackPop()"
         case .jsObject(let className?):
             return "\(raw: typeName)<JSObject>.bridgeJSStackPop().map { \(raw: className)(unsafelyWrapping: $0) }"
-        case .nullable, .void, .namespaceEnum, .closure, .unsafePointer, .swiftProtocol:
+        case .nullable, .void, .namespaceEnum, .closure, .unsafePointer, .swiftProtocol, .generic:
             fatalError("Invalid nullable wrapped type: \(wrappedType)")
         }
     }
@@ -795,7 +989,7 @@ struct StackCodegen {
         switch type {
         case .string, .integer, .bool, .float, .double, .jsValue,
             .jsObject(nil), .swiftHeapObject, .unsafePointer, .closure,
-            .caseEnum, .rawValueEnum, .associatedValueEnum, .swiftStruct, .nullable:
+            .caseEnum, .rawValueEnum, .associatedValueEnum, .swiftStruct, .nullable, .alias:
             return ["\(raw: accessor).bridgeJSStackPush()"]
         case .jsObject(_?):
             return ["\(raw: accessor).jsObject.bridgeJSStackPush()"]
@@ -809,6 +1003,10 @@ struct StackCodegen {
             return lowerArrayStatements(elementType: elementType, accessor: accessor, varPrefix: varPrefix)
         case .dictionary(let valueType):
             return lowerDictionaryStatements(valueType: valueType, accessor: accessor, varPrefix: varPrefix)
+        case .generic:
+            fatalError(
+                "Generic parameters are only supported on imported declarations, not exported concrete-type codegen"
+            )
         }
     }
 
@@ -1216,10 +1414,9 @@ struct StructCodegen {
         let instanceProps = structDef.properties.filter { !$0.isStatic }
 
         for property in instanceProps {
-            let accessor = "self.\(property.name)"
             let statements = stackCodegen.lowerStatements(
                 for: property.type,
-                accessor: accessor,
+                accessor: "self.\(property.name)",
                 varPrefix: property.name
             )
             for statement in statements {
@@ -1231,6 +1428,18 @@ struct StructCodegen {
     }
 }
 
+// MARK: - AliasCodegen
+
+struct AliasCodegen {
+    func renderAliasConformance(_ alias: ExportedAlias) -> DeclSyntax? {
+        guard let protocols = alias.underlying.aliasConformanceProtocols else {
+            return nil
+        }
+        let conformances = (["_BridgedSwiftAlias"] + protocols).joined(separator: ", ")
+        return "extension \(raw: alias.swiftCallName): \(raw: conformances) {}"
+    }
+}
+
 // MARK: - ProtocolCodegen
 
 struct ProtocolCodegen {
@@ -1442,6 +1651,45 @@ extension UnsafePointerType {
 }
 
 extension BridgeType {
+    var aliasConformanceProtocols: [String]? {
+        switch self {
+        case .swiftHeapObject, .jsObject, .integer, .float, .double, .bool, .string, .jsValue:
+            return ["_BridgedSwiftStackType"]
+        case .swiftStruct:
+            return ["_BridgedSwiftStruct"]
+        case .caseEnum:
+            return ["_BridgedSwiftCaseEnum"]
+        case .associatedValueEnum:
+            return ["_BridgedSwiftAssociatedValueEnum"]
+        case .rawValueEnum, .void, .unsafePointer, .namespaceEnum,
+            .swiftProtocol, .closure, .nullable, .array, .dictionary, .alias, .generic:
+            // Not supported yet.
+            return nil
+        }
+    }
+
+    /// Stack expressions for bare `T` and `T?`, the only generic shapes that
+    /// cannot reuse the concrete emission: `bridgeJSLowerParameter()` names
+    /// per-type members that the generic constraint erases to the stack, so
+    /// `bridgeJSStackPush()`/`bridgeJSStackPop()` is the shared spelling.
+    /// `[T]` and `[String: T]` go through the ordinary paths via the `Array`
+    /// and `Dictionary` stack conformances.
+    var genericStackPopExpression: String? {
+        switch self {
+        case .generic(let name): return "\(name).bridgeJSStackPop()"
+        case .nullable(.generic(let name), _): return "Optional<\(name)>.bridgeJSStackPop()"
+        default: return nil
+        }
+    }
+
+    func genericStackPushStatement(value: String) -> String? {
+        switch self {
+        case .generic, .nullable(.generic, _):
+            return "\(value).bridgeJSStackPush()"
+        default: return nil
+        }
+    }
+
     var swiftType: String {
         switch self {
         case .bool: return "Bool"
@@ -1470,6 +1718,8 @@ extension BridgeType {
             let effectsStr = (signature.isAsync ? " async" : "") + (signature.isThrows ? " throws" : "")
             let closureType = "(\(paramTypes))\(effectsStr) -> \(signature.returnType.swiftType)"
             return useJSTypedClosure ? "JSTypedClosure<\(closureType)>" : closureType
+        case .alias(let name, _): return name
+        case .generic(let name): return name
         }
     }
 
@@ -1494,6 +1744,8 @@ extension BridgeType {
             return true
         case .nullable(let wrapped, _):
             return wrapped.isStackUsingParameter
+        case .alias(_, let underlying):
+            return underlying.isStackUsingParameter
         default:
             return false
         }
@@ -1552,6 +1804,12 @@ extension BridgeType {
             return LiftingIntrinsicInfo(parameters: [("callbackId", .i32)])
         case .array, .dictionary:
             return LiftingIntrinsicInfo(parameters: [])
+        case .alias(_, let underlying):
+            return try underlying.liftParameterInfo()
+        case .generic:
+            throw BridgeJSCoreError(
+                "Generic parameters are only supported on imported declarations, not exported concrete-type codegen"
+            )
         }
     }
 
@@ -1603,6 +1861,12 @@ extension BridgeType {
             return .jsObject
         case .array, .dictionary:
             return .array
+        case .alias(_, let underlying):
+            return try underlying.loweringReturnInfo()
+        case .generic:
+            throw BridgeJSCoreError(
+                "Generic parameters are only supported on imported declarations, not exported concrete-type codegen"
+            )
         }
     }
 }
diff --git a/Plugins/BridgeJS/Sources/BridgeJSCore/ExternalModuleIndex.swift b/Plugins/BridgeJS/Sources/BridgeJSCore/ExternalModuleIndex.swift
index 91fd4388a..33a27d087 100644
--- a/Plugins/BridgeJS/Sources/BridgeJSCore/ExternalModuleIndex.swift
+++ b/Plugins/BridgeJS/Sources/BridgeJSCore/ExternalModuleIndex.swift
@@ -63,6 +63,12 @@ public struct ExternalModuleIndex {
             for proto in exported.protocols {
                 register(dotPath: proto.name, bridgeType: .swiftProtocol(proto.name))
             }
+            for alias in exported.aliases {
+                register(
+                    dotPath: alias.swiftCallName,
+                    bridgeType: .alias(name: alias.swiftCallName, underlying: alias.underlying)
+                )
+            }
 
             entriesByModule[moduleName] = moduleEntries
         }
diff --git a/Plugins/BridgeJS/Sources/BridgeJSCore/ImportTS.swift b/Plugins/BridgeJS/Sources/BridgeJSCore/ImportTS.swift
index d491c4058..cff1aa979 100644
--- a/Plugins/BridgeJS/Sources/BridgeJSCore/ImportTS.swift
+++ b/Plugins/BridgeJS/Sources/BridgeJSCore/ImportTS.swift
@@ -107,7 +107,7 @@ public struct ImportTS {
         let abiReturnType: WasmCoreType?
         // Track destructured variable names for multiple lowered parameters
         var destructuredVarNames: [String] = []
-        // Stack-lowered parameters should be evaluated in reverse order to match LIFO stacks
+        // Parameters are lowered in reverse order to match the LIFO stacks they push onto
         var stackLoweringStmts: [String] = []
         // Values to extend lifetime during call
         var valuesToExtendLifetimeDuringCall: [String] = []
@@ -143,6 +143,11 @@ public struct ImportTS {
         }
 
         func lowerParameter(param: Parameter) throws {
+            if let genericPush = param.type.genericStackPushStatement(value: param.name) {
+                stackLoweringStmts.insert(genericPush, at: 0)
+                return
+            }
+
             let loweringInfo = try param.type.loweringParameterInfo(context: context)
 
             switch param.type {
@@ -206,12 +211,8 @@ public struct ImportTS {
                     initializerExpr = ExprSyntax("\(raw: param.name).bridgeJSLowerParameter()")
                 }
 
-                if loweringInfo.loweredParameters.isEmpty {
-                    stackLoweringStmts.insert("let _ = \(initializerExpr)", at: 0)
-                    return
-                }
-
-                body.write("let \(pattern) = \(initializerExpr)")
+                let binding = loweringInfo.loweredParameters.isEmpty ? "_" : pattern
+                stackLoweringStmts.insert("let \(binding) = \(initializerExpr)", at: 0)
             }
             destructuredVarNames.append(contentsOf: destructuredNames)
 
@@ -241,6 +242,18 @@ public struct ImportTS {
             abiParameterForwardings.insert(contentsOf: ["resolveRef", "rejectRef"], at: 0)
         }
 
+        private func appendTypeIDParameter(index: Int, genericParameterName: String) {
+            let abiParamName = ABINameGenerator.genericTypeIdParameterName(index: index)
+            abiParameterSignatures.append((abiParamName, .i32))
+            abiParameterForwardings.append("\(genericParameterName).bridgeJSTypeID")
+        }
+
+        func appendTypeIDParameters(_ genericParameterNames: [String]) {
+            for (index, name) in genericParameterNames.enumerated() {
+                appendTypeIDParameter(index: index, genericParameterName: name)
+            }
+        }
+
         func call() throws {
             for stmt in stackLoweringStmts {
                 body.write(stmt.description)
@@ -272,9 +285,7 @@ public struct ImportTS {
                 }
             }
 
-            // Add exception check for ImportTS context (skipped for async, where
-            // errors are funneled through the JS-side reject path)
-            if !effects.isAsync && context == .importTS {
+            if !effects.isAsync && (context == .importTS || effects.isThrows) {
                 body.write("if let error = _swift_js_take_exception() { throw error }")
             }
         }
@@ -299,14 +310,18 @@ public struct ImportTS {
                 body.write("return \(returnType.swiftType).bridgeJSLiftReturnFromSideChannel()")
             } else {
                 let liftExpr: String
-                switch returnType {
-                case .closure(let signature, _):
-                    liftExpr = "_BJS_Closure_\(signature.mangleName).bridgeJSLift(ret)"
-                default:
-                    if liftingInfo.valueToLift != nil {
-                        liftExpr = "\(returnType.swiftType).bridgeJSLiftReturn(ret)"
-                    } else {
-                        liftExpr = "\(returnType.swiftType).bridgeJSLiftReturn()"
+                if let genericPop = returnType.genericStackPopExpression {
+                    liftExpr = genericPop
+                } else {
+                    switch returnType {
+                    case .closure(let signature, _):
+                        liftExpr = "_BJS_Closure_\(signature.mangleName).bridgeJSLift(ret)"
+                    default:
+                        if liftingInfo.valueToLift != nil {
+                            liftExpr = "\(returnType.swiftType).bridgeJSLiftReturn(ret)"
+                        } else {
+                            liftExpr = "\(returnType.swiftType).bridgeJSLiftReturn()"
+                        }
                     }
                 }
                 body.write("return \(liftExpr)")
@@ -323,18 +338,19 @@ public struct ImportTS {
             let innerBody = body
             body = CodeFragmentPrinter()
 
+            let tryKeyword = effects.isThrows ? "try" : "try!"
             let rejectFactory = "makeRejectClosure: { JSTypedClosure<(sending JSValue) -> Void>($0) }"
             if returnType == .void {
                 let resolveFactory = "makeResolveClosure: { JSTypedClosure<() -> Void>($0) }"
                 body.write(
-                    "try await _bjs_awaitPromise(\(resolveFactory), \(rejectFactory)) { resolveRef, rejectRef in"
+                    "\(tryKeyword) await _bjs_awaitPromise(\(resolveFactory), \(rejectFactory)) { resolveRef, rejectRef in"
                 )
             } else {
                 let resolveSwiftType = returnType.closureSwiftType
                 let resolveFactory =
                     "makeResolveClosure: { JSTypedClosure<(sending \(resolveSwiftType)) -> Void>($0) }"
                 body.write(
-                    "let resolved = try await _bjs_awaitPromise(\(resolveFactory), \(rejectFactory)) { resolveRef, rejectRef in"
+                    "let resolved = \(tryKeyword) await _bjs_awaitPromise(\(resolveFactory), \(rejectFactory)) { resolveRef, rejectRef in"
                 )
             }
             body.indent {
@@ -364,7 +380,8 @@ public struct ImportTS {
             name: String,
             parameters: [Parameter],
             returnType: BridgeType,
-            effects: Effects
+            effects: Effects,
+            genericParameters: [String] = []
         ) -> DeclSyntax {
             let printer = CodeFragmentPrinter()
             let signature = SwiftSignatureBuilder.buildFunctionSignature(
@@ -373,7 +390,12 @@ public struct ImportTS {
                 effects: effects,
                 useWildcardLabels: true
             )
-            printer.write("func \(name.backtickIfNeeded())\(signature) {")
+            let genericClause =
+                genericParameters.isEmpty
+                ? ""
+                : "<" + genericParameters.map { "\($0): BridgedSwiftGenericBridgeable" }.joined(separator: ", ")
+                    + ">"
+            printer.write("func \(name.backtickIfNeeded())\(genericClause)\(signature) {")
             printer.indent {
                 printer.write(lines: body.lines)
             }
@@ -433,6 +455,7 @@ public struct ImportTS {
         for param in function.parameters {
             try builder.lowerParameter(param: param)
         }
+        builder.appendTypeIDParameters(function.genericParameterNames)
         try builder.call()
         try builder.liftReturnValue()
         topLevelDecls.append(builder.renderImportDecl())
@@ -441,7 +464,8 @@ public struct ImportTS {
                 name: Self.thunkName(function: function),
                 parameters: function.parameters,
                 returnType: function.returnType,
-                effects: function.effects
+                effects: function.effects,
+                genericParameters: function.genericParameterNames
             )
             .with(\.leadingTrivia, Self.renderDocumentation(documentation: function.documentation))
         ]
@@ -462,6 +486,7 @@ public struct ImportTS {
             for param in method.parameters {
                 try builder.lowerParameter(param: param)
             }
+            builder.appendTypeIDParameters(method.genericParameterNames)
             try builder.call()
             try builder.liftReturnValue()
             topLevelDecls.append(builder.renderImportDecl())
@@ -470,7 +495,8 @@ public struct ImportTS {
                     name: Self.thunkName(type: type, method: method),
                     parameters: [selfParameter] + method.parameters,
                     returnType: method.returnType,
-                    effects: method.effects
+                    effects: method.effects,
+                    genericParameters: method.genericParameterNames
                 )
             ]
         }
@@ -486,6 +512,7 @@ public struct ImportTS {
             for param in method.parameters {
                 try builder.lowerParameter(param: param)
             }
+            builder.appendTypeIDParameters(method.genericParameterNames)
             try builder.call()
             try builder.liftReturnValue()
             topLevelDecls.append(builder.renderImportDecl())
@@ -494,7 +521,8 @@ public struct ImportTS {
                     name: Self.thunkName(type: type, method: method),
                     parameters: method.parameters,
                     returnType: method.returnType,
-                    effects: method.effects
+                    effects: method.effects,
+                    genericParameters: method.genericParameterNames
                 )
             ]
         }
@@ -510,6 +538,7 @@ public struct ImportTS {
             for param in constructor.parameters {
                 try builder.lowerParameter(param: param)
             }
+            builder.appendTypeIDParameters(constructor.genericParameterNames)
             try builder.call()
             try builder.liftReturnValue()
             topLevelDecls.append(builder.renderImportDecl())
@@ -518,7 +547,8 @@ public struct ImportTS {
                     name: Self.thunkName(type: type),
                     parameters: constructor.parameters,
                     returnType: .jsObject(nil),
-                    effects: effects
+                    effects: effects,
+                    genericParameters: constructor.genericParameterNames
                 )
             ]
         }
@@ -904,7 +934,7 @@ extension BridgeType {
     }
 
     func loweringParameterInfo(context: BridgeContext = .importTS) throws -> LoweringParameterInfo {
-        switch self {
+        switch self.unaliased {
         case .bool: return .bool
         case .integer(let t): return LoweringParameterInfo(loweredParameters: [("value", t.wasmCoreType)])
         case .float: return .float
@@ -928,12 +958,7 @@ extension BridgeType {
                 return LoweringParameterInfo(loweredParameters: [("objectId", .i32)])
             }
         case .caseEnum:
-            switch context {
-            case .importTS:
-                throw BridgeJSCoreError("Enum types are not yet supported in TypeScript imports")
-            case .exportSwift:
-                return LoweringParameterInfo(loweredParameters: [("value", .i32)])
-            }
+            return LoweringParameterInfo(loweredParameters: [("value", .i32)])
         case .rawValueEnum(_, let rawType):
             if rawType == .string {
                 return .string
@@ -941,29 +966,24 @@ extension BridgeType {
             let wasmType = rawType.wasmCoreType ?? .i32
             return LoweringParameterInfo(loweredParameters: [("value", wasmType)])
         case .associatedValueEnum:
-            switch context {
-            case .importTS:
-                throw BridgeJSCoreError("Enum types are not yet supported in TypeScript imports")
-            case .exportSwift:
-                return LoweringParameterInfo(loweredParameters: [("caseId", .i32)])
-            }
-        case .swiftStruct:
-            switch context {
-            case .importTS:
-                // Swift structs are bridged as JS objects (object IDs) in imported signatures.
-                return LoweringParameterInfo(loweredParameters: [("objectId", .i32)])
-            case .exportSwift:
-                return LoweringParameterInfo(loweredParameters: [])
-            }
+            return LoweringParameterInfo(loweredParameters: [("caseId", .i32)])
         case .namespaceEnum:
             throw BridgeJSCoreError("Namespace enums cannot be used as parameters")
         case .nullable(let wrappedType, _):
             let wrappedInfo = try wrappedType.loweringParameterInfo(context: context)
+            if wrappedInfo.loweredParameters.isEmpty {
+                return LoweringParameterInfo(loweredParameters: [])
+            }
             var params = [("isSome", WasmCoreType.i32)]
             params.append(contentsOf: wrappedInfo.loweredParameters)
             return LoweringParameterInfo(loweredParameters: params, useBorrowing: wrappedInfo.useBorrowing)
-        case .array, .dictionary:
+        case .swiftStruct:
+            // `@JS struct` parameters always use the stack ABI (same as arrays/dictionaries).
+            return LoweringParameterInfo(loweredParameters: [])
+        case .array, .dictionary, .generic:
             return LoweringParameterInfo(loweredParameters: [])
+        case .alias:
+            preconditionFailure("`.alias` must be resolved by `.unaliased` before reaching loweringParameterInfo")
         }
     }
 
@@ -983,7 +1003,7 @@ extension BridgeType {
     func liftingReturnInfo(
         context: BridgeContext = .importTS
     ) throws -> LiftingReturnInfo {
-        switch self {
+        switch self.unaliased {
         case .bool: return .bool
         case .integer(let t): return LiftingReturnInfo(valueToLift: t.wasmCoreType)
         case .float: return .float
@@ -1007,41 +1027,29 @@ extension BridgeType {
                 return LiftingReturnInfo(valueToLift: .i32)
             }
         case .caseEnum:
-            switch context {
-            case .importTS:
-                throw BridgeJSCoreError("Enum types are not yet supported in TypeScript imports")
-            case .exportSwift:
-                return LiftingReturnInfo(valueToLift: .i32)
-            }
+            return LiftingReturnInfo(valueToLift: .i32)
         case .rawValueEnum(_, let rawType):
             let wasmType = rawType.wasmCoreType ?? .i32
             return LiftingReturnInfo(valueToLift: wasmType)
         case .associatedValueEnum:
-            switch context {
-            case .importTS:
-                throw BridgeJSCoreError("Enum types are not yet supported in TypeScript imports")
-            case .exportSwift:
-                return LiftingReturnInfo(valueToLift: .i32)
-            }
-        case .swiftStruct:
-            switch context {
-            case .importTS:
-                // Swift structs are bridged as JS objects (object IDs) in imported signatures.
-                return LiftingReturnInfo(valueToLift: .i32)
-            case .exportSwift:
-                return LiftingReturnInfo(valueToLift: nil)
-            }
+            return LiftingReturnInfo(valueToLift: .i32)
         case .namespaceEnum:
             throw BridgeJSCoreError("Namespace enums cannot be used as return values")
         case .nullable(let wrappedType, _):
-            // jsObject uses stack ABI for optionals — returns void, value goes through stacks
+            // jsObject uses the stack ABI for optionals — the thunk returns void and the
+            // value (plus isSome discriminator) flows through the stacks.
             if case .jsObject = wrappedType {
                 return LiftingReturnInfo(valueToLift: nil)
             }
             let wrappedInfo = try wrappedType.liftingReturnInfo(context: context)
             return LiftingReturnInfo(valueToLift: wrappedInfo.valueToLift)
-        case .array, .dictionary:
+        case .swiftStruct:
+            // `@JS struct` returns always use the stack ABI (same as arrays/dictionaries).
+            return LiftingReturnInfo(valueToLift: nil)
+        case .array, .dictionary, .generic:
             return LiftingReturnInfo(valueToLift: nil)
+        case .alias:
+            preconditionFailure("`.alias` must be resolved by `.unaliased` before reaching liftingReturnInfo")
         }
     }
 }
diff --git a/Plugins/BridgeJS/Sources/BridgeJSCore/Misc.swift b/Plugins/BridgeJS/Sources/BridgeJSCore/Misc.swift
index 37040d7a6..8d7b7c902 100644
--- a/Plugins/BridgeJS/Sources/BridgeJSCore/Misc.swift
+++ b/Plugins/BridgeJS/Sources/BridgeJSCore/Misc.swift
@@ -137,14 +137,21 @@ import SwiftSyntax
 import class Foundation.ProcessInfo
 
 public struct DiagnosticError: Error {
+    public enum Severity: String, Sendable {
+        case error
+        case warning
+    }
+
     public let node: Syntax
     public let message: String
     public let hint: String?
+    public let severity: Severity
 
-    public init(node: some SyntaxProtocol, message: String, hint: String? = nil) {
+    public init(node: some SyntaxProtocol, message: String, hint: String? = nil, severity: Severity = .error) {
         self.node = Syntax(node)
         self.message = message
         self.hint = hint
+        self.severity = severity
     }
 
     /// Formats the diagnostic error as a string.
@@ -166,12 +173,14 @@ public struct DiagnosticError: Error {
 
         let lineNumberWidth = max(3, String(lines.count).count)
 
+        let severityLabel = severity.rawValue
+        let severityColor = severity == .warning ? ANSI.boldYellow : ANSI.boldRed
         let header: String = {
             guard colorize else {
-                return "\(displayFileName):\(startLocation.line):\(startLocation.column): error: \(message)"
+                return "\(displayFileName):\(startLocation.line):\(startLocation.column): \(severityLabel): \(message)"
             }
             return
-                "\(displayFileName):\(startLocation.line):\(startLocation.column): \(ANSI.boldRed)error: \(ANSI.boldDefault)\(message)\(ANSI.reset)"
+                "\(displayFileName):\(startLocation.line):\(startLocation.column): \(severityColor)\(severityLabel): \(ANSI.boldDefault)\(message)\(ANSI.reset)"
         }()
 
         let highlightStartColumn = min(max(1, startLocation.column), mainLine.utf8.count + 1)
@@ -227,8 +236,8 @@ public struct DiagnosticError: Error {
         let pointerSpacing = max(0, highlightStartColumn - 1)
         let pointerMessage: String = {
             let pointer = String(repeating: " ", count: pointerSpacing) + "`- "
-            guard colorize else { return pointer + "error: \(message)" }
-            return pointer + "\(ANSI.boldRed)error: \(ANSI.boldDefault)\(message)\(ANSI.reset)"
+            guard colorize else { return pointer + "\(severityLabel): \(message)" }
+            return pointer + "\(severityColor)\(severityLabel): \(ANSI.boldDefault)\(message)\(ANSI.reset)"
         }()
         descriptionParts.append(
             Self.formatSourceLine(
@@ -304,6 +313,7 @@ public struct BridgeJSCoreDiagnosticError: Swift.Error, CustomStringConvertible
 private enum ANSI {
     static let reset = "\u{001B}[0;0m"
     static let boldRed = "\u{001B}[1;31m"
+    static let boldYellow = "\u{001B}[1;33m"
     static let boldDefault = "\u{001B}[1;39m"
     static let cyan = "\u{001B}[0;36m"
     static let underline = "\u{001B}[4;39m"
diff --git a/Plugins/BridgeJS/Sources/BridgeJSCore/SwiftToSkeleton.swift b/Plugins/BridgeJS/Sources/BridgeJSCore/SwiftToSkeleton.swift
index 57b9a57df..fb81d9089 100644
--- a/Plugins/BridgeJS/Sources/BridgeJSCore/SwiftToSkeleton.swift
+++ b/Plugins/BridgeJS/Sources/BridgeJSCore/SwiftToSkeleton.swift
@@ -7,6 +7,79 @@ import BridgeJSUtilities
 import BridgeJSSkeleton
 #endif
 
+/// Outcome of attempting to resolve a type as a reference to a generic parameter.
+enum GenericParameterResolution {
+    case resolved(BridgeType)
+    /// A non-nil message is a hard diagnostic; `nil` means the type isn't generic
+    /// and the caller should fall back to normal type resolution.
+    case rejected(String?)
+}
+
+func resolveGenericTypeReference(
+    for type: TypeSyntax,
+    genericParameterNames: [String]
+) -> GenericParameterResolution {
+    if let identifier = type.as(IdentifierTypeSyntax.self),
+        identifier.genericArgumentClause == nil,
+        genericParameterNames.contains(identifier.name.text)
+    {
+        return .resolved(.generic(identifier.name.text))
+    }
+    if let wrapped = wrappedGenericBridgeType(for: type, genericParameterNames: genericParameterNames) {
+        return .resolved(wrapped)
+    }
+    if !genericParameterNames.isEmpty,
+        let wrapped = wrappedGenericParameter(in: type, genericParameterNames: genericParameterNames)
+    {
+        return .rejected(
+            "Generic parameter '\(wrapped)' may only be used as a bare type; wrapping it beyond 'T?', '[T]' and '[String: T]' is not supported."
+        )
+    }
+    return .rejected(nil)
+}
+
+private func wrappedGenericParameter(
+    in type: TypeSyntax,
+    genericParameterNames: [String]
+) -> String? {
+    for token in type.tokens(viewMode: .sourceAccurate) {
+        if case .identifier(let text) = token.tokenKind, genericParameterNames.contains(text) {
+            return text
+        }
+    }
+    return nil
+}
+
+private func wrappedGenericBridgeType(
+    for type: TypeSyntax,
+    genericParameterNames: [String]
+) -> BridgeType? {
+    func bareGenericName(_ inner: TypeSyntax) -> String? {
+        guard let identifier = inner.as(IdentifierTypeSyntax.self),
+            identifier.genericArgumentClause == nil,
+            genericParameterNames.contains(identifier.name.text)
+        else {
+            return nil
+        }
+        return identifier.name.text
+    }
+    if let arrayType = type.as(ArrayTypeSyntax.self), let name = bareGenericName(arrayType.element) {
+        return .array(.generic(name))
+    }
+    if let optionalType = type.as(OptionalTypeSyntax.self), let name = bareGenericName(optionalType.wrappedType) {
+        return .nullable(.generic(name), .null)
+    }
+    if let dictType = type.as(DictionaryTypeSyntax.self),
+        let keyIdentifier = dictType.key.as(IdentifierTypeSyntax.self),
+        keyIdentifier.genericArgumentClause == nil,
+        keyIdentifier.name.text == "String",
+        let name = bareGenericName(dictType.value)
+    {
+        return .dictionary(.generic(name))
+    }
+    return nil
+}
+
 /// Builds BridgeJS skeletons from Swift source files using SwiftSyntax walk for API collection.
 ///
 /// This is a shared entry point for producing:
@@ -23,18 +96,25 @@ public final class SwiftToSkeleton {
 
     private var sourceFiles: [(sourceFile: SourceFileSyntax, inputFilePath: String)] = []
     private var usedExternalModules = Set<String>()
+    private let javaScriptModuleExists: (String) throws -> Bool
+    private var validatedJavaScriptModulePaths = Set<String>()
+
+    /// Non-fatal diagnostics collected during `finalize()`. These do not fail the build.
+    public private(set) var warnings: [(file: String, diagnostic: DiagnosticError)] = []
 
     public init(
         progress: ProgressReporting,
         moduleName: String,
         exposeToGlobal: Bool,
         externalModuleIndex: ExternalModuleIndex,
-        identityMode: String? = nil
+        identityMode: String? = nil,
+        javaScriptModuleExists: @escaping (String) throws -> Bool = { _ in false }
     ) {
         self.progress = progress
         self.moduleName = moduleName
         self.exposeToGlobal = exposeToGlobal
         self.identityMode = identityMode
+        self.javaScriptModuleExists = javaScriptModuleExists
         self.typeDeclResolver = TypeDeclResolver()
         self.externalModuleIndex = externalModuleIndex
 
@@ -59,6 +139,39 @@ public final class SwiftToSkeleton {
         sourceFiles.append((sourceFile, inputFilePath))
     }
 
+    private func resolveDeferredExtensions(_ exportCollectors: [ExportSwiftAPICollector]) {
+        var pendingExtensions = exportCollectors.flatMap { collector in
+            collector.deferredExtensions.map { (owner: collector, declaration: $0) }
+        }
+        var previousCount: Int
+        // An extended type might be defined in another extension, so keep resolving until no more progress is made.
+        repeat {
+            previousCount = pendingExtensions.count
+            var nextPendingExtensions: [(owner: ExportSwiftAPICollector, declaration: ExtensionDeclSyntax)] = []
+            for pending in pendingExtensions {
+                if !resolveExtension(pending.declaration, in: exportCollectors) {
+                    nextPendingExtensions.append(pending)
+                }
+            }
+            pendingExtensions = nextPendingExtensions
+        } while pendingExtensions.count < previousCount
+        for pending in pendingExtensions {
+            pending.owner.diagnoseUnresolvedExtension(pending.declaration)
+        }
+    }
+
+    private func resolveExtension(
+        _ declaration: ExtensionDeclSyntax,
+        in exportCollectors: [ExportSwiftAPICollector]
+    ) -> Bool {
+        for collector in exportCollectors {
+            if collector.resolveExtension(declaration) {
+                return true
+            }
+        }
+        return false
+    }
+
     public func finalize() throws -> BridgeJSSkeleton {
         var perSourceErrors: [(inputFilePath: String, errors: [DiagnosticError])] = []
         var importedFiles: [ImportedFileSkeleton] = []
@@ -87,10 +200,69 @@ public final class SwiftToSkeleton {
             )
             importCollector.walk(sourceFile)
 
-            let importErrorsFatal = importCollector.errors.filter { !$0.message.contains("Unsupported type '") }
-            if !exportCollector.errors.isEmpty || !importErrorsFatal.isEmpty {
+            let importOrigins =
+                importCollector.importedFunctions.compactMap(\.from)
+                + importCollector.importedTypes.compactMap(\.from)
+                + importCollector.importedGlobalGetters.compactMap(\.from)
+            // Only snippet paths are validated here. Bare module specifiers are resolved
+            // by the JavaScript host (a bundler, an import map, or Node's `node_modules`
+            // lookup), so there is nothing we can check without rejecting setups that
+            // legitimately work.
+            let snippetPaths = Set(importOrigins.compactMap(\.snippetPath))
+            for path in snippetPaths.sorted() {
+                if validatedJavaScriptModulePaths.contains(path) {
+                    continue
+                }
+                let pathNode = importCollector.importedModulePathNodes[path] ?? Syntax(sourceFile)
+                guard path.hasPrefix("/") else {
+                    importCollector.errors.append(
+                        DiagnosticError(
+                            node: pathNode,
+                            message: "JavaScript snippet paths must start with '/' to indicate the Swift target root: "
+                                + "'\(path)'. For an external module, use 'from: .module(\"\(path)\")' instead."
+                        )
+                    )
+                    continue
+                }
+                guard !path.split(separator: "/").contains("..") else {
+                    importCollector.errors.append(
+                        DiagnosticError(
+                            node: pathNode,
+                            message: "JavaScript snippet paths must not contain '..': '\(path)'."
+                        )
+                    )
+                    continue
+                }
+                let lowercasedPath = path.lowercased()
+                guard lowercasedPath.hasSuffix(".js") || lowercasedPath.hasSuffix(".mjs") else {
+                    importCollector.errors.append(
+                        DiagnosticError(
+                            node: pathNode,
+                            message: "JavaScript snippets must use a '.js' or '.mjs' extension: '\(path)'."
+                        )
+                    )
+                    continue
+                }
+                guard try javaScriptModuleExists(path) else {
+                    importCollector.errors.append(
+                        DiagnosticError(
+                            node: pathNode,
+                            message: "JavaScript snippet file was not found at '\(path)'."
+                        )
+                    )
+                    continue
+                }
+                validatedJavaScriptModulePaths.insert(path)
+            }
+
+            let importErrorsFatal = importCollector.errors.filter {
+                $0.severity == .error && !$0.message.contains("Unsupported type '")
+            }
+            let fileWarnings = importCollector.errors.filter { $0.severity == .warning }
+            warnings.append(contentsOf: fileWarnings.map { (file: inputFilePath, diagnostic: $0) })
+            if !importErrorsFatal.isEmpty {
                 perSourceErrors.append(
-                    (inputFilePath: inputFilePath, errors: exportCollector.errors + importErrorsFatal)
+                    (inputFilePath: inputFilePath, errors: importErrorsFatal)
                 )
             }
 
@@ -105,8 +277,18 @@ public final class SwiftToSkeleton {
         }
 
         // Resolve extensions against all collectors. This needs to happen at this point so we can resolve both same file and cross file extensions.
-        for source in exportCollectors {
-            source.resolveDeferredExtensions(against: exportCollectors)
+        resolveDeferredExtensions(exportCollectors)
+
+        // We have to collect diagnostics after all deferred extensions are resolved, since they could generate some.
+        for ((_, inputFilePath), exportCollector) in zip(sourceFiles, exportCollectors) {
+            let exportErrors = exportCollector.errors.filter { $0.severity == .error }
+            let fileWarnings = exportCollector.errors.filter { $0.severity == .warning }
+            warnings.append(contentsOf: fileWarnings.map { (file: inputFilePath, diagnostic: $0) })
+            if !exportErrors.isEmpty {
+                perSourceErrors.append(
+                    (inputFilePath: inputFilePath, errors: exportErrors)
+                )
+            }
         }
 
         for collector in exportCollectors {
@@ -191,7 +373,40 @@ public final class SwiftToSkeleton {
             }
 
             let isAsync = functionType.effectSpecifiers?.asyncSpecifier != nil
-            let isThrows = functionType.effectSpecifiers?.throwsClause != nil
+
+            if isAsync, !returnType.isAsyncResolvable {
+                errors.append(
+                    DiagnosticError(
+                        node: functionType,
+                        message:
+                            "Returning '\(returnType.swiftType)' from an async closure is not yet supported",
+                        hint:
+                            "Return a type lowerable through the async resolve ABI "
+                            + "(String/Int/Bool/Double/Float/raw-value or case-only enum/@JS struct/JSObject/Optional/Array/Dictionary), "
+                            + "or make the closure non-async."
+                    )
+                )
+                return nil
+            }
+
+            var isThrows = false
+            if let throwsClause = functionType.effectSpecifiers?.throwsClause {
+                guard let thrownType = throwsClause.type,
+                    thrownType.trimmedDescription == "JSException"
+                else {
+                    errors.append(
+                        DiagnosticError(
+                            node: throwsClause,
+                            message:
+                                "Only JSException is supported for thrown type of Swift closures, "
+                                + "got \(throwsClause.type?.trimmedDescription ?? "unspecified")",
+                            hint: "Annotate the closure as `throws(JSException)`"
+                        )
+                    )
+                    return nil
+                }
+                isThrows = true
+            }
 
             return .closure(
                 ClosureSignature(
@@ -352,12 +567,17 @@ public final class SwiftToSkeleton {
 
         if let typeDecl = typeDeclResolver.resolve(type) {
             if typeDecl.is(ProtocolDeclSyntax.self) {
-                let swiftCallName = SwiftToSkeleton.computeSwiftCallName(for: typeDecl, itemName: typeDecl.name.text)
+                let swiftCallName = computeSwiftCallName(for: typeDecl, itemName: typeDecl.name.text)
                 return .swiftProtocol(swiftCallName)
             }
 
             if let enumDecl = typeDecl.as(EnumDeclSyntax.self) {
-                let swiftCallName = SwiftToSkeleton.computeSwiftCallName(for: enumDecl, itemName: enumDecl.name.text)
+                let swiftCallName = computeSwiftCallName(for: enumDecl, itemName: enumDecl.name.text)
+                if let jsAttribute = enumDecl.attributes.firstJSAttribute,
+                    let aliasTarget = extractAliasTarget(from: jsAttribute)
+                {
+                    return aliasType(target: aliasTarget, swiftCallName: swiftCallName, errors: &errors)
+                }
                 let rawTypeString = enumDecl.inheritanceClause?.inheritedTypes.first { inheritedType in
                     let typeName = inheritedType.type.trimmedDescription
                     return ExportSwiftConstants.supportedRawTypes.contains(typeName)
@@ -391,20 +611,25 @@ public final class SwiftToSkeleton {
             }
 
             if let structDecl = typeDecl.as(StructDeclSyntax.self) {
-                let swiftCallName = SwiftToSkeleton.computeSwiftCallName(
+                let swiftCallName = computeSwiftCallName(
                     for: structDecl,
                     itemName: structDecl.name.text
                 )
                 if structDecl.attributes.hasAttribute(name: "JSClass") {
                     return .jsObject(swiftCallName)
                 }
+                if let jsAttribute = structDecl.attributes.firstJSAttribute,
+                    let aliasTarget = extractAliasTarget(from: jsAttribute)
+                {
+                    return aliasType(target: aliasTarget, swiftCallName: swiftCallName, errors: &errors)
+                }
                 return .swiftStruct(swiftCallName)
             }
 
             guard typeDecl.is(ClassDeclSyntax.self) || typeDecl.is(ActorDeclSyntax.self) else {
                 return nil
             }
-            let swiftCallName = SwiftToSkeleton.computeSwiftCallName(for: typeDecl, itemName: typeDecl.name.text)
+            let swiftCallName = computeSwiftCallName(for: typeDecl, itemName: typeDecl.name.text)
 
             // A type annotated with @JSClass is a JavaScript object wrapper (imported),
             // even if it is declared as a Swift class.
@@ -415,6 +640,13 @@ public final class SwiftToSkeleton {
                 return .jsObject(swiftCallName)
             }
 
+            if let classDecl = typeDecl.as(ClassDeclSyntax.self),
+                let jsAttribute = classDecl.attributes.firstJSAttribute,
+                let aliasTarget = extractAliasTarget(from: jsAttribute)
+            {
+                return aliasType(target: aliasTarget, swiftCallName: swiftCallName, errors: &errors)
+            }
+
             return .swiftHeapObject(swiftCallName)
         }
 
@@ -437,7 +669,7 @@ public final class SwiftToSkeleton {
     private func resolveExternal(for type: TypeSyntax, errors: inout [DiagnosticError]) -> BridgeType? {
         guard
             !externalModuleIndex.isEmpty,
-            var components = typeDeclResolver.qualifiedComponents(from: type)
+            var components = type.qualifiedComponents
         else {
             return nil
         }
@@ -476,6 +708,57 @@ public final class SwiftToSkeleton {
         }
     }
 
+    fileprivate func extractAliasTarget(from jsAttribute: AttributeSyntax) -> TypeSyntax? {
+        guard
+            let arguments = jsAttribute.arguments?.as(LabeledExprListSyntax.self),
+            let asArg = arguments.first(where: { $0.label?.text == "as" }),
+            let memberAccess = asArg.expression.as(MemberAccessExprSyntax.self),
+            memberAccess.declName.baseName.text == "self",
+            let base = memberAccess.base
+        else {
+            return nil
+        }
+        return TypeSyntax(stringLiteral: base.trimmedDescription)
+    }
+
+    fileprivate func aliasType(
+        target aliasTarget: TypeSyntax,
+        swiftCallName: String,
+        errors: inout [DiagnosticError]
+    ) -> BridgeType? {
+        func diagnoseChainedAlias() -> BridgeType? {
+            errors.append(
+                DiagnosticError(
+                    node: aliasTarget,
+                    message: "`@JS(as:)` target must be a `@JS` type, not another `@JS(as:)` type",
+                    hint: "Use the underlying `@JS` type directly"
+                )
+            )
+            return nil
+        }
+        if let targetDecl = typeDeclResolver.resolve(aliasTarget),
+            let targetJSAttribute = targetDecl.attributes.firstJSAttribute,
+            extractAliasTarget(from: targetJSAttribute) != nil
+        {
+            return diagnoseChainedAlias()
+        }
+        guard let targetType = lookupType(for: aliasTarget, errors: &errors) else { return nil }
+        if case .alias = targetType {
+            // Alias declared in another module.
+            return diagnoseChainedAlias()
+        }
+        if case .swiftProtocol = targetType {
+            errors.append(
+                DiagnosticError(
+                    node: aliasTarget,
+                    message: "`@JS(as:)` cannot target a `@JS protocol`"
+                )
+            )
+            return nil
+        }
+        return .alias(name: swiftCallName, underlying: targetType)
+    }
+
     fileprivate static func parseUnsafePointerType(_ type: TypeSyntax) -> UnsafePointerType? {
         func parse(baseName: String, genericArg: TypeSyntax?) -> UnsafePointerType? {
             let pointee = genericArg?.trimmedDescription
@@ -525,27 +808,50 @@ public final class SwiftToSkeleton {
         return nil
     }
 
-    /// Computes the full Swift call name by walking up the AST hierarchy to find all parent enums
+    /// This currently doesn’t work correctly for extensions on types defined in other modules,
+    /// which is fine for now since we don’t support extending @JS types from other modules.
+    /// This will need updating when we do.
+    fileprivate func enclosingDeclarations(of node: some SyntaxProtocol) -> [Syntax] {
+        var declarations: [Syntax] = []
+        var visitedExtendedTypes: Set<SyntaxIdentifier> = []
+        var currentNode: Syntax? = Syntax(node).parent
+
+        while let parent = currentNode {
+            if let extensionDecl = parent.as(ExtensionDeclSyntax.self) {
+                if let extendedDecl = typeDeclResolver.resolveExtensionTarget(extensionDecl.extendedType),
+                    visitedExtendedTypes.insert(extendedDecl.id).inserted
+                {
+                    declarations.append(Syntax(extendedDecl))
+                    currentNode = Syntax(extendedDecl).parent
+                } else {
+                    currentNode = parent.parent
+                }
+            } else {
+                declarations.append(parent)
+                currentNode = parent.parent
+            }
+        }
+        return declarations
+    }
+
     /// This generates the qualified name needed for Swift code generation (e.g., "Networking.API.HTTPServer")
-    fileprivate static func computeSwiftCallName(for node: some SyntaxProtocol, itemName: String) -> String {
+    fileprivate func computeSwiftCallName(for node: some SyntaxProtocol, itemName: String) -> String {
         var swiftPath: [String] = []
-        var currentNode: Syntax? = node.parent
 
-        while let parent = currentNode {
-            if let enumDecl = parent.as(EnumDeclSyntax.self),
+        for declaration in enclosingDeclarations(of: node) {
+            if let enumDecl = declaration.as(EnumDeclSyntax.self),
                 enumDecl.attributes.hasJSAttribute()
             {
                 swiftPath.insert(enumDecl.name.text, at: 0)
-            } else if let structDecl = parent.as(StructDeclSyntax.self),
+            } else if let structDecl = declaration.as(StructDeclSyntax.self),
                 structDecl.attributes.hasJSAttribute()
             {
                 swiftPath.insert(structDecl.name.text, at: 0)
-            } else if let classDecl = parent.as(ClassDeclSyntax.self),
+            } else if let classDecl = declaration.as(ClassDeclSyntax.self),
                 classDecl.attributes.hasJSAttribute()
             {
                 swiftPath.insert(classDecl.name.text, at: 0)
             }
-            currentNode = parent.parent
         }
 
         if swiftPath.isEmpty {
@@ -563,6 +869,28 @@ public final class SwiftToSkeleton {
         return String(name.dropFirst().dropLast())
     }
 
+    fileprivate static func isValidJSIdentifier(_ name: String) -> Bool {
+        func isIdentifierPart(_ scalar: Unicode.Scalar, isStart: Bool) -> Bool {
+            switch scalar {
+            case "a"..."z", "A"..."Z", "_", "$":
+                return true
+            case "0"..."9":
+                return !isStart
+            default:
+                return false
+            }
+        }
+        guard let first = name.unicodeScalars.first, isIdentifierPart(first, isStart: true) else {
+            return false
+        }
+        return name.unicodeScalars.dropFirst().allSatisfy { isIdentifierPart($0, isStart: false) }
+    }
+
+    fileprivate static func isBridgeableGenericConstraint(_ constraint: String?) -> Bool {
+        constraint == "BridgedSwiftGenericBridgeable"
+            || constraint == "JavaScriptKit.BridgedSwiftGenericBridgeable"
+    }
+
 }
 
 private enum ExportSwiftConstants {
@@ -595,6 +923,17 @@ extension AttributeListSyntax {
     }
 }
 
+private final class JSAttributeFinder: SyntaxVisitor {
+    private(set) var found = false
+
+    override func visit(_ node: AttributeSyntax) -> SyntaxVisitorContinueKind {
+        if node.attributeNameText == "JS" {
+            found = true
+        }
+        return .skipChildren
+    }
+}
+
 private final class ExportSwiftAPICollector: SyntaxAnyVisitor {
     var exportedFunctions: [ExportedFunction] = []
     /// The names of the exported classes, in the order they were written in the source file
@@ -609,6 +948,7 @@ private final class ExportSwiftAPICollector: SyntaxAnyVisitor {
     /// The names of the exported structs, in the order they were written in the source file
     var exportedStructNames: [String] = []
     var exportedStructByName: [String: ExportedStruct] = [:]
+    var exportedAliases: [ExportedAlias] = []
     var errors: [DiagnosticError] = []
     /// Extensions collected during the walk, to be resolved after all files have been walked
     var deferredExtensions: [ExtensionDeclSyntax] = []
@@ -619,6 +959,7 @@ private final class ExportSwiftAPICollector: SyntaxAnyVisitor {
         result.enums.append(contentsOf: exportedEnumNames.map { exportedEnumByName[$0]! })
         result.structs.append(contentsOf: exportedStructNames.map { exportedStructByName[$0]! })
         result.protocols.append(contentsOf: exportedProtocolNames.map { exportedProtocolByName[$0]! })
+        result.aliases.append(contentsOf: exportedAliases)
     }
 
     /// Creates a unique key by combining name and namespace
@@ -1028,26 +1369,6 @@ private final class ExportSwiftAPICollector: SyntaxAnyVisitor {
             guard let type = resolvedType else {
                 continue  // Skip unsupported types
             }
-            if case .closure(let signature, _) = type {
-                if signature.isAsync {
-                    diagnose(
-                        node: param.type,
-                        message: "Async is not supported for Swift closures yet."
-                    )
-                    continue
-                }
-                if signature.isThrows {
-                    diagnose(
-                        node: param.type,
-                        message: "Throws is not supported for Swift closures yet."
-                    )
-                    continue
-                }
-            }
-            if case .nullable(let wrappedType, _) = type, wrappedType.isOptional {
-                diagnoseNestedOptional(node: param.type, type: param.type.trimmedDescription)
-                continue
-            }
             if case .nullable(let wrappedType, _) = type, wrappedType.isOptional {
                 diagnoseNestedOptional(node: param.type, type: param.type.trimmedDescription)
                 continue
@@ -1136,7 +1457,17 @@ private final class ExportSwiftAPICollector: SyntaxAnyVisitor {
             return nil
         }
 
+        if let genericClause = node.genericParameterClause, let firstGenericParam = genericClause.parameters.first {
+            diagnose(
+                node: firstGenericParam,
+                message:
+                    "Generic parameters on exported @JS functions are not supported yet. Generic functions are currently only supported on imported @JSFunction declarations."
+            )
+            return nil
+        }
+
         let name = node.name.text
+        let jsName = extractValidatedJSName(from: jsAttribute)
 
         let attributeNamespace = extractNamespace(from: jsAttribute)
         let computedNamespace = computeNamespace(for: node)
@@ -1224,7 +1555,7 @@ private final class ExportSwiftAPICollector: SyntaxAnyVisitor {
             classNameForABI = nil
         }
         abiName = ABINameGenerator.generateABIName(
-            baseName: name,
+            baseName: jsName ?? name,
             namespace: finalNamespace,
             staticContext: isStatic ? staticContext : nil,
             className: classNameForABI
@@ -1236,15 +1567,62 @@ private final class ExportSwiftAPICollector: SyntaxAnyVisitor {
 
         return ExportedFunction(
             name: name,
+            jsName: jsName,
             abiName: abiName,
             parameters: parameters,
             returnType: returnType,
             effects: effects,
             namespace: finalNamespace,
-            staticContext: staticContext
+            staticContext: staticContext,
+            documentation: extractDocumentation(from: node)
         )
     }
 
+    /// Returns the doc comment (`///` or `/** */`) attached to a declaration, with
+    /// markers stripped and DocC field lists (`- Parameters:`, `- Returns:`) preserved.
+    private func extractDocumentation(from node: some SyntaxProtocol) -> String? {
+        var run: [String] = []
+        for piece in node.leadingTrivia {
+            switch piece {
+            case .docLineComment(let text):
+                var line = Substring(text)
+                if line.hasPrefix("///") { line = line.dropFirst(3) }
+                if line.first == " " { line = line.dropFirst() }
+                if line.last == "\r" { line = line.dropLast() }
+                run.append(String(line))
+            case .docBlockComment(let text):
+                run.append(contentsOf: stripBlockComment(text))
+            case .newlines(let count), .carriageReturns(let count), .carriageReturnLineFeeds(let count):
+                if count >= 2 { run.removeAll() }
+            case .lineComment, .blockComment:
+                run.removeAll()
+            default:
+                continue
+            }
+        }
+        // Trim boundary blank lines so line (`///`) and block (`/** */`) comments
+        // produce a consistent skeleton value.
+        while run.first?.trimmingCharacters(in: .whitespaces).isEmpty == true { run.removeFirst() }
+        while run.last?.trimmingCharacters(in: .whitespaces).isEmpty == true { run.removeLast() }
+        return run.isEmpty ? nil : run.joined(separator: "\n")
+    }
+
+    private func stripBlockComment(_ text: String) -> [String] {
+        var body = Substring(text)
+        if body.hasPrefix("/**") { body = body.dropFirst(3) }
+        if body.hasSuffix("*/") { body = body.dropLast(2) }
+        return body.split(separator: "\n", omittingEmptySubsequences: false).map { raw -> String in
+            var line = raw[...]
+            if line.last == "\r" { line = line.dropLast() }
+            while let first = line.first, first == " " || first == "\t" { line = line.dropFirst() }
+            if line.first == "*" {
+                line = line.dropFirst()
+                if line.first == " " { line = line.dropFirst() }
+            }
+            return String(line)
+        }
+    }
+
     private func collectEffects(signature: FunctionSignatureSyntax, isStatic: Bool = false) -> Effects? {
         let isAsync = signature.effectSpecifiers?.asyncSpecifier != nil
         var isThrows = false
@@ -1269,6 +1647,45 @@ private final class ExportSwiftAPICollector: SyntaxAnyVisitor {
         return Effects(isAsync: isAsync, isThrows: isThrows, isStatic: isStatic)
     }
 
+    private func extractJSName(
+        from jsAttribute: AttributeSyntax
+    ) -> String? {
+        guard let arguments = jsAttribute.arguments?.as(LabeledExprListSyntax.self),
+            let nameArg = arguments.first,
+            nameArg.label == nil,
+            let stringLiteral = nameArg.expression.as(StringLiteralExprSyntax.self),
+            stringLiteral.segments.count == 1,
+            let name = stringLiteral.segments.first?.as(StringSegmentSyntax.self)?.content.text
+        else {
+            return nil
+        }
+        return name
+    }
+
+    private func extractValidatedJSName(
+        from jsAttribute: AttributeSyntax
+    ) -> String? {
+        guard let jsName = extractJSName(from: jsAttribute) else { return nil }
+        guard SwiftToSkeleton.isValidJSIdentifier(jsName) else {
+            diagnose(
+                node: jsAttribute,
+                message: "`\(jsName)` is not a valid JavaScript identifier"
+            )
+            return nil
+        }
+        return jsName
+    }
+
+    private func diagnoseUnsupportedJSName(
+        from jsAttribute: AttributeSyntax
+    ) {
+        guard extractJSName(from: jsAttribute) != nil else { return }
+        diagnose(
+            node: jsAttribute,
+            message: "A separate name for JavaScript is not supported here"
+        )
+    }
+
     private func extractNamespace(
         from jsAttribute: AttributeSyntax
     ) -> [String]? {
@@ -1315,6 +1732,8 @@ private final class ExportSwiftAPICollector: SyntaxAnyVisitor {
     override func visit(_ node: InitializerDeclSyntax) -> SyntaxVisitorContinueKind {
         guard let jsAttribute = node.attributes.firstJSAttribute else { return .skipChildren }
 
+        diagnoseUnsupportedJSName(from: jsAttribute)
+
         switch state {
         case .classBody(_, let classKey):
             if extractNamespace(from: jsAttribute) != nil {
@@ -1335,7 +1754,8 @@ private final class ExportSwiftAPICollector: SyntaxAnyVisitor {
             let constructor = ExportedConstructor(
                 abiName: "bjs_\(classAbiName)_init",
                 parameters: parameters,
-                effects: effects
+                effects: effects,
+                documentation: extractDocumentation(from: node)
             )
             exportedClassByName[classKey]?.constructor = constructor
 
@@ -1358,7 +1778,8 @@ private final class ExportSwiftAPICollector: SyntaxAnyVisitor {
             let constructor = ExportedConstructor(
                 abiName: "bjs_\(structAbiName)_init",
                 parameters: parameters,
-                effects: effects
+                effects: effects,
+                documentation: extractDocumentation(from: node)
             )
             exportedStructByName[structKey]?.constructor = constructor
 
@@ -1434,6 +1855,15 @@ private final class ExportSwiftAPICollector: SyntaxAnyVisitor {
             }
         }
 
+        let jsName = extractValidatedJSName(from: jsAttribute)
+        if jsName != nil, node.bindings.count > 1 {
+            diagnose(
+                node: jsAttribute,
+                message: "Name targets declaration with multiple bindings",
+                hint: "Declare each property with a different JS name separately"
+            )
+        }
+
         // Process each binding (variable declaration)
         for binding in node.bindings {
             guard let pattern = binding.pattern.as(IdentifierPatternSyntax.self) else {
@@ -1461,11 +1891,13 @@ private final class ExportSwiftAPICollector: SyntaxAnyVisitor {
 
             let exportedProperty = ExportedProperty(
                 name: propertyName,
+                jsName: jsName,
                 type: propertyType,
                 isReadonly: isReadonly,
                 isStatic: isStatic,
                 namespace: finalNamespace,
-                staticContext: staticContext
+                staticContext: staticContext,
+                documentation: extractDocumentation(from: node)
             )
 
             if case .enumBody(_, let key) = state {
@@ -1490,6 +1922,13 @@ private final class ExportSwiftAPICollector: SyntaxAnyVisitor {
             return .skipChildren
         }
 
+        diagnoseUnsupportedJSName(from: jsAttribute)
+
+        if let aliasTarget = parent.extractAliasTarget(from: jsAttribute) {
+            recordAlias(node: node, jsAttribute: jsAttribute, aliasTarget: aliasTarget)
+            return .skipChildren
+        }
+
         let namespaceResult = resolveNamespace(from: jsAttribute, for: node, declarationType: "class")
         guard namespaceResult.isValid else {
             return .skipChildren
@@ -1498,12 +1937,13 @@ private final class ExportSwiftAPICollector: SyntaxAnyVisitor {
             resolvedNamespace: namespaceResult.namespace,
             parentTypeNamespace: computeParentTypeNamespace(for: node)
         )
-        let swiftCallName = SwiftToSkeleton.computeSwiftCallName(for: node, itemName: name)
+        let swiftCallName = parent.computeSwiftCallName(for: node, itemName: name)
         let explicitAccessControl = computeExplicitAtLeastInternalAccessControl(
             for: node,
             message: "Class visibility must be at least internal"
         )
         let classIdentityMode = extractIdentityMode(from: jsAttribute)
+        let isFinal = node.modifiers.contains { $0.name.tokenKind == .keyword(.final) } ? true : nil
         let exportedClass = ExportedClass(
             name: name,
             swiftCallName: swiftCallName,
@@ -1512,7 +1952,9 @@ private final class ExportSwiftAPICollector: SyntaxAnyVisitor {
             methods: [],
             properties: [],
             namespace: effectiveNamespace,
-            identityMode: classIdentityMode
+            identityMode: classIdentityMode,
+            documentation: extractDocumentation(from: node),
+            isFinal: isFinal
         )
         let uniqueKey = makeKey(name: name, namespace: effectiveNamespace)
 
@@ -1535,45 +1977,41 @@ private final class ExportSwiftAPICollector: SyntaxAnyVisitor {
         return .skipChildren
     }
 
-    func resolveDeferredExtensions(against collectors: [ExportSwiftAPICollector]) {
-        for ext in deferredExtensions {
-            var resolved = false
-            for collector in collectors {
-                if collector.resolveExtension(ext) {
-                    resolved = true
-                    break
-                }
-            }
-            if !resolved {
-                diagnose(
-                    node: ext.extendedType,
-                    message: "Unsupported type '\(ext.extendedType.trimmedDescription)'.",
-                    hint: "You can only extend `@JS` annotated types defined in the same module"
-                )
-            }
+    func diagnoseUnresolvedExtension(_ ext: ExtensionDeclSyntax) {
+        guard containsJSAnnotatedDeclaration(ext.memberBlock.members) else {
+            return
         }
+        diagnose(
+            node: ext.extendedType,
+            message: "Unsupported type '\(ext.extendedType.trimmedDescription)'.",
+            hint: "You can only extend `@JS` annotated types defined in the same module"
+        )
+    }
+
+    private func containsJSAnnotatedDeclaration(_ members: MemberBlockItemListSyntax) -> Bool {
+        let finder = JSAttributeFinder(viewMode: .sourceAccurate)
+        finder.walk(members)
+        return finder.found
     }
 
     /// Walks extension members under the matching type’s state, returning whether the type was found.
-    ///
-    /// Note: The lookup scans dictionaries keyed by `makeKey(name:namespace:)`, matching only by
-    /// plain name. If two types share a name but differ by namespace, `.first(where:)` picks
-    /// whichever comes first. This is acceptable today since namespace collisions are unlikely,
-    /// but may need refinement if namespace-qualified extension resolution is added.
     func resolveExtension(_ ext: ExtensionDeclSyntax) -> Bool {
-        let name = ext.extendedType.trimmedDescription
+        guard let extendedDecl = parent.typeDeclResolver.resolveExtensionTarget(ext.extendedType) else {
+            return false
+        }
+        let swiftCallName = parent.computeSwiftCallName(for: extendedDecl, itemName: extendedDecl.name.text)
         let state: State
-        if let entry = exportedClassByName.first(where: { $0.value.name == name }) {
-            state = .classBody(name: name, key: entry.key)
-        } else if let entry = exportedStructByName.first(where: { $0.value.name == name }) {
-            state = .structBody(name: name, key: entry.key)
-        } else if let entry = exportedEnumByName.first(where: { $0.value.name == name }) {
-            state = .enumBody(name: name, key: entry.key)
-        } else if exportedProtocolByName.values.contains(where: { $0.name == name }) {
+        if let entry = exportedClassByName.first(where: { $0.value.swiftCallName == swiftCallName }) {
+            state = .classBody(name: entry.value.name, key: entry.key)
+        } else if let entry = exportedStructByName.first(where: { $0.value.swiftCallName == swiftCallName }) {
+            state = .structBody(name: entry.value.name, key: entry.key)
+        } else if let entry = exportedEnumByName.first(where: { $0.value.swiftCallName == swiftCallName }) {
+            state = .enumBody(name: entry.value.name, key: entry.key)
+        } else if exportedProtocolByName.values.contains(where: { $0.name == swiftCallName }) {
             diagnose(
                 node: ext.extendedType,
                 message: "Protocol extensions are not supported by BridgeJS.",
-                hint: "You cannot extend `@JS` protocol '\(name)' with additional members"
+                hint: "You cannot extend `@JS` protocol '\(swiftCallName)' with additional members"
             )
             return true
         } else {
@@ -1587,11 +2025,60 @@ private final class ExportSwiftAPICollector: SyntaxAnyVisitor {
         return true
     }
 
+    private func recordAlias(
+        node: some SyntaxProtocol & NamedDeclSyntax,
+        jsAttribute: AttributeSyntax,
+        aliasTarget: TypeSyntax
+    ) {
+        let swiftCallName = parent.computeSwiftCallName(for: node, itemName: node.name.text)
+        if extractNamespace(from: jsAttribute) != nil {
+            errors.append(
+                DiagnosticError(
+                    node: node,
+                    message: "`namespace` is not supported on `@JS(as:)` types",
+                    hint: "Remove the `namespace:` argument; an alias adopts its target's representation"
+                )
+            )
+            return
+        }
+        var lookupErrors: [DiagnosticError] = []
+        guard
+            let aliasBridgeType = parent.aliasType(
+                target: aliasTarget,
+                swiftCallName: swiftCallName,
+                errors: &lookupErrors
+            ),
+            case .alias(_, let underlying) = aliasBridgeType
+        else {
+            errors.append(contentsOf: lookupErrors)
+            return
+        }
+        guard underlying.aliasConformanceProtocols != nil else {
+            errors.append(
+                DiagnosticError(
+                    node: aliasTarget,
+                    message: "Representation \(underlying.swiftType) is not supported"
+                )
+            )
+            return
+        }
+        exportedAliases.append(
+            ExportedAlias(swiftCallName: swiftCallName, underlying: underlying)
+        )
+    }
+
     override func visit(_ node: EnumDeclSyntax) -> SyntaxVisitorContinueKind {
         guard let jsAttribute = node.attributes.firstJSAttribute else {
             return .skipChildren
         }
 
+        diagnoseUnsupportedJSName(from: jsAttribute)
+
+        if let aliasTarget = parent.extractAliasTarget(from: jsAttribute) {
+            recordAlias(node: node, jsAttribute: jsAttribute, aliasTarget: aliasTarget)
+            return .skipChildren
+        }
+
         let name = node.name.text
 
         let rawType: String? = node.inheritanceClause?.inheritedTypes.first { inheritedType in
@@ -1608,7 +2095,7 @@ private final class ExportSwiftAPICollector: SyntaxAnyVisitor {
             parentTypeNamespace: computeParentTypeNamespace(for: node)
         )
         let emitStyle = extractEnumStyle(from: jsAttribute) ?? .const
-        let swiftCallName = SwiftToSkeleton.computeSwiftCallName(for: node, itemName: name)
+        let swiftCallName = parent.computeSwiftCallName(for: node, itemName: name)
         let explicitAccessControl = computeExplicitAtLeastInternalAccessControl(
             for: node,
             message: "Enum visibility must be at least internal"
@@ -1632,7 +2119,8 @@ private final class ExportSwiftAPICollector: SyntaxAnyVisitor {
             namespace: effectiveNamespace,
             emitStyle: emitStyle,
             staticMethods: [],
-            staticProperties: []
+            staticProperties: [],
+            documentation: extractDocumentation(from: node)
         )
 
         let enumUniqueKey = makeKey(name: name, namespace: effectiveNamespace)
@@ -1691,24 +2179,7 @@ private final class ExportSwiftAPICollector: SyntaxAnyVisitor {
             }
             for enumCase in exportedEnum.cases {
                 for associatedValue in enumCase.associatedValues {
-                    switch associatedValue.type {
-                    case .string, .integer, .float, .double, .bool, .caseEnum, .rawValueEnum,
-                        .swiftStruct, .swiftHeapObject, .jsObject, .associatedValueEnum, .array:
-                        break
-                    case .nullable(let wrappedType, _):
-                        switch wrappedType {
-                        case .string, .integer, .float, .double, .bool, .caseEnum, .rawValueEnum,
-                            .swiftStruct, .swiftHeapObject, .jsObject, .associatedValueEnum, .array:
-                            break
-                        default:
-                            diagnose(
-                                node: node,
-                                message: "Unsupported associated value type: \(associatedValue.type.swiftType)",
-                                hint:
-                                    "Only primitive types, enums, structs, classes, JSObject, arrays, and their optionals are supported in associated-value enums"
-                            )
-                        }
-                    default:
+                    if !associatedValue.type.isSupportedAsAssociatedValue() {
                         diagnose(
                             node: node,
                             message: "Unsupported associated value type: \(associatedValue.type.swiftType)",
@@ -1728,6 +2199,8 @@ private final class ExportSwiftAPICollector: SyntaxAnyVisitor {
             return .skipChildren
         }
 
+        diagnoseUnsupportedJSName(from: jsAttribute)
+
         let name = node.name.text
 
         let namespaceResult = resolveNamespace(from: jsAttribute, for: node, declarationType: "protocol")
@@ -1749,7 +2222,8 @@ private final class ExportSwiftAPICollector: SyntaxAnyVisitor {
             name: name,
             methods: [],
             properties: [],
-            namespace: effectiveNamespace
+            namespace: effectiveNamespace,
+            documentation: extractDocumentation(from: node)
         )
 
         stateStack.push(state: .protocolBody(name: name, key: protocolUniqueKey))
@@ -1773,7 +2247,8 @@ private final class ExportSwiftAPICollector: SyntaxAnyVisitor {
             name: name,
             methods: methods,
             properties: exportedProtocolByName[protocolUniqueKey]?.properties ?? [],
-            namespace: effectiveNamespace
+            namespace: effectiveNamespace,
+            documentation: extractDocumentation(from: node)
         )
 
         exportedProtocolByName[protocolUniqueKey] = exportedProtocol
@@ -1789,6 +2264,13 @@ private final class ExportSwiftAPICollector: SyntaxAnyVisitor {
             return .skipChildren
         }
 
+        diagnoseUnsupportedJSName(from: jsAttribute)
+
+        if let aliasTarget = parent.extractAliasTarget(from: jsAttribute) {
+            recordAlias(node: node, jsAttribute: jsAttribute, aliasTarget: aliasTarget)
+            return .skipChildren
+        }
+
         let name = node.name.text
 
         let namespaceResult = resolveNamespace(from: jsAttribute, for: node, declarationType: "struct")
@@ -1799,7 +2281,7 @@ private final class ExportSwiftAPICollector: SyntaxAnyVisitor {
             resolvedNamespace: namespaceResult.namespace,
             parentTypeNamespace: computeParentTypeNamespace(for: node)
         )
-        let swiftCallName = SwiftToSkeleton.computeSwiftCallName(for: node, itemName: name)
+        let swiftCallName = parent.computeSwiftCallName(for: node, itemName: name)
         let explicitAccessControl = computeExplicitAtLeastInternalAccessControl(
             for: node,
             message: "Struct visibility must be at least internal"
@@ -1849,7 +2331,8 @@ private final class ExportSwiftAPICollector: SyntaxAnyVisitor {
                         isReadonly: true,
                         isStatic: false,
                         namespace: effectiveNamespace,
-                        staticContext: nil
+                        staticContext: nil,
+                        documentation: extractDocumentation(from: varDecl)
                     )
                     properties.append(property)
                 }
@@ -1863,7 +2346,8 @@ private final class ExportSwiftAPICollector: SyntaxAnyVisitor {
             explicitAccessControl: explicitAccessControl,
             properties: properties,
             methods: [],
-            namespace: effectiveNamespace
+            namespace: effectiveNamespace,
+            documentation: extractDocumentation(from: node)
         )
 
         exportedStructByName[structUniqueKey] = exportedStruct
@@ -1920,6 +2404,10 @@ private final class ExportSwiftAPICollector: SyntaxAnyVisitor {
         protocolName: String,
         namespace: [String]?
     ) -> ExportedFunction? {
+        if let jsAttribute = node.attributes.firstJSAttribute {
+            diagnoseUnsupportedJSName(from: jsAttribute)
+        }
+
         let name = node.name.text
 
         let parameters = parseParameters(from: node.signature.parameterClause, allowDefaults: false)
@@ -1956,7 +2444,8 @@ private final class ExportSwiftAPICollector: SyntaxAnyVisitor {
             returnType: returnType,
             effects: effects,
             namespace: namespace,
-            staticContext: nil
+            staticContext: nil,
+            documentation: extractDocumentation(from: node)
         )
     }
 
@@ -1965,6 +2454,10 @@ private final class ExportSwiftAPICollector: SyntaxAnyVisitor {
         protocolName: String,
         protocolKey: String
     ) -> SyntaxVisitorContinueKind {
+        if let jsAttribute = node.attributes.firstJSAttribute {
+            diagnoseUnsupportedJSName(from: jsAttribute)
+        }
+
         for binding in node.bindings {
             guard let pattern = binding.pattern.as(IdentifierPatternSyntax.self) else {
                 diagnose(node: binding.pattern, message: "Complex patterns not supported for protocol properties")
@@ -1997,7 +2490,8 @@ private final class ExportSwiftAPICollector: SyntaxAnyVisitor {
             let exportedProperty = ExportedProtocolProperty(
                 name: propertyName,
                 type: propertyType,
-                isReadonly: isReadonly
+                isReadonly: isReadonly,
+                documentation: extractDocumentation(from: node)
             )
 
             if var currentProtocol = exportedProtocolByName[protocolKey] {
@@ -2008,7 +2502,8 @@ private final class ExportSwiftAPICollector: SyntaxAnyVisitor {
                     name: currentProtocol.name,
                     methods: currentProtocol.methods,
                     properties: properties,
-                    namespace: currentProtocol.namespace
+                    namespace: currentProtocol.namespace,
+                    documentation: currentProtocol.documentation
                 )
                 exportedProtocolByName[protocolKey] = currentProtocol
             }
@@ -2101,10 +2596,9 @@ private final class ExportSwiftAPICollector: SyntaxAnyVisitor {
     /// Method allows for explicit namespace for top level enum, it will be used as base namespace and will concat enum name
     private func computeNamespace(for node: some SyntaxProtocol) -> [String]? {
         var namespace: [String] = []
-        var currentNode: Syntax? = node.parent
 
-        while let parent = currentNode {
-            if let enumDecl = parent.as(EnumDeclSyntax.self),
+        for declaration in parent.enclosingDeclarations(of: node) {
+            if let enumDecl = declaration.as(EnumDeclSyntax.self),
                 enumDecl.attributes.hasJSAttribute()
             {
                 let isNamespaceEnum = !enumDecl.memberBlock.members.contains { member in
@@ -2121,7 +2615,6 @@ private final class ExportSwiftAPICollector: SyntaxAnyVisitor {
                     }
                 }
             }
-            currentNode = parent.parent
         }
 
         return namespace.isEmpty ? nil : namespace
@@ -2129,19 +2622,17 @@ private final class ExportSwiftAPICollector: SyntaxAnyVisitor {
 
     private func computeParentTypeNamespace(for node: some SyntaxProtocol) -> [String]? {
         var path: [String] = []
-        var currentNode: Syntax? = node.parent
 
-        while let parent = currentNode {
-            if let structDecl = parent.as(StructDeclSyntax.self),
+        for declaration in parent.enclosingDeclarations(of: node) {
+            if let structDecl = declaration.as(StructDeclSyntax.self),
                 structDecl.attributes.hasJSAttribute()
             {
                 path.insert(structDecl.name.text, at: 0)
-            } else if let classDecl = parent.as(ClassDeclSyntax.self),
+            } else if let classDecl = declaration.as(ClassDeclSyntax.self),
                 classDecl.attributes.hasJSAttribute()
             {
                 path.insert(classDecl.name.text, at: 0)
             }
-            currentNode = parent.parent
         }
 
         return path.isEmpty ? nil : path
@@ -2220,6 +2711,7 @@ private final class ImportSwiftMacrosAPICollector: SyntaxAnyVisitor {
     var importedFunctions: [ImportedFunctionSkeleton] = []
     var importedTypes: [ImportedTypeSkeleton] = []
     var importedGlobalGetters: [ImportedGetterSkeleton] = []
+    var importedModulePathNodes: [String: Syntax] = [:]
     var errors: [DiagnosticError] = []
 
     private let inputFilePath: String
@@ -2299,37 +2791,202 @@ private final class ImportSwiftMacrosAPICollector: SyntaxAnyVisitor {
             }
         }
 
-        /// Extracts the `jsName` argument value from an attribute, if present.
-        static func extractJSName(from attribute: AttributeSyntax) -> String? {
-            guard let arguments = attribute.arguments?.as(LabeledExprListSyntax.self) else {
+    }
+
+    /// The result of reading a `jsName:` argument.
+    struct ExtractedJSName {
+        /// The JavaScript member name to look up.
+        ///
+        /// `.default` normalizes to `"default"`: in ECMAScript a module's default
+        /// export *is* its `default` named export, so no separate representation
+        /// is needed downstream.
+        let memberName: String
+        /// True when the source spelled `.default` rather than a string literal.
+        let isDefaultExportSpelling: Bool
+    }
+
+    /// Extracts the `jsName` argument value from an attribute, if present.
+    private func extractJSName(from attribute: AttributeSyntax) -> ExtractedJSName? {
+        guard let arguments = attribute.arguments?.as(LabeledExprListSyntax.self),
+            let argument = arguments.first(where: { $0.label?.text == "jsName" })
+        else {
+            return nil
+        }
+
+        if let stringLiteral = argument.expression.as(StringLiteralExprSyntax.self),
+            let value = stringLiteral.representedLiteralValue
+        {
+            return ExtractedJSName(memberName: value, isDefaultExportSpelling: false)
+        }
+
+        // An explicit `jsName: nil` means the same as omitting the argument.
+        if argument.expression.is(NilLiteralExprSyntax.self) {
+            return nil
+        }
+
+        // Accept the explicit `.name("...")` spelling of a plain member name.
+        if let call = argument.expression.as(FunctionCallExprSyntax.self),
+            call.calledExpression.trimmedDescription.split(separator: ".").last == "name"
+        {
+            guard call.arguments.count == 1,
+                let literal = call.arguments.first?.expression.as(StringLiteralExprSyntax.self),
+                let value = literal.representedLiteralValue
+            else {
+                errors.append(
+                    DiagnosticError(
+                        node: call.arguments.first?.expression ?? argument.expression,
+                        message: "jsName must be a string literal or '.default'."
+                    )
+                )
                 return nil
             }
-            for argument in arguments {
-                if argument.label?.text == "jsName",
-                    let stringLiteral = argument.expression.as(StringLiteralExprSyntax.self),
-                    let segment = stringLiteral.segments.first?.as(StringSegmentSyntax.self)
-                {
-                    return segment.content.text
-                }
-            }
+            return ExtractedJSName(memberName: value, isDefaultExportSpelling: false)
+        }
+
+        // Accept `.default`, `JSName.default`, and the backticked spellings.
+        let description = argument.expression.trimmedDescription
+        let caseName = description.split(separator: ".").last.map(String.init) ?? description
+        if caseName == "default" || caseName == "`default`" {
+            return ExtractedJSName(memberName: "default", isDefaultExportSpelling: true)
+        }
+
+        errors.append(
+            DiagnosticError(
+                node: argument.expression,
+                message: "jsName must be a string literal or '.default'."
+            )
+        )
+        return nil
+    }
+
+    /// Validates that a `jsName: .default` spelling appears somewhere it can mean something.
+    ///
+    /// `.default` names the default export of an ECMAScript module, so it only makes
+    /// sense on a top-level declaration that has a `from: .module(...)` origin.
+    private func validateDefaultExportUsage(
+        _ extracted: ExtractedJSName?,
+        from: JSImportFrom?,
+        node: some SyntaxProtocol,
+        isSetter: Bool = false
+    ) {
+        guard let extracted, extracted.isDefaultExportSpelling else { return }
+
+        if isSetter {
+            errors.append(
+                DiagnosticError(
+                    node: node,
+                    message: "'jsName: .default' is not supported on @JSSetter; "
+                        + "ECMAScript module bindings are read-only."
+                )
+            )
+            return
+        }
+        if case .jsClassBody = state {
+            errors.append(
+                DiagnosticError(
+                    node: node,
+                    message: "'jsName: .default' is not supported on a class member; "
+                        + "members have no module origin. Did you mean jsName: \"default\"?"
+                )
+            )
+            return
+        }
+        switch from {
+        case .module, .snippet:
+            return
+        case .global:
+            errors.append(
+                DiagnosticError(
+                    node: node,
+                    message: "'jsName: .default' requires 'from: .module(...)' or 'from: .snippet(...)'; "
+                        + "globalThis has no default export."
+                )
+            )
+        case nil:
+            errors.append(
+                DiagnosticError(
+                    node: node,
+                    message: "'jsName: .default' requires 'from: .module(...)' or 'from: .snippet(...)'."
+                )
+            )
+        }
+    }
+
+    private func extractJSImportFrom(from attribute: AttributeSyntax) -> JSImportFrom? {
+        guard let arguments = attribute.arguments?.as(LabeledExprListSyntax.self),
+            let argument = arguments.first(where: { $0.label?.text == "from" })
+        else {
             return nil
         }
 
-        /// Extracts the `from` argument value from an attribute, if present.
-        static func extractJSImportFrom(from attribute: AttributeSyntax) -> JSImportFrom? {
-            guard let arguments = attribute.arguments?.as(LabeledExprListSyntax.self) else {
+        if let call = argument.expression.as(FunctionCallExprSyntax.self),
+            let caseName = call.calledExpression.trimmedDescription.split(separator: ".").last,
+            caseName == "module" || caseName == "snippet"
+        {
+            let isSnippet = caseName == "snippet"
+            guard call.arguments.count == 1,
+                let pathExpression = call.arguments.first?.expression,
+                let literal = pathExpression.as(StringLiteralExprSyntax.self),
+                let path = literal.representedLiteralValue
+            else {
+                errors.append(
+                    DiagnosticError(
+                        node: call.arguments.first?.expression ?? argument.expression,
+                        message: isSnippet
+                            ? "JavaScript snippet path must be a string literal."
+                            : "JavaScript module specifier must be a string literal."
+                    )
+                )
                 return nil
             }
-            for argument in arguments {
-                guard argument.label?.text == "from" else { continue }
-
-                // Accept `.global`, `JSImportFrom.global`, etc.
-                let description = argument.expression.trimmedDescription
-                let caseName = description.split(separator: ".").last.map(String.init) ?? description
-                return JSImportFrom(rawValue: caseName)
+            guard !path.isEmpty else {
+                errors.append(
+                    DiagnosticError(
+                        node: literal,
+                        message: isSnippet
+                            ? "JavaScript snippet path must not be empty."
+                            : "JavaScript module specifier must not be empty."
+                    )
+                )
+                return nil
             }
-            return nil
+            if isSnippet {
+                // Full validation of the path happens in `finalize()`, where the file
+                // can also be checked for existence.
+                if importedModulePathNodes[path] == nil {
+                    importedModulePathNodes[path] = Syntax(literal)
+                }
+                return .snippet(path)
+            }
+            guard !path.hasPrefix("/") else {
+                errors.append(
+                    DiagnosticError(
+                        node: literal,
+                        message: "'\(path)' looks like a file in this target. "
+                            + "Use 'from: .snippet(\"\(path)\")' for a JavaScript file you ship with the target, "
+                            + "and 'from: .module(...)' for an external module (e.g. 'node:path')."
+                    )
+                )
+                return nil
+            }
+            guard !path.hasPrefix("./"), !path.hasPrefix("../"), path != ".", path != ".." else {
+                errors.append(
+                    DiagnosticError(
+                        node: literal,
+                        message: "Relative JavaScript module specifiers are not supported: '\(path)'. "
+                            + "Use 'from: .snippet(\"/path/to/file.js\")' for a file in this target, "
+                            + "or a bare specifier for an external module (e.g. 'node:path')."
+                    )
+                )
+                return nil
+            }
+            return .module(path)
         }
+
+        // Accept `.global`, `JSImportFrom.global`, etc.
+        let description = argument.expression.trimmedDescription
+        let caseName = description.split(separator: ".").last.map(String.init) ?? description
+        return caseName == "global" ? .global : nil
     }
 
     // MARK: - Validation Helpers
@@ -2377,7 +3034,9 @@ private final class ImportSwiftMacrosAPICollector: SyntaxAnyVisitor {
             return nil
         }
 
-        let jsName = AttributeChecker.extractJSName(from: jsSetter)
+        let extractedJSName = extractJSName(from: jsSetter)
+        validateDefaultExportUsage(extractedJSName, from: nil, node: node, isSetter: true)
+        let jsName = extractedJSName?.memberName
         let parameters = node.signature.parameterClause.parameters
 
         guard let firstParam = parameters.first else {
@@ -2511,10 +3170,16 @@ private final class ImportSwiftMacrosAPICollector: SyntaxAnyVisitor {
     override func visit(_ node: StructDeclSyntax) -> SyntaxVisitorContinueKind {
         if AttributeChecker.hasJSClassAttribute(node.attributes) {
             let attribute = AttributeChecker.firstJSClassAttribute(node.attributes)
-            let jsName = attribute.flatMap(AttributeChecker.extractJSName)
-            let from = attribute.flatMap(AttributeChecker.extractJSImportFrom)
+            let extractedJSName = attribute.flatMap { extractJSName(from: $0) }
+            let from = attribute.flatMap { extractJSImportFrom(from: $0) }
+            validateDefaultExportUsage(extractedJSName, from: from, node: node)
             let accessLevel = Self.bridgeAccessLevel(from: node.modifiers)
-            enterJSClass(node.name.text, jsName: jsName, from: from, accessLevel: accessLevel)
+            enterJSClass(
+                node.name.text,
+                jsName: extractedJSName?.memberName,
+                from: from,
+                accessLevel: accessLevel
+            )
         }
         return .visitChildren
     }
@@ -2528,10 +3193,16 @@ private final class ImportSwiftMacrosAPICollector: SyntaxAnyVisitor {
     override func visit(_ node: ClassDeclSyntax) -> SyntaxVisitorContinueKind {
         if AttributeChecker.hasJSClassAttribute(node.attributes) {
             let attribute = AttributeChecker.firstJSClassAttribute(node.attributes)
-            let jsName = attribute.flatMap(AttributeChecker.extractJSName)
-            let from = attribute.flatMap(AttributeChecker.extractJSImportFrom)
+            let extractedJSName = attribute.flatMap { extractJSName(from: $0) }
+            let from = attribute.flatMap { extractJSImportFrom(from: $0) }
+            validateDefaultExportUsage(extractedJSName, from: from, node: node)
             let accessLevel = Self.bridgeAccessLevel(from: node.modifiers)
-            enterJSClass(node.name.text, jsName: jsName, from: from, accessLevel: accessLevel)
+            enterJSClass(
+                node.name.text,
+                jsName: extractedJSName?.memberName,
+                from: from,
+                accessLevel: accessLevel
+            )
         }
         return .visitChildren
     }
@@ -2686,24 +3357,101 @@ private final class ImportSwiftMacrosAPICollector: SyntaxAnyVisitor {
 
     // MARK: - Parsing Methods
 
+    /// Validates and collects the generic parameter names of an imported
+    /// `@JSFunction` declaration (function, method or initializer).
+    ///
+    /// Returns `nil` when a diagnostic was emitted; an empty array when the
+    /// declaration is not generic.
+    private func parseGenericParameterNames(
+        genericParameterClause: GenericParameterClauseSyntax?,
+        genericWhereClause: GenericWhereClauseSyntax?,
+        node: Syntax
+    ) -> [String]? {
+        var genericParameterNames: [String] = []
+        if let genericParameterClause {
+            for genericParam in genericParameterClause.parameters {
+                let paramName = genericParam.name.text
+                let constraintText = genericParam.inheritedType?.trimmedDescription
+                guard SwiftToSkeleton.isBridgeableGenericConstraint(constraintText) else {
+                    errors.append(
+                        DiagnosticError(
+                            node: Syntax(genericParam),
+                            message:
+                                "Generic parameter '\(paramName)' must be constrained to 'BridgedSwiftGenericBridgeable' to be used with @JSFunction."
+                        )
+                    )
+                    return nil
+                }
+                genericParameterNames.append(paramName)
+            }
+        }
+        if genericWhereClause != nil {
+            errors.append(
+                DiagnosticError(
+                    node: node,
+                    message: "'where' clauses are not supported on @JSFunction declarations."
+                )
+            )
+            return nil
+        }
+        return genericParameterNames
+    }
+
     private func parseConstructor(
         _ initializer: InitializerDeclSyntax,
         typeName: String
     ) -> ImportedConstructorSkeleton? {
         guard
-            validateEffects(initializer.signature.effectSpecifiers, node: initializer, attributeName: "JSFunction")
-                != nil
+            let effects = validateEffects(
+                initializer.signature.effectSpecifiers,
+                node: initializer,
+                attributeName: "JSFunction"
+            )
+        else {
+            return nil
+        }
+        guard
+            let genericParameterNames = parseGenericParameterNames(
+                genericParameterClause: initializer.genericParameterClause,
+                genericWhereClause: initializer.genericWhereClause,
+                node: Syntax(initializer)
+            )
         else {
             return nil
         }
+        if !genericParameterNames.isEmpty && effects.isAsync {
+            errors.append(
+                DiagnosticError(
+                    node: Syntax(initializer),
+                    message: "Generic @JSFunction declarations cannot be 'async' yet."
+                )
+            )
+            return nil
+        }
+        let parameters = parseParameters(
+            from: initializer.signature.parameterClause,
+            genericParameterNames: genericParameterNames
+        )
+        for genericName in genericParameterNames
+        where !parameters.contains(where: { $0.type.referencedGenericName == genericName }) {
+            errors.append(
+                DiagnosticError(
+                    node: Syntax(initializer),
+                    message:
+                        "The generic parameter '\(genericName)' must be used in a parameter of a generic @JSFunction initializer."
+                )
+            )
+            return nil
+        }
         // Initializers without an explicit modifier inherit access from the
         // enclosing `@JSClass` (the user's example pattern: `public init(...)`
         // inside `public struct JSDocument`).
         let parentLevel = currentType?.accessLevel ?? .internal
         let accessLevel = Self.bridgeAccessLevel(from: initializer.modifiers, default: parentLevel)
         return ImportedConstructorSkeleton(
-            parameters: parseParameters(from: initializer.signature.parameterClause),
-            accessLevel: accessLevel
+            parameters: parameters,
+            accessLevel: accessLevel,
+            genericParameters: genericParameterNames.isEmpty ? nil : genericParameterNames
         )
     }
 
@@ -2721,21 +3469,68 @@ private final class ImportSwiftMacrosAPICollector: SyntaxAnyVisitor {
             return nil
         }
 
+        guard
+            let genericParameterNames = parseGenericParameterNames(
+                genericParameterClause: node.genericParameterClause,
+                genericWhereClause: node.genericWhereClause,
+                node: Syntax(node)
+            )
+        else {
+            return nil
+        }
+
         let baseName = SwiftToSkeleton.normalizeIdentifier(node.name.text)
-        let jsName = AttributeChecker.extractJSName(from: jsFunction)
-        let from = AttributeChecker.extractJSImportFrom(from: jsFunction)
+        let extractedJSName = extractJSName(from: jsFunction)
+        let from = extractJSImportFrom(from: jsFunction)
+        validateDefaultExportUsage(extractedJSName, from: from, node: node)
+        let jsName = extractedJSName?.memberName
         let name = baseName
 
-        let parameters = parseParameters(from: node.signature.parameterClause)
+        let parameters = parseParameters(
+            from: node.signature.parameterClause,
+            genericParameterNames: genericParameterNames
+        )
         let returnType: BridgeType
         if let returnTypeSyntax = node.signature.returnClause?.type {
-            guard let resolved = withLookupErrors({ parent.lookupType(for: returnTypeSyntax, errors: &$0) }) else {
+            guard
+                let resolved = lookupTypeWithGenerics(
+                    for: returnTypeSyntax,
+                    genericParameterNames: genericParameterNames
+                )
+            else {
                 return nil
             }
             returnType = resolved
         } else {
             returnType = .void
         }
+
+        if !genericParameterNames.isEmpty {
+            if effects.isAsync {
+                errors.append(
+                    DiagnosticError(
+                        node: node,
+                        message: "Generic @JSFunction declarations cannot be 'async' yet."
+                    )
+                )
+                return nil
+            }
+            for genericName in genericParameterNames {
+                let usedInParameter = parameters.contains { $0.type.referencedGenericName == genericName }
+                let usedInReturn = returnType.referencedGenericName == genericName
+                if !usedInParameter && !usedInReturn {
+                    errors.append(
+                        DiagnosticError(
+                            node: node,
+                            message:
+                                "The generic parameter '\(genericName)' must be used in a parameter or return type of a generic @JSFunction declaration."
+                        )
+                    )
+                    return nil
+                }
+            }
+        }
+
         let accessLevel = Self.bridgeAccessLevel(from: node.modifiers)
         return ImportedFunctionSkeleton(
             name: name,
@@ -2745,7 +3540,8 @@ private final class ImportSwiftMacrosAPICollector: SyntaxAnyVisitor {
             returnType: returnType,
             effects: effects,
             documentation: nil,
-            accessLevel: accessLevel
+            accessLevel: accessLevel,
+            genericParameters: genericParameterNames.isEmpty ? nil : genericParameterNames
         )
     }
 
@@ -2775,12 +3571,13 @@ private final class ImportSwiftMacrosAPICollector: SyntaxAnyVisitor {
             return nil
         }
         let propertyName = SwiftToSkeleton.normalizeIdentifier(identifier.identifier.text)
-        let jsName = AttributeChecker.extractJSName(from: jsGetter)
-        let from = AttributeChecker.extractJSImportFrom(from: jsGetter)
+        let extractedJSName = extractJSName(from: jsGetter)
+        let from = extractJSImportFrom(from: jsGetter)
+        validateDefaultExportUsage(extractedJSName, from: from, node: node)
         let accessLevel = Self.bridgeAccessLevel(from: node.modifiers)
         return ImportedGetterSkeleton(
             name: propertyName,
-            jsName: jsName,
+            jsName: extractedJSName?.memberName,
             from: from,
             type: propertyType,
             documentation: nil,
@@ -2821,7 +3618,26 @@ private final class ImportSwiftMacrosAPICollector: SyntaxAnyVisitor {
 
     // MARK: - Type and Parameter Parsing
 
-    private func parseParameters(from clause: FunctionParameterClauseSyntax) -> [Parameter] {
+    private func lookupTypeWithGenerics(
+        for type: TypeSyntax,
+        genericParameterNames: [String]
+    ) -> BridgeType? {
+        switch resolveGenericTypeReference(for: type, genericParameterNames: genericParameterNames) {
+        case .resolved(let bridgeType):
+            return bridgeType
+        case .rejected(let message):
+            if let message {
+                errors.append(DiagnosticError(node: Syntax(type), message: message))
+                return nil
+            }
+            return withLookupErrors { parent.lookupType(for: type, errors: &$0) }
+        }
+    }
+
+    private func parseParameters(
+        from clause: FunctionParameterClauseSyntax,
+        genericParameterNames: [String] = []
+    ) -> [Parameter] {
         clause.parameters.compactMap { param in
             let type = param.type
             if type.is(MissingTypeSyntax.self) {
@@ -2833,7 +3649,8 @@ private final class ImportSwiftMacrosAPICollector: SyntaxAnyVisitor {
                 )
                 return nil
             }
-            guard let bridgeType = withLookupErrors({ parent.lookupType(for: type, errors: &$0) }) else {
+            guard let bridgeType = lookupTypeWithGenerics(for: type, genericParameterNames: genericParameterNames)
+            else {
                 return nil
             }
             let nameToken = param.secondName ?? param.firstName
@@ -2888,6 +3705,22 @@ private final class ImportSwiftMacrosAPICollector: SyntaxAnyVisitor {
     }
 }
 
+extension BridgeType {
+    fileprivate func isSupportedAsAssociatedValue(allowNullable: Bool = true) -> Bool {
+        switch self {
+        case .string, .integer, .float, .double, .bool, .caseEnum, .rawValueEnum,
+            .swiftStruct, .swiftHeapObject, .jsObject, .associatedValueEnum, .array:
+            return true
+        case .alias(_, let underlying):
+            return underlying.isSupportedAsAssociatedValue(allowNullable: false)
+        case .nullable(let wrapped, _) where allowNullable:
+            return wrapped.isSupportedAsAssociatedValue(allowNullable: false)
+        default:
+            return false
+        }
+    }
+}
+
 extension GenericArgumentListSyntax {
     /// Compatibility helper for accessing the first argument as a TypeSyntax
     ///
diff --git a/Plugins/BridgeJS/Sources/BridgeJSCore/TypeDeclResolver.swift b/Plugins/BridgeJS/Sources/BridgeJSCore/TypeDeclResolver.swift
index ec04421aa..4df546b8a 100644
--- a/Plugins/BridgeJS/Sources/BridgeJSCore/TypeDeclResolver.swift
+++ b/Plugins/BridgeJS/Sources/BridgeJSCore/TypeDeclResolver.swift
@@ -16,8 +16,7 @@ class TypeDeclResolver {
 
     private class TypeDeclCollector: SyntaxVisitor {
         let resolver: TypeDeclResolver
-        var scope: [TypeDecl] = []
-        var rootTypeDecls: [TypeDecl] = []
+        var scope: [String] = []
 
         init(resolver: TypeDeclResolver) {
             self.resolver = resolver
@@ -26,17 +25,14 @@ class TypeDeclResolver {
 
         func visitNominalDecl(_ node: TypeDecl) -> SyntaxVisitorContinueKind {
             let name = node.name.text
-            let qualifiedName = scope.map(\.name.text) + [name]
+            let qualifiedName = scope + [name]
             resolver.typeDeclByQualifiedName[qualifiedName] = node
-            scope.append(node)
+            scope.append(name)
             return .visitChildren
         }
 
         func visitPostNominalDecl() {
-            let type = scope.removeLast()
-            if scope.isEmpty {
-                rootTypeDecls.append(type)
-            }
+            scope.removeLast()
         }
 
         override func visit(_ node: StructDeclSyntax) -> SyntaxVisitorContinueKind {
@@ -72,10 +68,21 @@ class TypeDeclResolver {
 
         override func visit(_ node: TypeAliasDeclSyntax) -> SyntaxVisitorContinueKind {
             let name = node.name.text
-            let qualifiedName = scope.map(\.name.text) + [name]
+            let qualifiedName = scope + [name]
             resolver.typeAliasByQualifiedName[qualifiedName] = node
             return .skipChildren
         }
+
+        override func visit(_ node: ExtensionDeclSyntax) -> SyntaxVisitorContinueKind {
+            guard let components = node.memberScopeComponents else {
+                return .skipChildren
+            }
+            scope.append(contentsOf: components)
+            return .visitChildren
+        }
+        override func visitPost(_ node: ExtensionDeclSyntax) {
+            scope.removeLast(node.memberScopeComponents?.count ?? 0)
+        }
     }
 
     /// Collects type declarations from a parsed Swift source file
@@ -85,37 +92,45 @@ class TypeDeclResolver {
     }
 
     /// Builds the type name scope for a given type usage
-    private func buildScope(type: IdentifierTypeSyntax) -> QualifiedName {
+    private func buildScope(type: TypeSyntax) -> QualifiedName {
         var innerToOuter: [String] = []
         var context: SyntaxProtocol = type
         while let parent = context.parent {
             if let parent = parent.asProtocol(NamedDeclSyntax.self), parent.isProtocol(DeclGroupSyntax.self) {
                 innerToOuter.append(parent.name.text)
+            } else if let extensionDecl = parent.as(ExtensionDeclSyntax.self),
+                let components = extensionDecl.memberScopeComponents
+            {
+                innerToOuter.append(contentsOf: components.reversed())
             }
             context = parent
         }
         return innerToOuter.reversed()
     }
 
-    /// Looks up a qualified name of a type declaration by its unqualified type usage
+    /// Looks up a qualified name of a type declaration relative to its lexical scope
     /// Returns the qualified name hierarchy of the type declaration
-    /// If the type declaration is not found, returns the unqualified name
-    private func tryQualify(type: IdentifierTypeSyntax) -> QualifiedName {
-        let name = type.name.text
+    /// If the type declaration is not found, returns the original qualified name
+    private func tryQualify(type: TypeSyntax) -> QualifiedName? {
+        guard let components = type.qualifiedComponents else {
+            return nil
+        }
         let scope = buildScope(type: type)
         /// Search for the type declaration from the innermost scope to the outermost scope
         for i in (0...scope.count).reversed() {
-            let qualifiedName = Array(scope[0..<i] + [name])
-            if typeDeclByQualifiedName[qualifiedName] != nil {
+            let qualifiedName = Array(scope.prefix(i)) + components
+            if typeDeclByQualifiedName[qualifiedName] != nil || typeAliasByQualifiedName[qualifiedName] != nil {
                 return qualifiedName
             }
         }
-        return [name]
+        return components
     }
 
     /// Looks up a type declaration by its unqualified type usage
     func lookupType(for type: IdentifierTypeSyntax) -> TypeDecl? {
-        let qualifiedName = tryQualify(type: type)
+        guard let qualifiedName = tryQualify(type: TypeSyntax(type)) else {
+            return nil
+        }
         return typeDeclByQualifiedName[qualifiedName]
     }
 
@@ -128,47 +143,55 @@ class TypeDeclResolver {
     ///
     /// Supported inputs:
     /// - IdentifierTypeSyntax (e.g. `Method`) — resolved relative to the lexical scope, preferring the innermost enclosing type.
-    /// - MemberTypeSyntax (e.g. `Networking.API.Method`) — resolved by recursively building the fully qualified name.
+    /// - MemberTypeSyntax (e.g. `Networking.API.Method`) — resolved relative to the lexical scope before falling back to the fully qualified name.
     ///
     /// Resolution strategy:
-    /// 1. If the node is IdentifierTypeSyntax, call `lookupType(for:)` which attempts scope-aware qualification via `tryQualify`.
-    /// 2. Otherwise, attempt to build a fully qualified name with `qualifiedComponents(from:)` and look it up with `lookupType(fullyQualified:)`.
+    /// Build the qualified name with `qualifiedComponents`, then attempt scope-aware qualification via `tryQualify`.
     ///
     /// - Parameter type: The SwiftSyntax node representing a type appearance in source code.
     /// - Returns: The nominal declaration (enum/class/actor/struct) if found, otherwise nil.
     func resolve(_ type: TypeSyntax) -> TypeDecl? {
-        if let id = type.as(IdentifierTypeSyntax.self) {
-            return lookupType(for: id)
-        }
-        if let components = qualifiedComponents(from: type) {
-            return lookupType(fullyQualified: components)
+        if let qualifiedName = tryQualify(type: type) {
+            return lookupType(fullyQualified: qualifiedName)
         }
         return nil
     }
 
+    func resolveExtensionTarget(_ type: TypeSyntax) -> TypeDecl? {
+        guard let qualifiedName = type.qualifiedComponents else {
+            return nil
+        }
+        return lookupType(fullyQualified: qualifiedName)
+    }
+
     /// Resolves a type usage node to a type alias declaration
     ///
     /// - Parameter type: The SwiftSyntax node representing a type appearance in source code.
     /// - Returns: The type alias declaration if found, otherwise nil.
     func resolveTypeAlias(_ type: TypeSyntax) -> TypeAliasDeclSyntax? {
-        if let id = type.as(IdentifierTypeSyntax.self) {
-            let qualifiedName = tryQualify(type: id)
+        if let qualifiedName = tryQualify(type: type) {
             return typeAliasByQualifiedName[qualifiedName]
         }
-        if let components = qualifiedComponents(from: type) {
-            return typeAliasByQualifiedName[components]
-        }
         return nil
     }
 
-    func qualifiedComponents(from type: TypeSyntax) -> QualifiedName? {
-        if let m = type.as(MemberTypeSyntax.self) {
-            guard let base = qualifiedComponents(from: TypeSyntax(m.baseType)) else { return nil }
+}
+
+extension TypeSyntax {
+    var qualifiedComponents: TypeDeclResolver.QualifiedName? {
+        if let m = self.as(MemberTypeSyntax.self) {
+            guard let base = TypeSyntax(m.baseType).qualifiedComponents else { return nil }
             return base + [m.name.text]
-        } else if let id = type.as(IdentifierTypeSyntax.self) {
+        } else if let id = self.as(IdentifierTypeSyntax.self) {
             return [id.name.text]
         } else {
             return nil
         }
     }
 }
+
+extension ExtensionDeclSyntax {
+    var memberScopeComponents: TypeDeclResolver.QualifiedName? {
+        extendedType.qualifiedComponents
+    }
+}
diff --git a/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift b/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift
index 03dfa87a2..163b7db6b 100644
--- a/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift
+++ b/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift
@@ -9,20 +9,18 @@ import BridgeJSUtilities
 
 public struct BridgeJSLink {
     var skeletons: [BridgeJSSkeleton] = []
-    let sharedMemory: Bool
     /// Whether to track the lifetime of Swift objects.
     ///
     /// This is useful for debugging memory issues.
     let enableLifetimeTracking: Bool = false
     private let namespaceBuilder = NamespaceBuilder()
     private let intrinsicRegistry = JSIntrinsicRegistry()
+    private let importedModuleRegistry = ImportedJSModuleRegistry()
 
     public init(
-        skeletons: [BridgeJSSkeleton] = [],
-        sharedMemory: Bool = false
+        skeletons: [BridgeJSSkeleton] = []
     ) {
         self.skeletons = skeletons
-        self.sharedMemory = sharedMemory
     }
 
     /// The identity mode from the config file, resolved from skeletons.
@@ -30,6 +28,10 @@ public struct BridgeJSLink {
         skeletons.compactMap(\.exported).compactMap(\.identityMode).first ?? "none"
     }
 
+    var hasGenerics: Bool {
+        skeletons.contains { $0.imported?.hasGenericDeclarations ?? false }
+    }
+
     /// Whether a class should use identity caching based on its annotation and the config default.
     private func shouldUseIdentityCache(for klass: ExportedClass) -> Bool {
         // Per-class annotation takes priority
@@ -40,10 +42,12 @@ public struct BridgeJSLink {
         return configIdentityMode == "pointer"
     }
 
-    mutating func addSkeletonFile(data: Data) throws {
+    @discardableResult
+    mutating func addSkeletonFile(data: Data) throws -> BridgeJSSkeleton {
         do {
             let unified = try JSONDecoder().decode(BridgeJSSkeleton.self, from: data)
             skeletons.append(unified)
+            return unified
         } catch {
             struct SkeletonDecodingError: Error, CustomStringConvertible {
                 let description: String
@@ -107,6 +111,7 @@ public struct BridgeJSLink {
             /// Represents a Swift heap object like a class instance or an actor instance.
             class SwiftHeapObject {
                 static __wrap(pointer, deinit, prototype, identityCache) {
+                    pointer = pointer >>> 0;
                     const makeFresh = (identityMap) => {
                         const obj = Object.create(prototype);
                         const state = { pointer, deinit, hasReleased: false, identityMap };
@@ -167,7 +172,6 @@ public struct BridgeJSLink {
         var classLines: [String] = []
         var dtsExportLines: [String] = []
         var dtsClassLines: [String] = []
-        var namespacedClassDtsExportEntries: [String: [String]] = [:]
         var topLevelTypeLines: [String] = []
         var topLevelDtsTypeLines: [String] = []
         var importObjectBuilders: [ImportObjectBuilder] = []
@@ -197,16 +201,9 @@ public struct BridgeJSLink {
             guard let skeleton = unified.exported else { continue }
             // Process classes
             for klass in skeleton.classes {
-                let (jsType, dtsType, dtsExportEntry) = try renderExportedClass(klass)
+                let (jsType, dtsType) = try renderExportedClass(klass)
                 data.classLines.append(contentsOf: jsType)
                 data.dtsClassLines.append(contentsOf: dtsType)
-
-                if klass.namespace == nil {
-                    data.exportsLines.append("\(klass.name),")
-                    data.dtsExportLines.append(contentsOf: dtsExportEntry)
-                } else {
-                    data.namespacedClassDtsExportEntries[klass.name] = dtsExportEntry
-                }
             }
 
             // Process enums - collect top-level definitions and export entries
@@ -229,23 +226,17 @@ public struct BridgeJSLink {
                 }
             }
 
-            var structExportEntries: [(js: [String], dts: [String])] = []
-            for structDefinition in skeleton.structs {
-                let (jsStruct, dtsType, dtsExportEntry) = try renderExportedStruct(structDefinition)
-                if structDefinition.namespace == nil {
-                    data.topLevelDtsTypeLines.append(contentsOf: dtsType)
-                }
-
-                if structDefinition.namespace == nil && (!jsStruct.isEmpty || !dtsExportEntry.isEmpty) {
-                    structExportEntries.append((js: jsStruct, dts: dtsExportEntry))
-                }
+            for structDefinition in skeleton.structs where structDefinition.namespace == nil {
+                data.topLevelDtsTypeLines.append(
+                    contentsOf: renderExportedStructInterface(structDefinition)
+                )
             }
 
             // Process functions
             for function in skeleton.functions {
                 if function.namespace == nil {
                     var (js, dts) = try renderExportedFunction(function: function)
-                    js[0] = "\(function.name): " + js[0]
+                    js[0] = "\(function.resolvedJSName): " + js[0]
                     js[js.count - 1] += ","
                     data.exportsLines.append(contentsOf: js)
                     data.dtsExportLines.append(contentsOf: dts)
@@ -256,11 +247,6 @@ public struct BridgeJSLink {
                 data.exportsLines.append(contentsOf: entry.js)
                 data.dtsExportLines.append(contentsOf: entry.dts)
             }
-
-            for entry in structExportEntries {
-                data.exportsLines.append(contentsOf: entry.js)
-                data.dtsExportLines.append(contentsOf: entry.dts)
-            }
         }
 
         // Process imported skeletons
@@ -281,7 +267,9 @@ public struct BridgeJSLink {
                     try renderImportedFunction(importObjectBuilder: importObjectBuilder, function: function)
                 }
                 for type in fileSkeleton.types {
-                    if type.constructor != nil, type.from == nil {
+                    // Matches the condition rendering the type into the `getImports` result
+                    // type: both its constructor and its static methods are looked up there.
+                    if type.from == nil, type.constructor != nil || !type.staticMethods.isEmpty {
                         data.needsImportsObject = true
                     }
                     try renderImportedType(importObjectBuilder: importObjectBuilder, type: type)
@@ -326,7 +314,7 @@ public struct BridgeJSLink {
     }
 
     private func generateVariableDeclarations() -> [String] {
-        return [
+        var declarations: [String] = [
             "let \(JSGlueVariableScope.reservedInstance);",
             "let \(JSGlueVariableScope.reservedMemory);",
             "let \(JSGlueVariableScope.reservedSetException);",
@@ -350,15 +338,145 @@ public struct BridgeJSLink {
             "let \(JSGlueVariableScope.reservedTaStack) = [];",
             "const \(JSGlueVariableScope.reservedEnumHelpers) = {};",
             "const \(JSGlueVariableScope.reservedStructHelpers) = {};",
+        ]
+        if hasGenerics {
+            declarations.append("const \(JSGlueVariableScope.reservedCodecByTypeId) = new Map();")
+            declarations.append("let __bjs_typeHandlesRegistered = false;")
+            declarations.append("function __bjs_registerTypeHandles() {")
+            declarations.append("    if (__bjs_typeHandlesRegistered) {")
+            declarations.append("        return;")
+            declarations.append("    }")
+            declarations.append("    __bjs_typeHandlesRegistered = true;")
+            declarations.append(
+                "    \(JSGlueVariableScope.reservedInstance).exports[\"\(ABINameGenerator.coreTypeRegistrationFunctionName)\"]();"
+            )
+            for skeleton in skeletons {
+                guard skeleton.typeRegistrationEntries != nil else { continue }
+                let name = ABINameGenerator.typeRegistrationFunctionName(moduleName: skeleton.moduleName)
+                declarations.append("    \(JSGlueVariableScope.reservedInstance).exports[\"\(name)\"]();")
+            }
+            declarations.append("}")
+            declarations.append(contentsOf: GenericJSCodegen.runtimeHelperDeclarations())
+        }
+        declarations.append(contentsOf: [
             "",
             "let _exports = null;",
             "let bjs = null;",
-        ]
+        ])
+        return declarations
+    }
+
+    /// JS const (in the import glue scope) holding the `Symbol` under which a promise's
+    /// resolve/reject settlers are stashed.
+    private static let promiseSettlersSymbol = "__bjs_promiseSettlers"
+
+    /// Renders a `bjs[...]` settlement handler that lifts `(promise, value)` and calls the
+    /// promise's stashed `resolve` / `reject` settler.
+    private func renderPromiseSettleHandler(
+        externName: String,
+        valueType: BridgeType,
+        settle: String,
+        into printer: CodeFragmentPrinter
+    ) throws {
+        let builder = ImportedThunkBuilder(
+            effects: Effects(isAsync: false, isThrows: true),
+            returnType: .void,
+            intrinsicRegistry: intrinsicRegistry
+        )
+        try builder.liftParameter(param: Parameter(label: nil, name: "promise", type: .jsObject(nil)))
+        // `Void` can't cross the bridge as a parameter, so the void resolve settles with `undefined`.
+        let valueArg: String
+        if valueType == .void {
+            valueArg = ""
+        } else {
+            try builder.liftParameter(param: Parameter(label: nil, name: "value", type: valueType))
+            valueArg = builder.parameterForwardings[1]
+        }
+        builder.body.write(
+            "\(builder.parameterForwardings[0])[\(Self.promiseSettlersSymbol)].\(settle)(\(valueArg));"
+        )
+        var lines = builder.renderFunction(name: nil)
+        lines[0] = "bjs[\"\(externName)\"] = \(lines[0])"
+        printer.write(lines: lines)
+    }
+
+    private func makeCodecPrintContext(printer: CodeFragmentPrinter) -> IntrinsicJSFragment.PrintCodeContext {
+        IntrinsicJSFragment.PrintCodeContext(
+            scope: JSGlueVariableScope(intrinsicRegistry: intrinsicRegistry),
+            printer: printer,
+            hasDirectAccessToSwiftClass: false,
+            classNamespaces: intrinsicRegistry.classNamespaces
+        )
+    }
+
+    private func genericCodecReference(type: BridgeType, into printer: CodeFragmentPrinter) throws -> String {
+        try ContainerCodecJS.codecExpression(for: type, context: makeCodecPrintContext(printer: printer))
+    }
+
+    private func writeTypeHandleRegistrationBody(into printer: CodeFragmentPrinter) {
+        printer.write(
+            "const typeIds = new Int32Array(\(JSGlueVariableScope.reservedMemory).buffer, base >>> 0, count >>> 0);"
+        )
+        printer.write("for (let i = 0; i < count; i++) {")
+        printer.indent {
+            printer.write("\(JSGlueVariableScope.reservedCodecByTypeId).set(typeIds[i], codecs[i]);")
+        }
+        printer.write("}")
+    }
+
+    private func generateCoreTypeRegistrationHook(into printer: CodeFragmentPrinter) throws {
+        let hookName = ABINameGenerator.coreTypeRegistrationFunctionName
+        guard hasGenerics else {
+            printer.write("bjs[\"\(hookName)\"] = function() {};")
+            return
+        }
+        try ContainerCodecJS.registerPrimitiveCodecs(context: makeCodecPrintContext(printer: printer))
+        printer.write("bjs[\"\(hookName)\"] = function(base, count) {")
+        printer.indent {
+            printer.write("const codecs = [")
+            printer.indent {
+                for primitive in BridgeType.genericBridgeablePrimitives {
+                    printer.write("\(JSGlueVariableScope.reservedPrimitiveCodecs).\(primitive.token),")
+                }
+            }
+            printer.write("];")
+            writeTypeHandleRegistrationBody(into: printer)
+        }
+        printer.write("}")
+    }
+
+    private func generateTypeRegistrationHooks(into printer: CodeFragmentPrinter) throws {
+        try generateCoreTypeRegistrationHook(into: printer)
+        for skeleton in skeletons {
+            guard let moduleEntries = skeleton.typeRegistrationEntries else { continue }
+            let hookName = ABINameGenerator.typeRegistrationFunctionName(moduleName: skeleton.moduleName)
+            guard hasGenerics else {
+                printer.write("bjs[\"\(hookName)\"] = function() {};")
+                continue
+            }
+            printer.write("bjs[\"\(hookName)\"] = function(base, count) {")
+            try printer.indent {
+                let codecNames = try moduleEntries.map {
+                    try genericCodecReference(type: $0.bridgeType, into: printer)
+                }
+                printer.write("const codecs = [")
+                printer.indent {
+                    for name in codecNames {
+                        printer.write("\(name),")
+                    }
+                }
+                printer.write("];")
+                writeTypeHandleRegistrationBody(into: printer)
+            }
+            printer.write("}")
+        }
     }
 
     private func generateAddImports(needsImportsObject: Bool) throws -> CodeFragmentPrinter {
         let printer = CodeFragmentPrinter()
-        let allStructs = skeletons.compactMap { $0.exported?.structs }.flatMap { $0 }
+        let allStructs = skeletons.flatMap { unified in
+            (unified.exported?.structs ?? []).map { (moduleName: unified.moduleName, structDef: $0) }
+        }
         printer.write("return {")
         try printer.indent {
             printer.write(lines: [
@@ -394,7 +512,7 @@ public struct BridgeJSLink {
                         "\(JSGlueVariableScope.reservedSwift).\(JSGlueVariableScope.reservedMemory).release(sourceId);"
                     )
                     printer.write(
-                        "const bytes = new Uint8Array(\(JSGlueVariableScope.reservedMemory).buffer, bytesPtr);"
+                        "const bytes = new Uint8Array(\(JSGlueVariableScope.reservedMemory).buffer, bytesPtr >>> 0);"
                     )
                     printer.write("bytes.set(source);")
                 }
@@ -409,7 +527,7 @@ public struct BridgeJSLink {
                 printer.write("bjs[\"swift_js_init_memory_with_result\"] = function(ptr, len) {")
                 printer.indent {
                     printer.write(
-                        "const target = new Uint8Array(\(JSGlueVariableScope.reservedMemory).buffer, ptr, len);"
+                        "const target = new Uint8Array(\(JSGlueVariableScope.reservedMemory).buffer, ptr >>> 0, len >>> 0);"
                     )
                     printer.write("target.set(\(JSGlueVariableScope.reservedStorageToReturnBytes));")
                     printer.write("\(JSGlueVariableScope.reservedStorageToReturnBytes) = undefined;")
@@ -506,11 +624,12 @@ public struct BridgeJSLink {
                 }
                 printer.write("}")
                 if !allStructs.isEmpty {
-                    for structDef in allStructs {
+                    for (moduleName, structDef) in allStructs {
+                        let key = HelperNaming.type(module: moduleName, swiftName: structDef.swiftCallName)
                         printer.write("bjs[\"swift_js_struct_lower_\(structDef.abiName)\"] = function(objectId) {")
                         printer.indent {
                             printer.write(
-                                "\(JSGlueVariableScope.reservedStructHelpers).\(structDef.abiName).lower(\(JSGlueVariableScope.reservedSwift).memory.getObject(objectId));"
+                                "\(JSGlueVariableScope.reservedStructHelpers).\(key).lower(\(JSGlueVariableScope.reservedSwift).memory.getObject(objectId));"
                             )
                         }
                         printer.write("}")
@@ -518,13 +637,47 @@ public struct BridgeJSLink {
                         printer.write("bjs[\"swift_js_struct_lift_\(structDef.abiName)\"] = function() {")
                         printer.indent {
                             printer.write(
-                                "const value = \(JSGlueVariableScope.reservedStructHelpers).\(structDef.abiName).lift();"
+                                "const value = \(JSGlueVariableScope.reservedStructHelpers).\(key).lift();"
                             )
                             printer.write("return \(JSGlueVariableScope.reservedSwift).memory.retain(value);")
                         }
                         printer.write("}")
                     }
                 }
+                try generateTypeRegistrationHooks(into: printer)
+
+                // Always provided: the runtime's `_bjs_makePromise` imports it unconditionally.
+                // The settlers are stored under a Symbol to avoid clashing with promise fields.
+                printer.write("const \(Self.promiseSettlersSymbol) = Symbol(\"JavaScriptKit.promiseSettlers\");")
+                printer.write("bjs[\"swift_js_make_promise\"] = function() {")
+                printer.indent {
+                    printer.write("let resolve, reject;")
+                    printer.write("const promise = new Promise((res, rej) => { resolve = res; reject = rej; });")
+                    printer.write("promise[\(Self.promiseSettlersSymbol)] = { resolve, reject };")
+                    printer.write(
+                        "return \(JSGlueVariableScope.reservedSwift).\(JSGlueVariableScope.reservedMemory).retain(promise);"
+                    )
+                }
+                printer.write("}")
+                for skeleton in skeletons {
+                    guard let exported = skeleton.exported else { continue }
+                    let asyncResolveTypes = exported.asyncPromiseResolveReturnTypes
+                    guard !asyncResolveTypes.isEmpty else { continue }
+                    for type in asyncResolveTypes {
+                        try renderPromiseSettleHandler(
+                            externName: "promise_resolve_\(skeleton.moduleName)_\(type.mangleTypeName)",
+                            valueType: type,
+                            settle: "resolve",
+                            into: printer
+                        )
+                    }
+                    try renderPromiseSettleHandler(
+                        externName: "promise_reject_\(skeleton.moduleName)",
+                        valueType: .jsValue,
+                        settle: "reject",
+                        into: printer
+                    )
+                }
 
                 printer.write("bjs[\"swift_js_return_optional_bool\"] = function(isSome, value) {")
                 printer.indent {
@@ -722,7 +875,7 @@ public struct BridgeJSLink {
                                 helperPrinter.write("if (state.unregistered) {")
                                 helperPrinter.indent {
                                     helperPrinter.write(
-                                        "const bytes = new Uint8Array(\(JSGlueVariableScope.reservedMemory).buffer, state.file);"
+                                        "const bytes = new Uint8Array(\(JSGlueVariableScope.reservedMemory).buffer, state.file >>> 0);"
                                     )
                                     helperPrinter.write("let length = 0;")
                                     helperPrinter.write("while (bytes[length] !== 0) { length += 1; }")
@@ -827,7 +980,7 @@ public struct BridgeJSLink {
     ) throws -> [String] {
         let printer = CodeFragmentPrinter()
         let builder = ExportedThunkBuilder(
-            effects: Effects(isAsync: false, isThrows: true),
+            effects: Effects(isAsync: signature.isAsync, isThrows: signature.isAsync ? signature.isThrows : true),
             hasDirectAccessToSwiftClass: false,
             intrinsicRegistry: intrinsicRegistry
         )
@@ -868,14 +1021,19 @@ public struct BridgeJSLink {
 
         for skeleton in exportedSkeletons {
             for proto in skeleton.protocols {
+                printer.write(lines: renderJSDoc(documentation: proto.documentation, parameters: []))
                 printer.write("export interface \(proto.name) {")
                 printer.indent {
                     for method in proto.methods {
+                        printer.write(
+                            lines: renderJSDoc(documentation: method.documentation, parameters: method.parameters)
+                        )
                         printer.write(
                             "\(method.name)\(renderTSSignature(parameters: method.parameters, returnType: method.returnType, effects: method.effects));"
                         )
                     }
                     for property in proto.properties {
+                        printer.write(lines: renderJSDoc(documentation: property.documentation, parameters: []))
                         let propertySignature =
                             property.isReadonly
                             ? "readonly \(property.name): \(resolveTypeScriptType(property.type));"
@@ -910,12 +1068,21 @@ public struct BridgeJSLink {
                     printer.indent {
                         for function in enumDefinition.staticMethods {
                             printer.write(
-                                "\(function.name)\(renderTSSignature(parameters: function.parameters, returnType: function.returnType, effects: function.effects));"
+                                lines: renderJSDoc(
+                                    documentation: function.documentation,
+                                    parameters: function.parameters
+                                )
+                            )
+                            printer.write(
+                                "\(function.resolvedJSName)\(renderTSSignature(parameters: function.parameters, returnType: function.returnType, effects: function.effects));"
                             )
                         }
                         for property in enumDefinition.staticProperties {
                             let readonly = property.isReadonly ? "readonly " : ""
-                            printer.write("\(readonly)\(property.name): \(resolveTypeScriptType(property.type));")
+                            printer.write(lines: renderJSDoc(documentation: property.documentation, parameters: []))
+                            printer.write(
+                                "\(readonly)\(property.resolvedJSName): \(resolveTypeScriptType(property.type));"
+                            )
                         }
                     }
                     printer.write("};")
@@ -931,6 +1098,15 @@ public struct BridgeJSLink {
             exportedSkeletons: exportedSkeletons,
             renderTSSignatureCallback: { parameters, returnType, effects in
                 self.renderTSSignature(parameters: parameters, returnType: returnType, effects: effects)
+            },
+            renderDocCallback: { documentation, parameters in
+                self.renderJSDoc(documentation: documentation, parameters: parameters)
+            },
+            renderStructInterface: { structDef in
+                self.renderExportedStructInterface(structDef)
+            },
+            renderClassDeclaration: { klass in
+                self.renderExportedClassDeclaration(klass)
             }
         )
         printer.write(lines: namespaceDeclarationsLines)
@@ -944,10 +1120,21 @@ public struct BridgeJSLink {
         let hierarchicalExportLines = namespaceBuilder.buildHierarchicalExportsType(
             exportedSkeletons: exportedSkeletons,
             renderClassEntry: { klass in
-                data.namespacedClassDtsExportEntries[klass.name] ?? []
+                self.renderExportedClassExportEntryBody(klass)
+            },
+            renderStructEntry: { structDef in
+                self.renderExportedStructExportEntry(structDef)
             },
-            renderFunctionSignature: { function in
-                "\(function.name)\(self.renderTSSignature(parameters: function.parameters, returnType: function.returnType, effects: function.effects));"
+            renderFunctionEntry: { function in
+                return self.renderJSDoc(documentation: function.documentation, parameters: function.parameters)
+                    + [
+                        "\(function.resolvedJSName)\(self.renderTSSignature(parameters: function.parameters, returnType: function.returnType, effects: function.effects));"
+                    ]
+            },
+            renderPropertyEntry: { property in
+                let readonly = property.isReadonly ? "readonly " : ""
+                return self.renderJSDoc(documentation: property.documentation, parameters: [])
+                    + ["\(readonly)\(property.resolvedJSName): \(property.type.tsType);"]
             }
         )
         printer.write("export type Exports = {")
@@ -985,7 +1172,7 @@ public struct BridgeJSLink {
     }
 
     /// Generates JavaScript output using CodeFragmentPrinter for better maintainability
-    private func generateJavaScript(data: LinkData) throws -> String {
+    private func generateJavaScript(data: LinkData, sharedMemory: Bool) throws -> String {
         let header = """
             // NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit,
             // DO NOT EDIT.
@@ -996,6 +1183,11 @@ public struct BridgeJSLink {
         let printer = CodeFragmentPrinter(header: header)
         printer.nextLine()
 
+        printer.write(lines: importedModuleRegistry.importLines)
+        if !importedModuleRegistry.importLines.isEmpty {
+            printer.nextLine()
+        }
+
         printer.write(lines: data.topLevelTypeLines)
 
         let exportedSkeletons = skeletons.compactMap(\.exported)
@@ -1018,12 +1210,18 @@ public struct BridgeJSLink {
 
             let bodyPrinter = CodeFragmentPrinter()
             let allStructs = exportedSkeletons.flatMap { $0.structs }
-            for structDef in allStructs {
+            for (moduleName, structDef) in skeletons.flatMap({ unified in
+                (unified.exported?.structs ?? []).map { (unified.moduleName, $0) }
+            }) {
                 let structPrinter = CodeFragmentPrinter()
                 let structScope = JSGlueVariableScope(intrinsicRegistry: intrinsicRegistry)
-                let fragment = IntrinsicJSFragment.structHelper(structDefinition: structDef, allStructs: allStructs)
+                let fragment = IntrinsicJSFragment.structHelper(
+                    structDefinition: structDef,
+                    allStructs: allStructs,
+                    moduleName: moduleName
+                )
                 _ = try fragment.printCode(
-                    [structDef.abiName],
+                    [],
                     IntrinsicJSFragment.PrintCodeContext(
                         scope: structScope,
                         printer: structPrinter,
@@ -1034,13 +1232,16 @@ public struct BridgeJSLink {
                 bodyPrinter.write(lines: structPrinter.lines)
             }
 
-            let allAssocEnums = exportedSkeletons.flatMap {
-                $0.enums.filter { $0.enumType == .associatedValue }
-            }
-            for enumDef in allAssocEnums {
+            for (moduleName, enumDef) in skeletons.flatMap({ unified in
+                (unified.exported?.enums ?? []).filter { $0.enumType == .associatedValue }
+                    .map { (unified.moduleName, $0) }
+            }) {
                 let enumPrinter = CodeFragmentPrinter()
                 let enumScope = JSGlueVariableScope(intrinsicRegistry: intrinsicRegistry)
-                let fragment = IntrinsicJSFragment.associatedValueEnumHelperFactory(enumDefinition: enumDef)
+                let fragment = IntrinsicJSFragment.associatedValueEnumHelperFactory(
+                    enumDefinition: enumDef,
+                    moduleName: moduleName
+                )
                 _ = try fragment.printCode(
                     [enumDef.valuesName],
                     IntrinsicJSFragment.PrintCodeContext(
@@ -1060,6 +1261,11 @@ public struct BridgeJSLink {
                 printer.nextLine()
             }
 
+            if intrinsicRegistry.hasNamedCodecs {
+                printer.write(lines: intrinsicRegistry.emitNamedCodecLines())
+                printer.nextLine()
+            }
+
             printer.write(lines: bodyPrinter.lines)
         }
         printer.indent()
@@ -1139,8 +1345,9 @@ public struct BridgeJSLink {
         return printer.lines.joined(separator: "\n")
     }
 
-    public func link() throws -> (outputJs: String, outputDts: String) {
+    public func link(sharedMemory: Bool = false) throws -> (outputJs: String, outputDts: String) {
         intrinsicRegistry.reset()
+        importedModuleRegistry.configure(skeletons: skeletons)
         intrinsicRegistry.classNamespaces = skeletons.reduce(into: [:]) { result, unified in
             guard let skeleton = unified.exported else { return }
             for klass in skeleton.classes {
@@ -1149,21 +1356,55 @@ public struct BridgeJSLink {
                 }
             }
         }
+        intrinsicRegistry.typeOwnerModules = collectTypeOwnerModules()
         let data = try collectLinkData()
-        let outputJs = try generateJavaScript(data: data)
+        let outputJs = try generateJavaScript(data: data, sharedMemory: sharedMemory)
         let outputDts = generateTypeScript(data: data)
         return (outputJs, outputDts)
     }
 
+    private func collectTypeOwnerModules() -> [String: String] {
+        var result: [String: String] = [:]
+        func record(_ name: String, _ moduleName: String) {
+            if result[name] == nil {
+                result[name] = moduleName
+            }
+        }
+        for unified in skeletons {
+            let moduleName = unified.moduleName
+            if let skeleton = unified.exported {
+                for structDef in skeleton.structs {
+                    record(structDef.name, moduleName)
+                    record(structDef.abiName, moduleName)
+                    record(structDef.swiftCallName, moduleName)
+                }
+                for klass in skeleton.classes {
+                    record(klass.name, moduleName)
+                    record(klass.abiName, moduleName)
+                }
+                for enumDef in skeleton.enums {
+                    record(enumDef.name, moduleName)
+                    record(enumDef.abiName, moduleName)
+                    record(enumDef.swiftCallName, moduleName)
+                }
+                for protocolDef in skeleton.protocols {
+                    record(protocolDef.name, moduleName)
+                }
+            }
+        }
+        return result
+    }
+
     private func enumHelperAssignments() -> CodeFragmentPrinter {
         let printer = CodeFragmentPrinter()
 
-        for skeleton in skeletons.compactMap(\.exported) {
+        for unified in skeletons {
+            guard let skeleton = unified.exported else { continue }
             for enumDef in skeleton.enums where enumDef.enumType == .associatedValue {
-                printer.write(
-                    "const \(enumDef.name)Helpers = __bjs_create\(enumDef.valuesName)Helpers();"
-                )
-                printer.write("\(JSGlueVariableScope.reservedEnumHelpers).\(enumDef.name) = \(enumDef.name)Helpers;")
+                let key = HelperNaming.type(module: unified.moduleName, swiftName: enumDef.swiftCallName)
+                let local = HelperNaming.helperConstant(key)
+                printer.write("const \(local) = \(HelperNaming.enumHelperFactory(key))();")
+                printer.write("\(JSGlueVariableScope.reservedEnumHelpers).\(key) = \(local);")
                 printer.nextLine()
             }
         }
@@ -1174,14 +1415,13 @@ public struct BridgeJSLink {
     private func structHelperAssignments() -> CodeFragmentPrinter {
         let printer = CodeFragmentPrinter()
 
-        for skeleton in skeletons.compactMap(\.exported) {
+        for unified in skeletons {
+            guard let skeleton = unified.exported else { continue }
             for structDef in skeleton.structs {
-                printer.write(
-                    "const \(structDef.abiName)Helpers = __bjs_create\(structDef.abiName)Helpers();"
-                )
-                printer.write(
-                    "\(JSGlueVariableScope.reservedStructHelpers).\(structDef.abiName) = \(structDef.abiName)Helpers;"
-                )
+                let key = HelperNaming.type(module: unified.moduleName, swiftName: structDef.swiftCallName)
+                let local = HelperNaming.helperConstant(key)
+                printer.write("const \(local) = \(HelperNaming.structHelperFactory(key))();")
+                printer.write("\(JSGlueVariableScope.reservedStructHelpers).\(key) = \(local);")
                 printer.nextLine()
             }
         }
@@ -1250,6 +1490,9 @@ public struct BridgeJSLink {
                 renderFunctionImpl: { function in
                     let (js, _) = try self.renderExportedFunction(function: function)
                     return js
+                },
+                renderStructImpl: { structDef in
+                    try self.renderExportedStructJsBody(structDef)
                 }
             )
             printer.write(lines: hierarchicalLines)
@@ -1277,18 +1520,19 @@ public struct BridgeJSLink {
 
                     // Add methods
                     for method in type.methods {
-                        let methodName = method.jsName ?? method.name
+                        let methodName = method.resolvedJSName
+                        let genericClause = renderGenericClause(method.genericParameterNames)
                         let methodSignature =
-                            "\(renderTSPropertyName(methodName))\(renderTSSignature(parameters: method.parameters, returnType: method.returnType, effects: method.effects));"
+                            "\(renderTSPropertyName(methodName))\(genericClause)\(renderTSSignature(parameters: method.parameters, returnType: method.returnType, effects: method.effects));"
                         printer.write(methodSignature)
                     }
 
                     // Add properties from getters
                     var propertyNames = Set<String>()
                     for getter in type.getters {
-                        let propertyName = getter.jsName ?? getter.name
+                        let propertyName = getter.resolvedJSName
                         propertyNames.insert(propertyName)
-                        let hasSetter = type.setters.contains { ($0.jsName ?? $0.name) == propertyName }
+                        let hasSetter = type.setters.contains { $0.resolvedJSName == propertyName }
                         let propertySignature =
                             hasSetter
                             ? "\(renderTSPropertyName(propertyName)): \(resolveTypeScriptType(getter.type));"
@@ -1297,7 +1541,7 @@ public struct BridgeJSLink {
                     }
                     // Add setters that don't have corresponding getters
                     for setter in type.setters {
-                        let propertyName = setter.jsName ?? setter.name
+                        let propertyName = setter.resolvedJSName
                         guard !propertyNames.contains(propertyName) else { continue }
                         printer.write("\(renderTSPropertyName(propertyName)): \(resolveTypeScriptType(setter.type));")
                     }
@@ -1444,7 +1688,7 @@ public struct BridgeJSLink {
             // Look up the enum to get its tsFullPath
             for skeleton in exportedSkeletons {
                 for enumDef in skeleton.enums {
-                    if enumDef.name == name || enumDef.swiftCallName == name {
+                    if enumDef.swiftCallName == name {
                         // Use the stored tsFullPath which has the full namespace
                         switch type {
                         case .namespaceEnum:
@@ -1459,6 +1703,28 @@ public struct BridgeJSLink {
                 }
             }
             return type.tsType
+        case .swiftStruct(let name):
+            for skeleton in exportedSkeletons {
+                for structDef in skeleton.structs {
+                    if structDef.swiftCallName == name {
+                        return structDef.tsFullPath
+                    }
+                }
+            }
+            return type.tsType
+        case .swiftHeapObject(let name):
+            for skeleton in exportedSkeletons {
+                for klass in skeleton.classes {
+                    if klass.swiftCallName == name {
+                        return klass.name
+                    }
+                }
+            }
+            return type.tsType
+        case .closure(let signature, _):
+            return signature.renderTSFunctionType { resolveTypeScriptType($0, exportedSkeletons: exportedSkeletons) }
+        case .alias(_, let underlying):
+            return resolveTypeScriptType(underlying, exportedSkeletons: exportedSkeletons)
         case .nullable(let wrapped, let kind):
             let base = resolveTypeScriptType(wrapped, exportedSkeletons: exportedSkeletons)
             return "\(base) | \(kind.absenceLiteral)"
@@ -1492,6 +1758,10 @@ public struct BridgeJSLink {
         return "(\(parameterSignatures.joined(separator: ", "))): \(returnTypeWithEffect)"
     }
 
+    private func renderGenericClause(_ genericParameterNames: [String]) -> String {
+        genericParameterNames.isEmpty ? "" : "<\(genericParameterNames.joined(separator: ", "))>"
+    }
+
     private func renderTSPropertyName(_ name: String) -> String {
         // TypeScript allows quoted property names for keys that aren't valid identifiers.
         if name.range(of: #"^[$A-Z_][0-9A-Z_$]*$"#, options: [.regularExpression, .caseInsensitive]) != nil {
@@ -1500,118 +1770,117 @@ public struct BridgeJSLink {
         return "\"\(Self.escapeForJavaScriptStringLiteral(name))\""
     }
 
-    fileprivate static func escapeForJavaScriptStringLiteral(_ string: String) -> String {
+    static func escapeForJavaScriptStringLiteral(_ string: String) -> String {
         string
             .replacingOccurrences(of: "\\", with: "\\\\")
             .replacingOccurrences(of: "\"", with: "\\\"")
     }
 
-    /// Helper method to append JSDoc comments for parameters with default values
-    private func appendJSDocIfNeeded(for parameters: [Parameter], to lines: inout [String]) {
-        let jsDocLines = DefaultValueUtils.formatJSDoc(for: parameters)
-        lines.append(contentsOf: jsDocLines)
-    }
-
-    func renderExportedStruct(
+    func renderExportedStructInterface(
         _ structDefinition: ExportedStruct
-    ) throws -> (js: [String], dtsType: [String], dtsExportEntry: [String]) {
-        let structName = structDefinition.name
-        let hasConstructor = structDefinition.constructor != nil
-        let staticMethods = structDefinition.methods.filter { $0.effects.isStatic }
-        let staticProperties = structDefinition.properties.filter { $0.isStatic }
-
+    ) -> [String] {
         let dtsTypePrinter = CodeFragmentPrinter()
-        dtsTypePrinter.write("export interface \(structName) {")
-        let instanceProps = structDefinition.properties.filter { !$0.isStatic }
+        for line in renderJSDoc(documentation: structDefinition.documentation, parameters: []) {
+            dtsTypePrinter.write(line)
+        }
+        dtsTypePrinter.write("export interface \(structDefinition.name) {")
         dtsTypePrinter.indent {
-            for property in instanceProps {
+            for property in structDefinition.properties where !property.isStatic {
                 let tsType = resolveTypeScriptType(property.type)
+                for line in renderJSDoc(documentation: property.documentation, parameters: []) {
+                    dtsTypePrinter.write(line)
+                }
                 dtsTypePrinter.write("\(property.name): \(tsType);")
             }
             for method in structDefinition.methods where !method.effects.isStatic {
-                let jsDocLines = DefaultValueUtils.formatJSDoc(for: method.parameters)
+                let jsDocLines = renderJSDoc(
+                    documentation: method.documentation,
+                    parameters: method.parameters
+                )
                 dtsTypePrinter.write(lines: jsDocLines)
                 let signature = renderTSSignature(
                     parameters: method.parameters,
                     returnType: method.returnType,
                     effects: method.effects
                 )
-                dtsTypePrinter.write("\(method.name)\(signature);")
+                dtsTypePrinter.write("\(method.resolvedJSName)\(signature);")
             }
         }
         dtsTypePrinter.write("}")
+        return dtsTypePrinter.lines
+    }
 
-        guard hasConstructor || !staticMethods.isEmpty || !staticProperties.isEmpty else {
-            return (js: [], dtsType: dtsTypePrinter.lines, dtsExportEntry: [])
+    func renderExportedStructExportEntry(
+        _ structDefinition: ExportedStruct
+    ) -> [String] {
+        let dtsExportEntryPrinter = CodeFragmentPrinter()
+        if let constructor = structDefinition.constructor {
+            let jsDocLines = renderJSDoc(documentation: constructor.documentation, parameters: constructor.parameters)
+            dtsExportEntryPrinter.write(lines: jsDocLines)
+            dtsExportEntryPrinter.write(
+                "init\(renderTSSignature(parameters: constructor.parameters, returnType: .swiftStruct(structDefinition.swiftCallName), effects: constructor.effects));"
+            )
+        }
+        for property in structDefinition.properties where property.isStatic {
+            let readonly = property.isReadonly ? "readonly " : ""
+            dtsExportEntryPrinter.write(lines: renderJSDoc(documentation: property.documentation, parameters: []))
+            dtsExportEntryPrinter.write(
+                "\(readonly)\(property.resolvedJSName): \(resolveTypeScriptType(property.type));"
+            )
+        }
+        for method in structDefinition.methods where method.effects.isStatic {
+            let jsDocLines = renderJSDoc(documentation: method.documentation, parameters: method.parameters)
+            dtsExportEntryPrinter.write(lines: jsDocLines)
+            dtsExportEntryPrinter.write(
+                "\(method.resolvedJSName)\(renderTSSignature(parameters: method.parameters, returnType: method.returnType, effects: method.effects));"
+            )
         }
 
-        let jsPrinter = CodeFragmentPrinter()
-        jsPrinter.write("\(structName): {")
-        try jsPrinter.indent {
-            // Constructor as 'init' function
-            if let constructor = structDefinition.constructor {
-                let thunkBuilder = ExportedThunkBuilder(
-                    effects: constructor.effects,
-                    intrinsicRegistry: intrinsicRegistry
-                )
-                for param in constructor.parameters {
-                    try thunkBuilder.lowerParameter(param: param)
-                }
-                let returnExpr = try thunkBuilder.call(
-                    abiName: constructor.abiName,
-                    returnType: .swiftStruct(structDefinition.swiftCallName)
-                )
+        return dtsExportEntryPrinter.lines
+    }
 
-                let constructorPrinter = CodeFragmentPrinter()
-                let paramList = DefaultValueUtils.formatParameterList(constructor.parameters)
-                constructorPrinter.write("init: function(\(paramList)) {")
-                constructorPrinter.indent {
-                    thunkBuilder.renderFunctionBody(into: constructorPrinter, returnExpr: returnExpr)
-                }
-                constructorPrinter.write("},")
-                jsPrinter.write(lines: constructorPrinter.lines)
+    func renderExportedStructJsBody(
+        _ structDefinition: ExportedStruct
+    ) throws -> [String] {
+        let jsPrinter = CodeFragmentPrinter()
+        // Constructor as 'init' function
+        if let constructor = structDefinition.constructor {
+            let thunkBuilder = ExportedThunkBuilder(
+                effects: constructor.effects,
+                intrinsicRegistry: intrinsicRegistry
+            )
+            for param in constructor.parameters {
+                try thunkBuilder.lowerParameter(param: param)
             }
+            let returnExpr = try thunkBuilder.call(
+                abiName: constructor.abiName,
+                returnType: .swiftStruct(structDefinition.swiftCallName)
+            )
 
-            for property in staticProperties {
-                let propertyLines = try renderStaticPropertyForExportObject(
-                    property: property,
-                    className: structName
-                )
-                jsPrinter.write(lines: propertyLines)
+            let constructorPrinter = CodeFragmentPrinter()
+            let paramList = DefaultValueUtils.formatParameterList(constructor.parameters)
+            constructorPrinter.write("init: function(\(paramList)) {")
+            constructorPrinter.indent {
+                thunkBuilder.renderFunctionBody(into: constructorPrinter, returnExpr: returnExpr)
             }
+            constructorPrinter.write("},")
+            jsPrinter.write(lines: constructorPrinter.lines)
+        }
 
-            for method in staticMethods {
-                let methodLines = try renderStaticMethodForExportObject(method: method)
-                jsPrinter.write(lines: methodLines)
-            }
+        for property in structDefinition.properties where property.isStatic {
+            let propertyLines = try renderStaticPropertyForExportObject(
+                property: property,
+                className: structDefinition.name
+            )
+            jsPrinter.write(lines: propertyLines)
         }
-        jsPrinter.write("},")
 
-        let dtsExportEntryPrinter = CodeFragmentPrinter()
-        dtsExportEntryPrinter.write("\(structName): {")
-        dtsExportEntryPrinter.indent {
-            if let constructor = structDefinition.constructor {
-                let jsDocLines = DefaultValueUtils.formatJSDoc(for: constructor.parameters)
-                dtsExportEntryPrinter.write(lines: jsDocLines)
-                dtsExportEntryPrinter.write(
-                    "init\(renderTSSignature(parameters: constructor.parameters, returnType: .swiftStruct(structDefinition.swiftCallName), effects: constructor.effects));"
-                )
-            }
-            for property in staticProperties {
-                let readonly = property.isReadonly ? "readonly " : ""
-                dtsExportEntryPrinter.write("\(readonly)\(property.name): \(resolveTypeScriptType(property.type));")
-            }
-            for method in staticMethods {
-                let jsDocLines = DefaultValueUtils.formatJSDoc(for: method.parameters)
-                dtsExportEntryPrinter.write(lines: jsDocLines)
-                dtsExportEntryPrinter.write(
-                    "\(method.name)\(renderTSSignature(parameters: method.parameters, returnType: method.returnType, effects: method.effects));"
-                )
-            }
+        for method in structDefinition.methods where method.effects.isStatic {
+            let methodLines = try renderStaticMethodForExportObject(method: method)
+            jsPrinter.write(lines: methodLines)
         }
-        dtsExportEntryPrinter.write("}")
 
-        return (js: jsPrinter.lines, dtsType: dtsTypePrinter.lines, dtsExportEntry: dtsExportEntryPrinter.lines)
+        return jsPrinter.lines
     }
 
     func renderExportedEnum(
@@ -1702,6 +1971,10 @@ public struct BridgeJSLink {
         let printer = CodeFragmentPrinter()
         let enumValuesName = enumDefinition.valuesName
 
+        for line in renderJSDoc(documentation: enumDefinition.documentation, parameters: []) {
+            printer.write(line)
+        }
+
         switch enumDefinition.emitStyle {
         case .tsEnum:
             switch enumDefinition.enumType {
@@ -1815,10 +2088,10 @@ extension BridgeJSLink {
         )
         var dtsLines: [String] = []
 
-        appendJSDocIfNeeded(for: function.parameters, to: &dtsLines)
+        dtsLines.append(contentsOf: renderJSDoc(documentation: function.documentation, parameters: function.parameters))
 
         dtsLines.append(
-            "\(function.name)\(renderTSSignature(parameters: function.parameters, returnType: function.returnType, effects: function.effects));"
+            "\(function.resolvedJSName)\(renderTSSignature(parameters: function.parameters, returnType: function.returnType, effects: function.effects));"
         )
 
         return (funcLines, dtsLines)
@@ -1859,7 +2132,7 @@ extension BridgeJSLink {
         let returnExpr = try thunkBuilder.call(abiName: function.abiName, returnType: function.returnType)
 
         let funcLines = thunkBuilder.renderFunction(
-            name: function.name,
+            name: function.resolvedJSName,
             parameters: function.parameters,
             returnExpr: returnExpr,
             declarationPrefixKeyword: "static"
@@ -1867,10 +2140,10 @@ extension BridgeJSLink {
 
         var dtsLines: [String] = []
 
-        appendJSDocIfNeeded(for: function.parameters, to: &dtsLines)
+        dtsLines.append(contentsOf: renderJSDoc(documentation: function.documentation, parameters: function.parameters))
 
         dtsLines.append(
-            "static \(function.name)\(renderTSSignature(parameters: function.parameters, returnType: function.returnType, effects: function.effects));"
+            "static \(function.resolvedJSName)\(renderTSSignature(parameters: function.parameters, returnType: function.returnType, effects: function.effects));"
         )
 
         return (funcLines, dtsLines)
@@ -1890,7 +2163,7 @@ extension BridgeJSLink {
         let returnExpr = try thunkBuilder.call(abiName: function.abiName, returnType: function.returnType)
 
         let printer = CodeFragmentPrinter()
-        printer.write("\(function.name)(\(DefaultValueUtils.formatParameterList(function.parameters))) {")
+        printer.write("\(function.resolvedJSName)(\(DefaultValueUtils.formatParameterList(function.parameters))) {")
         printer.indent {
             thunkBuilder.renderFunctionBody(into: printer, returnExpr: returnExpr)
         }
@@ -1898,10 +2171,10 @@ extension BridgeJSLink {
 
         var dtsLines: [String] = []
 
-        appendJSDocIfNeeded(for: function.parameters, to: &dtsLines)
+        dtsLines.append(contentsOf: renderJSDoc(documentation: function.documentation, parameters: function.parameters))
 
         dtsLines.append(
-            "\(function.name)\(renderTSSignature(parameters: function.parameters, returnType: function.returnType, effects: function.effects));"
+            "\(function.resolvedJSName)\(renderTSSignature(parameters: function.parameters, returnType: function.returnType, effects: function.effects));"
         )
 
         return (printer.lines, dtsLines)
@@ -1947,7 +2220,7 @@ extension BridgeJSLink {
 
         let methodPrinter = CodeFragmentPrinter()
         methodPrinter.write(
-            "\(method.name): function(\(DefaultValueUtils.formatParameterList(method.parameters))) {"
+            "\(method.resolvedJSName): function(\(DefaultValueUtils.formatParameterList(method.parameters))) {"
         )
         methodPrinter.indent {
             thunkBuilder.renderFunctionBody(into: methodPrinter, returnExpr: returnExpr)
@@ -1975,7 +2248,7 @@ extension BridgeJSLink {
             returnType: property.type
         )
 
-        propertyPrinter.write("get \(property.name)() {")
+        propertyPrinter.write("get \(property.resolvedJSName)() {")
         propertyPrinter.indent {
             getterThunkBuilder.renderFunctionBody(into: propertyPrinter, returnExpr: getterReturnExpr)
         }
@@ -1997,7 +2270,7 @@ extension BridgeJSLink {
                 returnType: .void
             )
 
-            propertyPrinter.write("set \(property.name)(value) {")
+            propertyPrinter.write("set \(property.resolvedJSName)(value) {")
             propertyPrinter.indent {
                 setterThunkBuilder.renderFunctionBody(into: propertyPrinter, returnExpr: nil)
             }
@@ -2009,13 +2282,14 @@ extension BridgeJSLink {
 
     func renderExportedClass(
         _ klass: ExportedClass
-    ) throws -> (js: [String], dtsType: [String], dtsExportEntry: [String]) {
+    ) throws -> (js: [String], dtsType: [String]) {
         let jsPrinter = CodeFragmentPrinter()
         let dtsTypePrinter = CodeFragmentPrinter()
-        let dtsExportEntryPrinter = CodeFragmentPrinter()
 
+        for line in renderJSDoc(documentation: klass.documentation, parameters: []) {
+            dtsTypePrinter.write(line)
+        }
         dtsTypePrinter.write("export interface \(klass.name) extends SwiftHeapObject {")
-        dtsExportEntryPrinter.write("\(klass.name): {")
         jsPrinter.write("class \(klass.name) extends SwiftHeapObject {")
 
         // Per-class identity mode: determine at codegen time whether this class uses identity caching
@@ -2064,16 +2338,6 @@ extension BridgeJSLink {
                 }
                 jsPrinter.write("}")
             }
-
-            dtsExportEntryPrinter.indent {
-                let jsDocLines = DefaultValueUtils.formatJSDoc(for: constructor.parameters)
-                for line in jsDocLines {
-                    dtsExportEntryPrinter.write(line)
-                }
-                dtsExportEntryPrinter.write(
-                    "new\(renderTSSignature(parameters: constructor.parameters, returnType: .swiftHeapObject(klass.name), effects: constructor.effects));"
-                )
-            }
         }
 
         for method in klass.methods {
@@ -2090,19 +2354,13 @@ extension BridgeJSLink {
                 jsPrinter.indent {
                     jsPrinter.write(
                         lines: thunkBuilder.renderFunction(
-                            name: method.name,
+                            name: method.resolvedJSName,
                             parameters: method.parameters,
                             returnExpr: returnExpr,
                             declarationPrefixKeyword: "static"
                         )
                     )
                 }
-
-                dtsExportEntryPrinter.indent {
-                    dtsExportEntryPrinter.write(
-                        "\(method.name)\(renderTSSignature(parameters: method.parameters, returnType: method.returnType, effects: method.effects));"
-                    )
-                }
             } else {
                 let thunkBuilder = ExportedThunkBuilder(
                     effects: method.effects,
@@ -2117,7 +2375,7 @@ extension BridgeJSLink {
                 jsPrinter.indent {
                     jsPrinter.write(
                         lines: thunkBuilder.renderFunction(
-                            name: method.name,
+                            name: method.resolvedJSName,
                             parameters: method.parameters,
                             returnExpr: returnExpr,
                             declarationPrefixKeyword: nil
@@ -2126,8 +2384,14 @@ extension BridgeJSLink {
                 }
 
                 dtsTypePrinter.indent {
+                    for line in renderJSDoc(
+                        documentation: method.documentation,
+                        parameters: method.parameters
+                    ) {
+                        dtsTypePrinter.write(line)
+                    }
                     dtsTypePrinter.write(
-                        "\(method.name)\(renderTSSignature(parameters: method.parameters, returnType: method.returnType, effects: method.effects));"
+                        "\(method.resolvedJSName)\(renderTSSignature(parameters: method.parameters, returnType: method.returnType, effects: method.effects));"
                     )
                 }
             }
@@ -2140,15 +2404,78 @@ extension BridgeJSLink {
                 className: klass.abiName,
                 isStatic: property.isStatic,
                 jsPrinter: jsPrinter,
-                dtsPrinter: property.isStatic ? dtsExportEntryPrinter : dtsTypePrinter
+                dtsPrinter: dtsTypePrinter
             )
         }
 
         jsPrinter.write("}")
         dtsTypePrinter.write("}")
-        dtsExportEntryPrinter.write("}")
 
-        return (jsPrinter.lines, dtsTypePrinter.lines, dtsExportEntryPrinter.lines)
+        return (jsPrinter.lines, dtsTypePrinter.lines)
+    }
+
+    func renderExportedClassExportEntryBody(
+        _ klass: ExportedClass
+    ) -> [String] {
+        let printer = CodeFragmentPrinter()
+        if let constructor = klass.constructor {
+            printer.write(
+                lines: renderJSDoc(documentation: constructor.documentation, parameters: constructor.parameters)
+            )
+            printer.write(
+                "new\(renderTSSignature(parameters: constructor.parameters, returnType: .swiftHeapObject(klass.name), effects: constructor.effects));"
+            )
+        }
+        for method in klass.methods where method.effects.isStatic {
+            printer.write(lines: renderJSDoc(documentation: method.documentation, parameters: method.parameters))
+            printer.write(
+                "\(method.resolvedJSName)\(renderTSSignature(parameters: method.parameters, returnType: method.returnType, effects: method.effects));"
+            )
+        }
+        for property in klass.properties where property.isStatic {
+            let readonly = property.isReadonly ? "readonly " : ""
+            printer.write(lines: renderJSDoc(documentation: property.documentation, parameters: []))
+            printer.write("\(readonly)\(property.resolvedJSName): \(resolveTypeScriptType(property.type));")
+        }
+        return printer.lines
+    }
+
+    func renderExportedClassDeclaration(
+        _ klass: ExportedClass
+    ) -> [String] {
+        let printer = CodeFragmentPrinter()
+        printer.write(lines: renderJSDoc(documentation: klass.documentation, parameters: []))
+        printer.write("class \(klass.name) {")
+        printer.indent {
+            if let constructor = klass.constructor {
+                let paramSignatures = constructor.parameters.map { param in
+                    let optional = param.hasDefault ? "?" : ""
+                    return "\(param.name)\(optional): \(param.type.tsType)"
+                }
+                printer.write(
+                    lines: renderJSDoc(documentation: constructor.documentation, parameters: constructor.parameters)
+                )
+                printer.write("constructor(\(paramSignatures.joined(separator: ", ")));")
+            }
+            for method in klass.methods.sorted(by: { $0.resolvedJSName < $1.resolvedJSName }) {
+                let staticKeyword = method.effects.isStatic ? "static " : ""
+                printer.write(lines: renderJSDoc(documentation: method.documentation, parameters: method.parameters))
+                printer.write(
+                    "\(staticKeyword)\(method.resolvedJSName)\(renderTSSignature(parameters: method.parameters, returnType: method.returnType, effects: method.effects));"
+                )
+            }
+            for property in klass.properties.sorted(by: { $0.resolvedJSName < $1.resolvedJSName }) {
+                let staticKeyword = property.isStatic ? "static " : ""
+                let readonly = property.isReadonly ? "readonly " : ""
+                printer.write(lines: renderJSDoc(documentation: property.documentation, parameters: []))
+                printer.write(
+                    "\(staticKeyword)\(readonly)\(property.resolvedJSName): \(resolveTypeScriptType(property.type));"
+                )
+            }
+            printer.write("release(): void;")
+        }
+        printer.write("}")
+        return printer.lines
     }
 
     private func renderClassProperty(
@@ -2173,7 +2500,7 @@ extension BridgeJSLink {
         jsPrinter.indent {
             jsPrinter.write(
                 lines: getterThunkBuilder.renderFunction(
-                    name: property.name,
+                    name: property.resolvedJSName,
                     parameters: [],
                     returnExpr: getterReturnExpr,
                     declarationPrefixKeyword: getterKeyword
@@ -2201,7 +2528,7 @@ extension BridgeJSLink {
             jsPrinter.indent {
                 jsPrinter.write(
                     lines: setterThunkBuilder.renderFunction(
-                        name: property.name,
+                        name: property.resolvedJSName,
                         parameters: [.init(label: nil, name: "value", type: property.type)],
                         returnExpr: nil,
                         declarationPrefixKeyword: setterKeyword
@@ -2211,9 +2538,14 @@ extension BridgeJSLink {
         }
 
         // Add instance property to TypeScript interface definition
-        let readonly = property.isReadonly ? "readonly " : ""
-        dtsPrinter.indent {
-            dtsPrinter.write("\(readonly)\(property.name): \(property.type.tsType);")
+        if !isStatic {
+            let readonly = property.isReadonly ? "readonly " : ""
+            dtsPrinter.indent {
+                for line in renderJSDoc(documentation: property.documentation, parameters: []) {
+                    dtsPrinter.write(line)
+                }
+                dtsPrinter.write("\(readonly)\(property.resolvedJSName): \(resolveTypeScriptType(property.type));")
+            }
         }
     }
 
@@ -2226,6 +2558,8 @@ extension BridgeJSLink {
         var parameterNames: [String] = []
         var parameterForwardings: [String] = []
         var returnExpr: String?
+        var genericCodecVariables: [String: String] = [:]
+        var genericTypeIdParameters: [String: String] = [:]
         let printContext: IntrinsicJSFragment.PrintCodeContext
 
         init(
@@ -2251,7 +2585,34 @@ extension BridgeJSLink {
             parameterNames.append("self")
         }
 
+        func declareGenericCodecs(genericParameters: [String]) {
+            if !genericParameters.isEmpty {
+                ContainerCodecJS.registerCombinators(scope: scope)
+            }
+            for genericParam in genericParameters {
+                let typeIdParam = scope.variable("\(genericParam.lowercased())TypeId")
+                let codecVar = scope.variable("codec\(genericParam)")
+                body.write("const \(codecVar) = __bjs_codecForTypeId(\(typeIdParam));")
+                genericCodecVariables[genericParam] = codecVar
+                genericTypeIdParameters[genericParam] = typeIdParam
+            }
+        }
+
         func liftParameter(param: Parameter) throws {
+            if let name = param.type.referencedGenericName {
+                guard let codecVar = genericCodecVariables[name] else {
+                    throw BridgeJSLinkError(
+                        message: "Generic codec for '\(name)' was not declared before lifting parameter '\(param.name)'"
+                    )
+                }
+                let valueVar = scope.variable(param.name)
+                let liftExpr =
+                    GenericJSCodegen.genericCodecLiftExpression(type: param.type, codec: codecVar)
+                    ?? "\(codecVar).lift()"
+                body.write("const \(valueVar) = \(liftExpr);")
+                parameterForwardings.append(valueVar)
+                return
+            }
             let liftingFragment = try IntrinsicJSFragment.liftParameter(type: param.type, context: context)
             let valuesToLift: [String]
             if liftingFragment.parameters.count == 0 {
@@ -2268,6 +2629,16 @@ extension BridgeJSLink {
             parameterForwardings.append(contentsOf: liftedValues)
         }
 
+        func liftParametersAndGenericTypeIds(_ parameters: [Parameter], genericParameters: [String]) throws {
+            declareGenericCodecs(genericParameters: genericParameters)
+            for param in parameters {
+                try liftParameter(param: param)
+            }
+            for genericParam in genericParameters {
+                parameterNames.append(genericTypeIdParameters[genericParam] ?? genericParam)
+            }
+        }
+
         func renderFunction(name: String?) -> [String] {
             if effects.isAsync {
                 return renderAsyncFunction(name: name)
@@ -2344,6 +2715,25 @@ extension BridgeJSLink {
                 body.write("\(callExpr).then(resolve, reject);")
                 return
             }
+            if let name = returnType.referencedGenericName {
+                guard let codecVar = genericCodecVariables[name] else {
+                    throw BridgeJSLinkError(
+                        message: "Generic codec for return type '\(name)' was not declared before the call"
+                    )
+                }
+                let resultVariable = scope.variable("ret")
+                body.write("let \(resultVariable) = \(callExpr);")
+                let lowerStmt =
+                    GenericJSCodegen.genericCodecLowerStatement(
+                        type: returnType,
+                        codec: codecVar,
+                        value: resultVariable
+                    )
+                    ?? "\(codecVar).lower(\(resultVariable));"
+                body.write(lowerStmt)
+                self.returnExpr = nil
+                return
+            }
             let loweringFragment = try IntrinsicJSFragment.lowerReturn(type: returnType, context: context)
             let returnExpr: String?
             if loweringFragment.parameters.count == 0 {
@@ -2362,7 +2752,13 @@ extension BridgeJSLink {
         }
 
         func callConstructor(jsName: String, swiftTypeName: String, fromObjectExpr: String) throws {
-            let ctorExpr = Self.propertyAccessExpr(objectExpr: fromObjectExpr, propertyName: jsName)
+            try callConstructor(
+                ctorExpr: Self.propertyAccessExpr(objectExpr: fromObjectExpr, propertyName: jsName),
+                swiftTypeName: swiftTypeName
+            )
+        }
+
+        func callConstructor(ctorExpr: String, swiftTypeName: String) throws {
             let call = "new \(ctorExpr)(\(parameterForwardings.joined(separator: ", ")))"
             let type: BridgeType = .jsObject(swiftTypeName)
             let loweringFragment = try IntrinsicJSFragment.lowerReturn(type: type, context: context)
@@ -2427,12 +2823,18 @@ extension BridgeJSLink {
         }
 
         func getImportProperty(name: String, fromObjectExpr: String, returnType: BridgeType) throws {
+            try getImportProperty(
+                accessExpr: Self.propertyAccessExpr(objectExpr: fromObjectExpr, propertyName: name),
+                returnType: returnType
+            )
+        }
+
+        func getImportProperty(accessExpr expr: String, returnType: BridgeType) throws {
             if returnType == .void {
                 throw BridgeJSLinkError(message: "Void is not supported for imported JS properties")
             }
 
             let loweringFragment = try IntrinsicJSFragment.lowerReturn(type: returnType, context: context)
-            let expr = Self.propertyAccessExpr(objectExpr: fromObjectExpr, propertyName: name)
 
             let returnExpr: String?
             if loweringFragment.parameters.count == 0 {
@@ -2470,8 +2872,7 @@ extension BridgeJSLink {
         }
 
         static func propertyAccessExpr(objectExpr: String, propertyName: String) -> String {
-            if propertyName.range(of: #"^[$A-Z_][0-9A-Z_$]*$"#, options: [.regularExpression, .caseInsensitive]) != nil
-            {
+            if ImportedJSModuleRegistry.isValidJSIdentifier(propertyName) {
                 return "\(objectExpr).\(propertyName)"
             }
             let escapedName = BridgeJSLink.escapeForJavaScriptStringLiteral(propertyName)
@@ -2521,7 +2922,7 @@ extension BridgeJSLink {
                     let namespaceEnumPaths = skeleton.enums
                         .filter { $0.enumType == .namespace }
                         .filter { !$0.staticProperties.isEmpty || !$0.staticMethods.isEmpty }
-                        .map { ($0.namespace ?? []) + [$0.name] }
+                        .map(\.tsPathComponents)
 
                     return itemNamespaces + namespaceEnumPaths
                 }
@@ -2574,27 +2975,27 @@ extension BridgeJSLink {
                 for function in skeleton.functions where function.namespace != nil {
                     let namespacePath = function.namespace!.joined(separator: ".")
                     printer.write(
-                        "globalThis.\(namespacePath).\(function.name) = exports.\(namespacePath).\(function.name);"
+                        "globalThis.\(namespacePath).\(function.resolvedJSName) = exports.\(namespacePath).\(function.resolvedJSName);"
                     )
                 }
                 for enumDef in skeleton.enums where enumDef.enumType == .namespace {
                     for function in enumDef.staticMethods {
-                        let fullNamespace = (enumDef.namespace ?? []) + [enumDef.name]
-                        let namespacePath = fullNamespace.joined(separator: ".")
+                        let namespacePath = enumDef.tsFullPath
                         printer.write(
-                            "globalThis.\(namespacePath).\(function.name) = exports.\(namespacePath).\(function.name);"
+                            "globalThis.\(namespacePath).\(function.resolvedJSName) = exports.\(namespacePath).\(function.resolvedJSName);"
                         )
                     }
                     for property in enumDef.staticProperties {
-                        let fullNamespace = (enumDef.namespace ?? []) + [enumDef.name]
-                        let namespacePath = fullNamespace.joined(separator: ".")
+                        let namespacePath = enumDef.tsFullPath
                         let exportsPath = "exports.\(namespacePath)"
 
-                        printer.write("Object.defineProperty(globalThis.\(namespacePath), '\(property.name)', {")
+                        printer.write(
+                            "Object.defineProperty(globalThis.\(namespacePath), '\(property.resolvedJSName)', {"
+                        )
                         printer.indent {
-                            printer.write("get: () => \(exportsPath).\(property.name),")
+                            printer.write("get: () => \(exportsPath).\(property.resolvedJSName),")
                             if !property.isReadonly {
-                                printer.write("set: (value) => { \(exportsPath).\(property.name) = value; }")
+                                printer.write("set: (value) => { \(exportsPath).\(property.resolvedJSName) = value; }")
                             }
                         }
                         printer.write("});")
@@ -2630,16 +3031,27 @@ extension BridgeJSLink {
             return printer.lines
         }
 
+        private enum NodeDeclaration {
+            case classType(ExportedClass)
+            case structType(ExportedStruct)
+        }
+
         private struct NamespaceContent {
+            // The declaration this node represents
+            var declaration: NodeDeclaration?
+
+            // Contents
             var functions: [ExportedFunction] = []
-            var classes: [ExportedClass] = []
             var enums: [ExportedEnum] = []
-            var structs: [ExportedStruct] = []
             var staticProperties: [ExportedProperty] = []
+
+            // Output
             var functionJsLines: [(name: String, lines: [String])] = []
             var functionDtsLines: [(name: String, lines: [String])] = []
-            var classDtsLines: [(name: String, lines: [String])] = []
+            var declarationDtsLines: [String] = []
             var enumDtsLines: [(name: String, line: String)] = []
+            var staticPropertyDtsLines: [(name: String, lines: [String])] = []
+            var structJsLines: [String] = []
             var propertyJsLines: [String] = []
         }
 
@@ -2660,6 +3072,16 @@ extension BridgeJSLink {
                 children[childName] = newChild
                 return newChild
             }
+
+            var classDeclaration: ExportedClass? {
+                if case .classType(let klass) = content.declaration { return klass }
+                return nil
+            }
+
+            var structDeclaration: ExportedStruct? {
+                if case .structType(let structDef) = content.declaration { return structDef }
+                return nil
+            }
         }
 
         private func buildExportsTree(
@@ -2675,20 +3097,20 @@ extension BridgeJSLink {
                     currentNode.content.functions.append(function)
                 }
 
-                for klass in skeleton.classes where klass.namespace != nil {
+                for klass in skeleton.classes {
                     var currentNode = rootNode
-                    for part in klass.namespace! {
+                    for part in klass.tsPathComponents {
                         currentNode = currentNode.addChild(part)
                     }
-                    currentNode.content.classes.append(klass)
+                    currentNode.content.declaration = .classType(klass)
                 }
 
-                for structDef in skeleton.structs where structDef.namespace != nil {
+                for structDef in skeleton.structs {
                     var currentNode = rootNode
-                    for part in structDef.namespace! {
+                    for part in structDef.tsPathComponents {
                         currentNode = currentNode.addChild(part)
                     }
-                    currentNode.content.structs.append(structDef)
+                    currentNode.content.declaration = .structType(structDef)
                 }
 
                 for enumDef in skeleton.enums where enumDef.namespace != nil && enumDef.enumType != .namespace {
@@ -2701,17 +3123,15 @@ extension BridgeJSLink {
 
                 for enumDef in skeleton.enums where enumDef.enumType == .namespace {
                     for property in enumDef.staticProperties {
-                        let fullNamespace = (enumDef.namespace ?? []) + [enumDef.name]
                         var currentNode = rootNode
-                        for part in fullNamespace {
+                        for part in enumDef.tsPathComponents {
                             currentNode = currentNode.addChild(part)
                         }
                         currentNode.content.staticProperties.append(property)
                     }
                     for function in enumDef.staticMethods {
-                        let fullNamespace = (enumDef.namespace ?? []) + [enumDef.name]
                         var currentNode = rootNode
-                        for part in fullNamespace {
+                        for part in enumDef.tsPathComponents {
                             currentNode = currentNode.addChild(part)
                         }
                         currentNode.content.functions.append(function)
@@ -2723,7 +3143,9 @@ extension BridgeJSLink {
         fileprivate func buildHierarchicalExportsType(
             exportedSkeletons: [ExportedSkeleton],
             renderClassEntry: (ExportedClass) -> [String],
-            renderFunctionSignature: (ExportedFunction) -> String
+            renderStructEntry: (ExportedStruct) -> [String],
+            renderFunctionEntry: (ExportedFunction) -> [String],
+            renderPropertyEntry: (ExportedProperty) -> [String]
         ) -> [String] {
             let printer = CodeFragmentPrinter()
             let rootNode = NamespaceNode(name: "")
@@ -2734,7 +3156,9 @@ extension BridgeJSLink {
                 populateTypeScriptExportLines(
                     node: node,
                     renderClassEntry: renderClassEntry,
-                    renderFunctionSignature: renderFunctionSignature
+                    renderStructEntry: renderStructEntry,
+                    renderFunctionEntry: renderFunctionEntry,
+                    renderPropertyEntry: renderPropertyEntry
                 )
             }
 
@@ -2746,16 +3170,25 @@ extension BridgeJSLink {
         private func populateTypeScriptExportLines(
             node: NamespaceNode,
             renderClassEntry: (ExportedClass) -> [String],
-            renderFunctionSignature: (ExportedFunction) -> String
+            renderStructEntry: (ExportedStruct) -> [String],
+            renderFunctionEntry: (ExportedFunction) -> [String],
+            renderPropertyEntry: (ExportedProperty) -> [String]
         ) {
             for function in node.content.functions {
-                let signature = renderFunctionSignature(function)
-                node.content.functionDtsLines.append((function.name, [signature]))
+                node.content.functionDtsLines.append((function.resolvedJSName, renderFunctionEntry(function)))
+            }
+
+            switch node.content.declaration {
+            case .classType(let klass):
+                node.content.declarationDtsLines = renderClassEntry(klass)
+            case .structType(let structDef):
+                node.content.declarationDtsLines = renderStructEntry(structDef)
+            case nil:
+                break
             }
 
-            for klass in node.content.classes {
-                let entry = renderClassEntry(klass)
-                node.content.classDtsLines.append((klass.name, entry))
+            for property in node.content.staticProperties {
+                node.content.staticPropertyDtsLines.append((property.resolvedJSName, renderPropertyEntry(property)))
             }
 
             for enumDef in node.content.enums {
@@ -2766,7 +3199,9 @@ extension BridgeJSLink {
                 populateTypeScriptExportLines(
                     node: childNode,
                     renderClassEntry: renderClassEntry,
-                    renderFunctionSignature: renderFunctionSignature
+                    renderStructEntry: renderStructEntry,
+                    renderFunctionEntry: renderFunctionEntry,
+                    renderPropertyEntry: renderPropertyEntry
                 )
             }
         }
@@ -2774,36 +3209,52 @@ extension BridgeJSLink {
         fileprivate func buildHierarchicalExportsObject(
             exportedSkeletons: [ExportedSkeleton],
             intrinsicRegistry: JSIntrinsicRegistry,
-            renderFunctionImpl: (ExportedFunction) throws -> [String]
+            renderFunctionImpl: (ExportedFunction) throws -> [String],
+            renderStructImpl: (ExportedStruct) throws -> [String]
         ) throws -> [String] {
             let printer = CodeFragmentPrinter()
             let rootNode = NamespaceNode(name: "")
 
             buildExportsTree(rootNode: rootNode, exportedSkeletons: exportedSkeletons)
 
-            try populateJavaScriptExportLines(node: rootNode, renderFunctionImpl: renderFunctionImpl)
+            try populateJavaScriptExportLines(
+                node: rootNode,
+                renderFunctionImpl: renderFunctionImpl,
+                renderStructImpl: renderStructImpl
+            )
 
             try populatePropertyImplementations(
                 node: rootNode,
                 intrinsicRegistry: intrinsicRegistry
             )
 
-            printExportsObjectHierarchy(node: rootNode, printer: printer, currentPath: [])
+            printExportsObjectHierarchy(node: rootNode, printer: printer)
 
             return printer.lines
         }
 
         private func populateJavaScriptExportLines(
             node: NamespaceNode,
-            renderFunctionImpl: (ExportedFunction) throws -> [String]
+            renderFunctionImpl: (ExportedFunction) throws -> [String],
+            renderStructImpl: (ExportedStruct) throws -> [String]
         ) throws {
             for function in node.content.functions {
                 let impl = try renderFunctionImpl(function)
-                node.content.functionJsLines.append((function.name, impl))
+                node.content.functionJsLines.append((function.resolvedJSName, impl))
+            }
+
+            switch node.content.declaration {
+            case .structType(let structDef):
+                node.content.structJsLines = try renderStructImpl(structDef)
+            case .classType, nil: break
             }
 
             for (_, childNode) in node.children {
-                try populateJavaScriptExportLines(node: childNode, renderFunctionImpl: renderFunctionImpl)
+                try populateJavaScriptExportLines(
+                    node: childNode,
+                    renderFunctionImpl: renderFunctionImpl,
+                    renderStructImpl: renderStructImpl
+                )
             }
         }
 
@@ -2823,7 +3274,7 @@ extension BridgeJSLink {
                 )
 
                 let getterPrinter = CodeFragmentPrinter()
-                getterPrinter.write("get \(property.name)() {")
+                getterPrinter.write("get \(property.resolvedJSName)() {")
                 getterPrinter.indent {
                     getterPrinter.write(contentsOf: getterThunkBuilder.body)
                     getterPrinter.write(lines: getterThunkBuilder.checkExceptionLines())
@@ -2850,7 +3301,7 @@ extension BridgeJSLink {
                     )
 
                     let setterPrinter = CodeFragmentPrinter()
-                    setterPrinter.write("set \(property.name)(value) {")
+                    setterPrinter.write("set \(property.resolvedJSName)(value) {")
                     setterPrinter.indent {
                         setterPrinter.write(contentsOf: setterThunkBuilder.body)
                         setterPrinter.write(lines: setterThunkBuilder.checkExceptionLines())
@@ -2873,9 +3324,21 @@ extension BridgeJSLink {
         }
 
         private func hasExportContent(node: NamespaceNode) -> Bool {
-            if !node.content.classDtsLines.isEmpty || !node.content.enumDtsLines.isEmpty
-                || !node.content.functionDtsLines.isEmpty || !node.content.staticProperties.isEmpty
-            {
+            let content = node.content
+            switch content.declaration {
+            case .classType:
+                return true
+            case .structType(let structDef):
+                if structDef.constructor != nil
+                    || structDef.properties.contains(where: \.isStatic)
+                    || structDef.methods.contains(where: \.effects.isStatic)
+                {
+                    return true
+                }
+            case nil:
+                break
+            }
+            if !content.enums.isEmpty || !content.functions.isEmpty || !content.staticProperties.isEmpty {
                 return true
             }
             return node.children.values.contains(where: { hasExportContent(node: $0) })
@@ -2886,17 +3349,14 @@ extension BridgeJSLink {
                 guard hasExportContent(node: childNode) else { continue }
                 printer.write("\(childName): {")
                 printer.indent {
-                    for (_, lines) in childNode.content.classDtsLines.sorted(by: { $0.name < $1.name }) {
-                        printer.write(lines: lines)
-                    }
+                    printer.write(lines: childNode.content.declarationDtsLines)
 
                     for (_, line) in childNode.content.enumDtsLines.sorted(by: { $0.name < $1.name }) {
                         printer.write(line)
                     }
 
-                    for property in childNode.content.staticProperties.sorted(by: { $0.name < $1.name }) {
-                        let readonly = property.isReadonly ? "readonly " : ""
-                        printer.write("\(readonly)\(property.name): \(property.type.tsType);")
+                    for (_, lines) in childNode.content.staticPropertyDtsLines.sorted(by: { $0.name < $1.name }) {
+                        printer.write(lines: lines)
                     }
 
                     for (_, lines) in childNode.content.functionDtsLines.sorted(by: { $0.name < $1.name }) {
@@ -2913,36 +3373,51 @@ extension BridgeJSLink {
 
         private func printExportsObjectHierarchy(
             node: NamespaceNode,
-            printer: CodeFragmentPrinter,
-            currentPath: [String] = []
+            printer: CodeFragmentPrinter
         ) {
             for (childName, childNode) in node.children.sorted(by: { $0.key < $1.key }) {
-                let newPath = currentPath + [childName]
-                printer.write("\(childName): {")
-                printer.indent {
-                    for klass in childNode.content.classes.sorted(by: { $0.name < $1.name }) {
-                        printer.write("\(klass.name),")
+                guard hasExportContent(node: childNode) else { continue }
+                if case .classType = childNode.content.declaration {
+                    let body = CodeFragmentPrinter()
+                    writeExportsObjectBody(node: childNode, into: body)
+                    if body.lines.isEmpty {
+                        printer.write("\(childName),")
+                    } else {
+                        printer.write("\(childName): Object.assign(\(childName), {")
+                        printer.indent {
+                            printer.write(lines: body.lines)
+                        }
+                        printer.write("}),")
                     }
-
-                    for enumDef in childNode.content.enums.sorted(by: { $0.name < $1.name }) {
-                        printer.write("\(enumDef.name): \(enumDef.valuesName),")
+                } else {
+                    printer.write("\(childName): {")
+                    printer.indent {
+                        writeExportsObjectBody(node: childNode, into: printer)
                     }
+                    printer.write("},")
+                }
+            }
+        }
 
-                    // Print function and property implementations
-                    printer.write(lines: childNode.content.propertyJsLines)
-                    for (name, lines) in childNode.content.functionJsLines.sorted(by: { $0.name < $1.name }) {
-                        var modifiedLines = lines
-                        if !modifiedLines.isEmpty {
-                            modifiedLines[0] = "\(name): " + modifiedLines[0]
-                            modifiedLines[modifiedLines.count - 1] += ","
-                        }
-                        printer.write(lines: modifiedLines)
-                    }
+        private func writeExportsObjectBody(node: NamespaceNode, into printer: CodeFragmentPrinter) {
+            printer.write(lines: node.content.structJsLines)
+
+            for enumDef in node.content.enums.sorted(by: { $0.name < $1.name }) {
+                printer.write("\(enumDef.name): \(enumDef.valuesName),")
+            }
 
-                    printExportsObjectHierarchy(node: childNode, printer: printer, currentPath: newPath)
+            // Print function and property implementations
+            printer.write(lines: node.content.propertyJsLines)
+            for (name, lines) in node.content.functionJsLines.sorted(by: { $0.name < $1.name }) {
+                var modifiedLines = lines
+                if !modifiedLines.isEmpty {
+                    modifiedLines[0] = "\(name): " + modifiedLines[0]
+                    modifiedLines[modifiedLines.count - 1] += ","
                 }
-                printer.write("},")
+                printer.write(lines: modifiedLines)
             }
+
+            printExportsObjectHierarchy(node: node, printer: printer)
         }
 
         /// Generates TypeScript declarations for all namespaces
@@ -2962,7 +3437,10 @@ extension BridgeJSLink {
         /// - Returns: Array of TypeScript declaration lines defining the global namespace structure
         func namespaceDeclarations(
             exportedSkeletons: [ExportedSkeleton],
-            renderTSSignatureCallback: @escaping ([Parameter], BridgeType, Effects) -> String
+            renderTSSignatureCallback: @escaping ([Parameter], BridgeType, Effects) -> String,
+            renderDocCallback: @escaping (String?, [Parameter]) -> [String],
+            renderStructInterface: @escaping (ExportedStruct) -> [String],
+            renderClassDeclaration: @escaping (ExportedClass) -> [String]
         ) -> [String] {
             let printer = CodeFragmentPrinter()
 
@@ -2980,11 +3458,14 @@ extension BridgeJSLink {
                     printer.indent()
                     generateNamespaceDeclarationsForNode(
                         node: globalRootNode,
-                        depth: 1,
+                        inNamespaceScope: false,
                         printer: printer,
                         exposeToGlobal: true,
                         exportedSkeletons: exportedSkeletons,
-                        renderTSSignatureCallback: renderTSSignatureCallback
+                        renderTSSignatureCallback: renderTSSignatureCallback,
+                        renderDocCallback: renderDocCallback,
+                        renderStructInterface: renderStructInterface,
+                        renderClassDeclaration: renderClassDeclaration
                     )
                     printer.unindent()
                     printer.write("}")
@@ -2999,11 +3480,14 @@ extension BridgeJSLink {
                 if !localRootNode.children.isEmpty {
                     generateNamespaceDeclarationsForNode(
                         node: localRootNode,
-                        depth: 1,
+                        inNamespaceScope: false,
                         printer: printer,
                         exposeToGlobal: false,
                         exportedSkeletons: exportedSkeletons,
-                        renderTSSignatureCallback: renderTSSignatureCallback
+                        renderTSSignatureCallback: renderTSSignatureCallback,
+                        renderDocCallback: renderDocCallback,
+                        renderStructInterface: renderStructInterface,
+                        renderClassDeclaration: renderClassDeclaration
                     )
                 }
             }
@@ -3013,21 +3497,27 @@ extension BridgeJSLink {
 
         private func generateNamespaceDeclarationsForNode(
             node: NamespaceNode,
-            depth: Int,
+            inNamespaceScope: Bool,
             printer: CodeFragmentPrinter,
             exposeToGlobal: Bool,
             exportedSkeletons: [ExportedSkeleton],
-            renderTSSignatureCallback: @escaping ([Parameter], BridgeType, Effects) -> String
+            renderTSSignatureCallback: @escaping ([Parameter], BridgeType, Effects) -> String,
+            renderDocCallback: @escaping (String?, [Parameter]) -> [String],
+            renderStructInterface: @escaping (ExportedStruct) -> [String],
+            renderClassDeclaration: @escaping (ExportedClass) -> [String]
         ) {
             func hasContent(node: NamespaceNode) -> Bool {
                 // Enums and structs are always included
-                if !node.content.enums.isEmpty || !node.content.structs.isEmpty {
+                if !node.content.enums.isEmpty
+                    || node.children.values.contains(where: { $0.structDeclaration != nil })
+                {
                     return true
                 }
 
                 // When exposeToGlobal is true, classes, functions, and properties are included
                 if exposeToGlobal {
-                    if !node.content.classes.isEmpty || !node.content.functions.isEmpty
+                    if node.children.values.contains(where: { $0.classDeclaration != nil })
+                        || !node.content.functions.isEmpty
                         || !node.content.staticProperties.isEmpty
                     {
                         return true
@@ -3044,10 +3534,19 @@ extension BridgeJSLink {
                 return false
             }
 
-            func generateNamespaceDeclarations(node: NamespaceNode, depth: Int) {
+            func generateNamespaceDeclarations(node: NamespaceNode) {
                 let sortedChildren = node.children.sorted { $0.key < $1.key }
 
                 for (childName, childNode) in sortedChildren {
+                    if inNamespaceScope {
+                        if exposeToGlobal, let klass = childNode.classDeclaration {
+                            printer.write(lines: renderClassDeclaration(klass))
+                        }
+                        if let structDef = childNode.structDeclaration {
+                            printer.write(lines: renderStructInterface(structDef))
+                        }
+                    }
+
                     // Skip empty namespaces
                     guard hasContent(node: childNode) else {
                         continue
@@ -3057,46 +3556,10 @@ extension BridgeJSLink {
                     printer.write("\(exportKeyword)namespace \(childName) {")
                     printer.indent()
 
-                    // Only include classes when exposeToGlobal is true
-                    if exposeToGlobal {
-                        let sortedClasses = childNode.content.classes.sorted { $0.name < $1.name }
-                        for klass in sortedClasses {
-                            printer.write("class \(klass.name) {")
-                            printer.indent {
-                                if let constructor = klass.constructor {
-                                    let paramSignatures = constructor.parameters.map { param in
-                                        let optional = param.hasDefault ? "?" : ""
-                                        return "\(param.name)\(optional): \(param.type.tsType)"
-                                    }
-                                    let constructorSignature =
-                                        "constructor(\(paramSignatures.joined(separator: ", ")));"
-                                    printer.write(constructorSignature)
-                                }
-
-                                let sortedMethods = klass.methods.sorted { $0.name < $1.name }
-                                for method in sortedMethods {
-                                    let methodSignature =
-                                        "\(method.name)\(renderTSSignatureCallback(method.parameters, method.returnType, method.effects));"
-                                    printer.write(methodSignature)
-                                }
-
-                                let sortedProperties = klass.properties.filter { !$0.isStatic }.sorted {
-                                    $0.name < $1.name
-                                }
-                                for property in sortedProperties {
-                                    let readonly = property.isReadonly ? "readonly " : ""
-                                    printer.write("\(readonly)\(property.name): \(property.type.tsType);")
-                                }
-
-                                printer.write("release(): void;")
-                            }
-                            printer.write("}")
-                        }
-                    }
-
                     // Generate enum definitions within declare global namespace
                     let sortedEnums = childNode.content.enums.sorted { $0.name < $1.name }
                     for enumDefinition in sortedEnums {
+                        printer.write(lines: renderDocCallback(enumDefinition.documentation, []))
                         let style: EnumEmitStyle = enumDefinition.emitStyle
                         let enumValuesName = enumDefinition.valuesName
                         switch enumDefinition.enumType {
@@ -3201,45 +3664,37 @@ extension BridgeJSLink {
                         }
                     }
 
-                    // Generate struct interface definitions
-                    let sortedStructs = childNode.content.structs.sorted { $0.name < $1.name }
-                    for structDef in sortedStructs {
-                        let instanceProps = structDef.properties.filter { !$0.isStatic }
-                        printer.write("export interface \(structDef.name) {")
-                        printer.indent {
-                            for property in instanceProps {
-                                let tsType = BridgeJSLink.resolveTypeScriptType(
-                                    property.type,
-                                    exportedSkeletons: exportedSkeletons
-                                )
-                                printer.write("\(property.name): \(tsType);")
-                            }
-                        }
-                        printer.write("}")
-                    }
-
                     // Only include functions and properties when exposeToGlobal is true
                     if exposeToGlobal {
-                        let sortedFunctions = childNode.content.functions.sorted { $0.name < $1.name }
+                        let sortedFunctions = childNode.content.functions.sorted {
+                            $0.resolvedJSName < $1.resolvedJSName
+                        }
                         for function in sortedFunctions {
                             let signature =
-                                "function \(function.name)\(renderTSSignatureCallback(function.parameters, function.returnType, function.effects));"
+                                "function \(function.resolvedJSName)\(renderTSSignatureCallback(function.parameters, function.returnType, function.effects));"
+                            printer.write(lines: renderDocCallback(function.documentation, function.parameters))
                             printer.write(signature)
                         }
-                        let sortedProperties = childNode.content.staticProperties.sorted { $0.name < $1.name }
+                        let sortedProperties = childNode.content.staticProperties.sorted {
+                            $0.resolvedJSName < $1.resolvedJSName
+                        }
                         for property in sortedProperties {
                             let readonly = property.isReadonly ? "var " : "let "
-                            printer.write("\(readonly)\(property.name): \(property.type.tsType);")
+                            printer.write(lines: renderDocCallback(property.documentation, []))
+                            printer.write("\(readonly)\(property.resolvedJSName): \(property.type.tsType);")
                         }
                     }
 
                     generateNamespaceDeclarationsForNode(
                         node: childNode,
-                        depth: depth + 1,
+                        inNamespaceScope: true,
                         printer: printer,
                         exposeToGlobal: exposeToGlobal,
                         exportedSkeletons: exportedSkeletons,
-                        renderTSSignatureCallback: renderTSSignatureCallback
+                        renderTSSignatureCallback: renderTSSignatureCallback,
+                        renderDocCallback: renderDocCallback,
+                        renderStructInterface: renderStructInterface,
+                        renderClassDeclaration: renderClassDeclaration
                     )
 
                     printer.unindent()
@@ -3247,7 +3702,7 @@ extension BridgeJSLink {
                 }
             }
 
-            generateNamespaceDeclarations(node: node, depth: depth)
+            generateNamespaceDeclarations(node: node)
         }
     }
 
@@ -3260,18 +3715,25 @@ extension BridgeJSLink {
             returnType: function.returnType,
             intrinsicRegistry: intrinsicRegistry
         )
-        for param in function.parameters {
-            try thunkBuilder.liftParameter(param: param)
-        }
-        let jsName = function.jsName ?? function.name
-        let importRootExpr = function.from == .global ? "globalThis" : "imports"
+        let genericParameters = function.genericParameterNames
+        try thunkBuilder.liftParametersAndGenericTypeIds(
+            function.parameters,
+            genericParameters: genericParameters
+        )
+        let jsName = function.resolvedJSName
+        let calleeExpr = try importedModuleRegistry.memberExpression(
+            swiftModuleName: importObjectBuilder.moduleName,
+            from: function.from,
+            memberName: jsName
+        )
 
-        try thunkBuilder.call(name: jsName, fromObjectExpr: importRootExpr)
+        try thunkBuilder.call(calleeExpr: calleeExpr)
         let funcLines = thunkBuilder.renderFunction(name: function.abiName(context: nil))
         if function.from == nil {
+            let genericClause = renderGenericClause(genericParameters)
             importObjectBuilder.appendDts(
                 [
-                    "\(renderTSPropertyName(jsName))\(renderTSSignature(parameters: function.parameters, returnType: function.returnType, effects: function.effects));"
+                    "\(renderTSPropertyName(jsName))\(genericClause)\(renderTSSignature(parameters: function.parameters, returnType: function.returnType, effects: function.effects));"
                 ]
             )
         }
@@ -3287,17 +3749,21 @@ extension BridgeJSLink {
             returnType: getter.type,
             intrinsicRegistry: intrinsicRegistry
         )
-        let jsName = getter.jsName ?? getter.name
-        let importRootExpr = getter.from == .global ? "globalThis" : "imports"
+        let jsName = getter.resolvedJSName
+        let accessExpr = try importedModuleRegistry.memberExpression(
+            swiftModuleName: importObjectBuilder.moduleName,
+            from: getter.from,
+            memberName: jsName
+        )
         try thunkBuilder.getImportProperty(
-            name: jsName,
-            fromObjectExpr: importRootExpr,
+            accessExpr: accessExpr,
             returnType: getter.type
         )
         let abiName = getter.abiName(context: nil)
         let funcLines = thunkBuilder.renderFunction(name: abiName)
         if getter.from == nil {
-            importObjectBuilder.appendDts(["readonly \(renderTSPropertyName(jsName)): \(getter.type.tsType);"])
+            importObjectBuilder.appendDts(["readonly \(renderTSPropertyName(jsName)): \(getter.type.tsType);"]
+            )
         }
         importObjectBuilder.assignToImportObject(name: abiName, function: funcLines)
     }
@@ -3319,7 +3785,7 @@ extension BridgeJSLink {
                 getter: getter,
                 abiName: getterAbiName,
                 emitCall: { thunkBuilder in
-                    return try thunkBuilder.callPropertyGetter(name: getter.jsName ?? getter.name)
+                    return try thunkBuilder.callPropertyGetter(name: getter.resolvedJSName)
                 }
             )
             importObjectBuilder.assignToImportObject(name: getterAbiName, function: js)
@@ -3335,7 +3801,7 @@ extension BridgeJSLink {
                     try thunkBuilder.liftParameter(
                         param: Parameter(label: nil, name: "newValue", type: setter.type)
                     )
-                    thunkBuilder.callPropertySetter(name: setter.jsName ?? setter.name)
+                    thunkBuilder.callPropertySetter(name: setter.resolvedJSName)
                 }
             )
             importObjectBuilder.assignToImportObject(name: setterAbiName, function: js)
@@ -3343,7 +3809,11 @@ extension BridgeJSLink {
         }
         for method in type.staticMethods {
             let abiName = method.abiName(context: type, operation: "static")
-            let (js, dts) = try renderImportedStaticMethod(context: type, method: method)
+            let (js, dts) = try renderImportedStaticMethod(
+                swiftModuleName: importObjectBuilder.moduleName,
+                context: type,
+                method: method
+            )
             importObjectBuilder.assignToImportObject(name: abiName, function: js)
             importObjectBuilder.appendDts(dts)
         }
@@ -3353,14 +3823,16 @@ extension BridgeJSLink {
             dtsPrinter.indent {
                 if let constructor = type.constructor {
                     let returnType = BridgeType.jsObject(type.name)
+                    let genericClause = renderGenericClause(constructor.genericParameterNames)
                     dtsPrinter.write(
-                        "new\(renderTSSignature(parameters: constructor.parameters, returnType: returnType, effects: Effects(isAsync: false, isThrows: false)));"
+                        "new\(genericClause)\(renderTSSignature(parameters: constructor.parameters, returnType: returnType, effects: Effects(isAsync: false, isThrows: false)));"
                     )
                 }
                 for method in type.staticMethods {
-                    let methodName = method.jsName ?? method.name
+                    let methodName = method.resolvedJSName
+                    let genericClause = renderGenericClause(method.genericParameterNames)
                     let signature =
-                        "\(renderTSPropertyName(methodName))\(renderTSSignature(parameters: method.parameters, returnType: method.returnType, effects: method.effects));"
+                        "\(renderTSPropertyName(methodName))\(genericClause)\(renderTSSignature(parameters: method.parameters, returnType: method.returnType, effects: method.effects));"
                     dtsPrinter.write(signature)
                 }
             }
@@ -3384,14 +3856,18 @@ extension BridgeJSLink {
             returnType: BridgeType.jsObject(type.name),
             intrinsicRegistry: intrinsicRegistry
         )
-        for param in constructor.parameters {
-            try thunkBuilder.liftParameter(param: param)
-        }
-        let importRootExpr = type.from == .global ? "globalThis" : "imports"
+        try thunkBuilder.liftParametersAndGenericTypeIds(
+            constructor.parameters,
+            genericParameters: constructor.genericParameterNames
+        )
+        let ctorExpr = try importedModuleRegistry.memberExpression(
+            swiftModuleName: importObjectBuilder.moduleName,
+            from: type.from,
+            memberName: type.resolvedJSName
+        )
         try thunkBuilder.callConstructor(
-            jsName: type.jsName ?? type.name,
-            swiftTypeName: type.name,
-            fromObjectExpr: importRootExpr
+            ctorExpr: ctorExpr,
+            swiftTypeName: type.name
         )
         let abiName = constructor.abiName(context: type)
         let funcLines = thunkBuilder.renderFunction(name: abiName)
@@ -3431,6 +3907,7 @@ extension BridgeJSLink {
     }
 
     func renderImportedStaticMethod(
+        swiftModuleName: String,
         context: ImportedTypeSkeleton,
         method: ImportedFunctionSkeleton
     ) throws -> (js: [String], dts: [String]) {
@@ -3439,16 +3916,17 @@ extension BridgeJSLink {
             returnType: method.returnType,
             intrinsicRegistry: intrinsicRegistry
         )
-        for param in method.parameters {
-            try thunkBuilder.liftParameter(param: param)
-        }
-        let importRootExpr = context.from == .global ? "globalThis" : "imports"
-        let constructorExpr = ImportedThunkBuilder.propertyAccessExpr(
-            objectExpr: importRootExpr,
-            propertyName: context.jsName ?? context.name
+        try thunkBuilder.liftParametersAndGenericTypeIds(
+            method.parameters,
+            genericParameters: method.genericParameterNames
+        )
+        let constructorExpr = try importedModuleRegistry.memberExpression(
+            swiftModuleName: swiftModuleName,
+            from: context.from,
+            memberName: context.resolvedJSName
         )
 
-        try thunkBuilder.callStaticMethod(on: constructorExpr, name: method.jsName ?? method.name)
+        try thunkBuilder.callStaticMethod(on: constructorExpr, name: method.resolvedJSName)
         let funcLines = thunkBuilder.renderFunction(name: method.abiName(context: context, operation: "static"))
         return (funcLines, [])
     }
@@ -3463,11 +3941,13 @@ extension BridgeJSLink {
             intrinsicRegistry: intrinsicRegistry
         )
         thunkBuilder.liftSelf()
-        for param in method.parameters {
-            try thunkBuilder.liftParameter(param: param)
-        }
+        let genericParameters = method.genericParameterNames
+        try thunkBuilder.liftParametersAndGenericTypeIds(
+            method.parameters,
+            genericParameters: genericParameters
+        )
 
-        try thunkBuilder.callMethod(name: method.jsName ?? method.name)
+        try thunkBuilder.callMethod(name: method.resolvedJSName)
         let funcLines = thunkBuilder.renderFunction(name: method.abiName(context: context))
         return (funcLines, [])
     }
@@ -3598,24 +4078,6 @@ enum DefaultValueUtils {
             .replacingOccurrences(of: "\"", with: "\\\"")
     }
 
-    /// Generates JSDoc comment lines for parameters with default values
-    static func formatJSDoc(for parameters: [Parameter]) -> [String] {
-        let paramsWithDefaults = parameters.filter { $0.hasDefault }
-        guard !paramsWithDefaults.isEmpty else {
-            return []
-        }
-
-        var jsDocLines: [String] = ["/**"]
-        for param in paramsWithDefaults {
-            if let defaultValue = param.defaultValue {
-                let defaultDoc = format(defaultValue, as: .typescript)
-                jsDocLines.append(" * @param \(param.name) - Optional parameter (default: \(defaultDoc))")
-            }
-        }
-        jsDocLines.append(" */")
-        return jsDocLines
-    }
-
     /// Generates a JavaScript parameter list with default values
     static func formatParameterList(_ parameters: [Parameter]) -> String {
         return parameters.map { param in
@@ -3628,10 +4090,159 @@ enum DefaultValueUtils {
     }
 }
 
+extension BridgeJSLink {
+    /// Renders the JSDoc block for an exported declaration, mapping the Swift DocC
+    /// comment to `@param`/`@returns`/`@throws` and merging any default-value notes.
+    /// Returns an empty array when there is nothing to document.
+    fileprivate func renderJSDoc(documentation: String?, parameters: [Parameter]) -> [String] {
+        let parsed = documentation.map(DocCComment.init(parsing:)) ?? DocCComment()
+
+        var tagLines: [String] = []
+        for parameter in parameters {
+            let docText = parsed.parameter(named: parameter.name)
+            let defaultValue = parameter.defaultValue.map { DefaultValueUtils.format($0, as: .typescript) }
+            switch (docText, defaultValue) {
+            case let (.some(text), .some(value)):
+                tagLines.append("@param \(parameter.name) \(text) (default: \(value))")
+            case let (.some(text), .none):
+                tagLines.append("@param \(parameter.name) \(text)")
+            case let (.none, .some(value)):
+                tagLines.append("@param \(parameter.name) - Optional parameter (default: \(value))")
+            case (.none, .none):
+                continue
+            }
+        }
+        if let returns = parsed.returns {
+            tagLines.append(returns.isEmpty ? "@returns" : "@returns \(returns)")
+        }
+        if let thrown = parsed.throws {
+            tagLines.append(thrown.isEmpty ? "@throws" : "@throws \(thrown)")
+        }
+
+        guard !parsed.description.isEmpty || !tagLines.isEmpty else { return [] }
+
+        // `*/` in the doc text would prematurely close the JSDoc block comment.
+        func escape(_ text: String) -> String { text.replacingOccurrences(of: "*/", with: "*\\/") }
+
+        var lines: [String] = ["/**"]
+        lines.append(contentsOf: parsed.description.map { $0.isEmpty ? " *" : " * \(escape($0))" })
+        lines.append(contentsOf: tagLines.map { " * \(escape($0))" })
+        lines.append(" */")
+        return lines
+    }
+}
+
+/// A parsed Swift DocC comment: a description block plus its `- Parameters:`,
+/// `- Returns:`, and `- Throws:` field items.
+private struct DocCComment {
+    var description: [String] = []
+    var parameters: [(name: String, text: String)] = []
+    var returns: String?
+    var `throws`: String?
+
+    init() {}
+
+    init(parsing text: String) {
+        enum Target { case description, parameter(Int), returns, `throws`, none }
+        var target: Target = .description
+
+        func append(continuation line: String) {
+            let trimmed = line.trimmingCharacters(in: .whitespaces)
+            switch target {
+            case .description: description.append(line)
+            case .parameter(let index) where !trimmed.isEmpty: parameters[index].text += " \(trimmed)"
+            case .returns where !trimmed.isEmpty: returns = [returns, trimmed].compactMap { $0 }.joined(separator: " ")
+            case .throws where !trimmed.isEmpty:
+                `throws` = [`throws`, trimmed].compactMap { $0 }.joined(separator: " ")
+            default: return
+            }
+        }
+
+        func addParameter(_ name: String, _ desc: String) {
+            parameters.append((name: name, text: desc))
+            target = .parameter(parameters.count - 1)
+        }
+
+        func isInParameterList(_ target: Target) -> Bool {
+            switch target {
+            case .none, .parameter: return true
+            default: return false
+            }
+        }
+
+        for rawLine in text.split(separator: "\n", omittingEmptySubsequences: false).map(String.init) {
+            let trimmed = rawLine.trimmingCharacters(in: .whitespaces)
+            if trimmed == "- Parameters:" {
+                target = .none
+            } else if let (name, desc) = Self.listItem(trimmed, keyword: "Parameter") {
+                addParameter(name, desc)
+            } else if let desc = Self.field(trimmed, keyword: "Returns") {
+                returns = desc
+                target = .returns
+            } else if let desc = Self.field(trimmed, keyword: "Throws") {
+                `throws` = desc
+                target = .throws
+            } else if isInParameterList(target), let (name, desc) = Self.bareItem(trimmed) {
+                addParameter(name, desc)
+            } else {
+                append(continuation: rawLine)
+            }
+        }
+
+        while description.first?.trimmingCharacters(in: .whitespaces).isEmpty == true { description.removeFirst() }
+        while description.last?.trimmingCharacters(in: .whitespaces).isEmpty == true { description.removeLast() }
+    }
+
+    func parameter(named name: String) -> String? {
+        parameters.first { $0.name == name }?.text
+    }
+
+    /// Matches `- Keyword name: description`.
+    private static func listItem(_ line: String, keyword: String) -> (String, String)? {
+        guard line.hasPrefix("- \(keyword) ") else { return nil }
+        return splitNameAndDescription(String(line.dropFirst("- \(keyword) ".count)))
+    }
+
+    /// Matches `- name: description` (a sub-item of a `- Parameters:` block).
+    private static func bareItem(_ line: String) -> (String, String)? {
+        guard line.hasPrefix("- ") else { return nil }
+        guard let (name, desc) = splitNameAndDescription(String(line.dropFirst(2))), !name.contains(" ") else {
+            return nil
+        }
+        return (name, desc)
+    }
+
+    /// Matches `- Keyword: description`, returning the (possibly empty) description.
+    private static func field(_ line: String, keyword: String) -> String? {
+        if line.hasPrefix("- \(keyword): ") {
+            return String(line.dropFirst("- \(keyword): ".count)).trimmingCharacters(in: .whitespaces)
+        }
+        return line == "- \(keyword):" ? "" : nil
+    }
+
+    private static func splitNameAndDescription(_ rest: String) -> (String, String)? {
+        guard let colon = rest.firstIndex(of: ":") else { return nil }
+        let name = String(rest[..<colon]).trimmingCharacters(in: .whitespaces)
+        let desc = String(rest[rest.index(after: colon)...]).trimmingCharacters(in: .whitespaces)
+        return name.isEmpty ? nil : (name, desc)
+    }
+}
+
 struct BridgeJSLinkError: Error {
     let message: String
 }
 
+extension ClosureSignature {
+    fileprivate func renderTSFunctionType(renderType: (BridgeType) -> String) -> String {
+        let renderedParameters = parameters.enumerated().map { index, parameter in
+            "arg\(index): \(renderType(parameter))"
+        }.joined(separator: ", ")
+        let renderedReturnType = renderType(returnType)
+        let returnTypeWithEffect = isAsync ? "Promise<\(renderedReturnType)>" : renderedReturnType
+        return "(\(renderedParameters)) => \(returnTypeWithEffect)"
+    }
+}
+
 extension BridgeType {
     var tsType: String {
         switch self {
@@ -3673,10 +4284,7 @@ extension BridgeType {
         case .swiftProtocol(let name):
             return name
         case .closure(let signature, _):
-            let paramTypes = signature.parameters.enumerated().map { index, param in
-                "arg\(index): \(param.tsType)"
-            }.joined(separator: ", ")
-            return "(\(paramTypes)) => \(signature.returnType.tsType)"
+            return signature.renderTSFunctionType { $0.tsType }
         case .array(let elementType):
             let inner = elementType.tsType
             if inner.contains("|") || inner.contains("=>") {
@@ -3685,6 +4293,10 @@ extension BridgeType {
             return "\(inner)[]"
         case .dictionary(let valueType):
             return "Record<string, \(valueType.tsType)>"
+        case .alias(_, let underlying):
+            return underlying.tsType
+        case .generic(let name):
+            return name
         }
     }
 
@@ -3704,7 +4316,10 @@ extension BridgeType {
 extension WasmCoreType {
     fileprivate var placeholderValue: String {
         switch self {
-        case .i32, .i64, .f32, .f64, .pointer: return "0"
+        // A Wasm `i64` return is a JavaScript `BigInt`, so the error-path placeholder
+        // must be a BigInt literal rather than a plain number.
+        case .i64: return "0n"
+        case .i32, .f32, .f64, .pointer: return "0"
         }
     }
 }
diff --git a/Plugins/BridgeJS/Sources/BridgeJSLink/ImportedJSModuleRegistry.swift b/Plugins/BridgeJS/Sources/BridgeJSLink/ImportedJSModuleRegistry.swift
new file mode 100644
index 000000000..daf220d7f
--- /dev/null
+++ b/Plugins/BridgeJS/Sources/BridgeJSLink/ImportedJSModuleRegistry.swift
@@ -0,0 +1,238 @@
+#if canImport(BridgeJSSkeleton)
+import BridgeJSSkeleton
+#endif
+
+import Foundation
+
+final class ImportedJSModuleRegistry {
+    /// A JavaScript module that imported declarations are read from.
+    ///
+    /// A `snippet` reference is a file inside a Swift target, which packaging copies
+    /// into the generated output. A `module` reference is a bare specifier resolved by
+    /// the JavaScript host (a bundler, an import map, or Node's `node_modules` lookup),
+    /// so it has no file and nothing to copy. Because a bare specifier names the same
+    /// module no matter which Swift module mentions it — and ECMAScript caches module
+    /// instances — it is keyed by specifier alone and shared across targets.
+    enum Reference: Hashable {
+        case snippet(swiftModuleName: String, path: String)
+        case module(specifier: String)
+    }
+
+    /// A JavaScript file shipped in a Swift target that packaging must copy into the output.
+    struct SnippetFile: Hashable {
+        let swiftModuleName: String
+        let path: String
+
+        var relativeOutputPath: String {
+            "bridge-js-modules/\(swiftModuleName)\(path)"
+        }
+    }
+
+    private struct Binding {
+        let index: Int
+        /// Member names looked up on this module, sorted for stable output.
+        let members: [String]
+        /// Whether every member name is a valid JavaScript identifier, and so can be
+        /// reached with a named import instead of a namespace property lookup.
+        let usesNamedImports: Bool
+    }
+
+    private var bindings: [Reference: Binding] = [:]
+    private(set) var references: [Reference] = []
+
+    /// The snippet files packaging must copy, in deterministic order.
+    var snippetFiles: [SnippetFile] {
+        references.compactMap { reference in
+            guard case .snippet(let swiftModuleName, let path) = reference else { return nil }
+            return SnippetFile(swiftModuleName: swiftModuleName, path: path)
+        }
+    }
+
+    func configure(skeletons: [BridgeJSSkeleton]) {
+        bindings.removeAll(keepingCapacity: true)
+        references = Self.collectReferences(skeletons: skeletons)
+
+        var membersByReference: [Reference: Set<String>] = [:]
+        for skeleton in skeletons {
+            Self.forEachMemberLookup(skeleton: skeleton) { reference, memberName in
+                membersByReference[reference, default: []].insert(memberName)
+            }
+        }
+
+        for (index, reference) in references.enumerated() {
+            let members = (membersByReference[reference] ?? []).sorted()
+            // A reference with no member lookups keeps the namespace form: a named import
+            // is a hard link-time requirement, so importing a name nothing references
+            // would fail the whole module load if the module does not export it.
+            bindings[reference] = Binding(
+                index: index,
+                members: members,
+                usesNamedImports: !members.isEmpty && members.allSatisfy(Self.isValidJSIdentifier)
+            )
+        }
+    }
+
+    static func collectReferences(skeletons: [BridgeJSSkeleton]) -> [Reference] {
+        var references = Set<Reference>()
+        for skeleton in skeletons {
+            forEachOrigin(skeleton: skeleton) { reference in
+                references.insert(reference)
+            }
+        }
+        return references.sorted(by: isOrderedBefore)
+    }
+
+    static func collectSnippetFiles(skeletons: [BridgeJSSkeleton]) -> [SnippetFile] {
+        collectReferences(skeletons: skeletons).compactMap { reference in
+            guard case .snippet(let swiftModuleName, let path) = reference else { return nil }
+            return SnippetFile(swiftModuleName: swiftModuleName, path: path)
+        }
+    }
+
+    /// Visits every module origin mentioned by the skeleton, whether or not code
+    /// generation looks a member up on it.
+    ///
+    /// This is what decides which modules are imported at all, and for snippets which
+    /// files packaging copies. It stays broader than `forEachMemberLookup` so
+    /// that a module mentioned only by a wrapper-only `@JSClass` is still imported,
+    /// preserving its side effects.
+    private static func forEachOrigin(
+        skeleton: BridgeJSSkeleton,
+        _ body: (Reference) -> Void
+    ) {
+        func visit(from: JSImportFrom?) {
+            guard let reference = Self.reference(swiftModuleName: skeleton.moduleName, from: from) else { return }
+            body(reference)
+        }
+        for file in skeleton.imported?.children ?? [] {
+            for function in file.functions { visit(from: function.from) }
+            for getter in file.globalGetters { visit(from: getter.from) }
+            for type in file.types { visit(from: type.from) }
+        }
+    }
+
+    /// Visits every module member lookup that code generation will emit.
+    ///
+    /// The member name taken here must match what the corresponding emitter in
+    /// `BridgeJSLink` looks up, and must not include names it never emits: a named
+    /// import is a hard link-time requirement, so recording a member that no
+    /// generated code references would make the module fail to load whenever the
+    /// module does not happen to export that name.
+    ///
+    /// A class contributes a single binding that serves both its constructor and its
+    /// static methods, and only when it has one of those. Instance methods, getters,
+    /// and setters contribute nothing because they go through an already-constructed
+    /// instance, so a wrapper-only `@JSClass` needs no export from the module at all.
+    private static func forEachMemberLookup(
+        skeleton: BridgeJSSkeleton,
+        _ body: (Reference, String) -> Void
+    ) {
+        func visit(from: JSImportFrom?, memberName: String) {
+            guard let reference = Self.reference(swiftModuleName: skeleton.moduleName, from: from) else { return }
+            body(reference, memberName)
+        }
+        for file in skeleton.imported?.children ?? [] {
+            for function in file.functions {
+                visit(from: function.from, memberName: function.resolvedJSName)
+            }
+            for getter in file.globalGetters {
+                visit(from: getter.from, memberName: getter.resolvedJSName)
+            }
+            for type in file.types {
+                guard type.constructor != nil || !type.staticMethods.isEmpty else { continue }
+                visit(from: type.from, memberName: type.resolvedJSName)
+            }
+        }
+    }
+
+    private static func reference(swiftModuleName: String, from: JSImportFrom?) -> Reference? {
+        switch from {
+        case .snippet(let path):
+            return .snippet(swiftModuleName: swiftModuleName, path: path)
+        case .module(let specifier):
+            return .module(specifier: specifier)
+        case .global, nil:
+            return nil
+        }
+    }
+
+    private static func isOrderedBefore(_ lhs: Reference, _ rhs: Reference) -> Bool {
+        switch (lhs, rhs) {
+        case (.snippet(let lhsModule, let lhsPath), .snippet(let rhsModule, let rhsPath)):
+            return (lhsModule, lhsPath) < (rhsModule, rhsPath)
+        case (.module(let lhsSpecifier), .module(let rhsSpecifier)):
+            return lhsSpecifier < rhsSpecifier
+        case (.snippet, .module):
+            return true
+        case (.module, .snippet):
+            return false
+        }
+    }
+
+    /// Whether `name` can appear as a bare identifier in generated JavaScript.
+    static func isValidJSIdentifier(_ name: String) -> Bool {
+        name.range(of: #"^[$A-Z_][0-9A-Z_$]*$"#, options: [.regularExpression, .caseInsensitive]) != nil
+    }
+
+    /// Returns the JavaScript expression that evaluates to `memberName` of the given origin.
+    func memberExpression(
+        swiftModuleName: String,
+        from: JSImportFrom?,
+        memberName: String
+    ) throws -> String {
+        switch from {
+        case nil:
+            return BridgeJSLink.ImportedThunkBuilder.propertyAccessExpr(objectExpr: "imports", propertyName: memberName)
+        case .global:
+            return BridgeJSLink.ImportedThunkBuilder.propertyAccessExpr(
+                objectExpr: "globalThis",
+                propertyName: memberName
+            )
+        case .snippet, .module:
+            guard let reference = Self.reference(swiftModuleName: swiftModuleName, from: from),
+                let binding = bindings[reference]
+            else {
+                throw BridgeJSLinkError(
+                    message:
+                        "Missing JavaScript module \(swiftModuleName)\(from?.snippetPath ?? from?.moduleSpecifier ?? "")"
+                )
+            }
+            if binding.usesNamedImports {
+                return Self.namedImportBinding(index: binding.index, memberName: memberName)
+            }
+            return BridgeJSLink.ImportedThunkBuilder.propertyAccessExpr(
+                objectExpr: Self.namespaceAlias(index: binding.index),
+                propertyName: memberName
+            )
+        }
+    }
+
+    private static func namespaceAlias(index: Int) -> String {
+        "__bjs_imported_module_\(index)"
+    }
+
+    private static func namedImportBinding(index: Int, memberName: String) -> String {
+        "__bjs_import_\(index)_\(memberName)"
+    }
+
+    var importLines: [String] {
+        references.compactMap { reference in
+            guard let binding = bindings[reference] else { return nil }
+            let specifier: String
+            switch reference {
+            case .snippet(let swiftModuleName, let path):
+                let output = SnippetFile(swiftModuleName: swiftModuleName, path: path).relativeOutputPath
+                specifier = "./" + BridgeJSLink.escapeForJavaScriptStringLiteral(output)
+            case .module(let moduleSpecifier):
+                specifier = BridgeJSLink.escapeForJavaScriptStringLiteral(moduleSpecifier)
+            }
+            guard binding.usesNamedImports else {
+                return "import * as \(Self.namespaceAlias(index: binding.index)) from \"\(specifier)\";"
+            }
+            let clauses = binding.members.map {
+                "\($0) as \(Self.namedImportBinding(index: binding.index, memberName: $0))"
+            }
+            return "import { \(clauses.joined(separator: ", ")) } from \"\(specifier)\";"
+        }
+    }
+}
diff --git a/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift b/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift
index 51ef16b20..3f8530c55 100644
--- a/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift
+++ b/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift
@@ -35,6 +35,11 @@ final class JSGlueVariableScope {
     static let reservedSwiftClosureRegistry = "swiftClosureRegistry"
     static let reservedMakeSwiftClosure = "makeClosure"
     static let reservedTaStack = "taStack"
+    static let reservedCodecByTypeId = "__bjs_codecByTypeId"
+    static let reservedPrimitiveCodecs = "__bjs_primitiveCodecs"
+    static let reservedStringCodec = "__bjs_stringCodec"
+    static let reservedTypeHandlesRegistered = "__bjs_typeHandlesRegistered"
+    static let reservedRegisterTypeHandles = "__bjs_registerTypeHandles"
 
     private let intrinsicRegistry: JSIntrinsicRegistry
 
@@ -65,6 +70,11 @@ final class JSGlueVariableScope {
         reservedSwiftClosureRegistry,
         reservedMakeSwiftClosure,
         reservedTaStack,
+        reservedCodecByTypeId,
+        reservedPrimitiveCodecs,
+        reservedStringCodec,
+        reservedTypeHandlesRegistered,
+        reservedRegisterTypeHandles,
     ]
 
     init(intrinsicRegistry: JSIntrinsicRegistry) {
@@ -92,12 +102,62 @@ final class JSGlueVariableScope {
         try intrinsicRegistry.register(name: name, build: build)
     }
 
+    func registerNamedCodec(_ name: String, build: (CodeFragmentPrinter) throws -> Void) rethrows {
+        try intrinsicRegistry.registerNamedCodec(name: name, build: build)
+    }
+
+    func moduleName(declaringType typeName: String) -> String? {
+        intrinsicRegistry.typeOwnerModules[typeName]
+    }
+
     func makeChildScope() -> JSGlueVariableScope {
         JSGlueVariableScope(intrinsicRegistry: intrinsicRegistry)
     }
 
 }
 
+extension JSGlueVariableScope {
+    func helperKey(forTypeNamed fullName: String) -> String {
+        HelperNaming.type(
+            module: moduleName(declaringType: fullName),
+            swiftName: fullName
+        )
+    }
+}
+
+enum HelperNaming {
+    static func identifierComponent(_ name: String) -> String {
+        name.utf8.map { byte in
+            switch byte {
+            case 48...57, 65...90, 97...122:
+                return String(UnicodeScalar(byte))
+            default:
+                return "_\(String(byte, radix: 16))_"
+            }
+        }.joined()
+    }
+
+    static func type(module: String?, swiftName: String) -> String {
+        let module = module.map { "M\($0.utf8.count)\(identifierComponent($0))" } ?? ""
+        let type = swiftName.split(separator: ".").map { component in
+            "T\(component.utf8.count)\(identifierComponent(String(component)))"
+        }.joined()
+        return module + type
+    }
+
+    static func structHelperFactory(_ qualifiedKey: String) -> String {
+        "__bjs_createStructHelpers_\(qualifiedKey)"
+    }
+
+    static func enumHelperFactory(_ qualifiedKey: String) -> String {
+        "__bjs_createEnumHelpers_\(qualifiedKey)"
+    }
+
+    static func helperConstant(_ qualifiedKey: String) -> String {
+        "__bjs_helpers_\(qualifiedKey)"
+    }
+}
+
 extension JSGlueVariableScope {
     // MARK: Parameter
 
@@ -138,6 +198,327 @@ extension JSGlueVariableScope {
     }
 }
 
+enum GenericJSCodegen {
+    static func genericCodecExpression(type: BridgeType, codec: String) -> String? {
+        switch type {
+        case .generic: return codec
+        case .array(.generic): return "\(ContainerCodecJS.arrayCodec)(\(codec))"
+        case .nullable(.generic, let kind):
+            return ContainerCodecJS.optionalCodecExpression(elementCodec: codec, kind: kind)
+        case .dictionary(.generic): return "\(ContainerCodecJS.dictCodec)(\(codec))"
+        default: return nil
+        }
+    }
+
+    static func genericCodecLowerStatement(type: BridgeType, codec: String, value: String) -> String? {
+        genericCodecExpression(type: type, codec: codec).map { "\($0).lower(\(value));" }
+    }
+
+    static func genericCodecLiftExpression(type: BridgeType, codec: String) -> String? {
+        genericCodecExpression(type: type, codec: codec).map { "\($0).lift()" }
+    }
+
+    static func runtimeHelperDeclarations() -> [String] {
+        let codecByTypeId = JSGlueVariableScope.reservedCodecByTypeId
+        return [
+            "function __bjs_codecForTypeId(typeId) {",
+            "    __bjs_registerTypeHandles();",
+            "    const codec = \(codecByTypeId).get(typeId);",
+            "    if (!codec) {",
+            "        throw new Error(\"BridgeJS: no codec registered for type ID \" + typeId);",
+            "    }",
+            "    return codec;",
+            "}",
+        ]
+    }
+}
+
+enum ContainerCodecJS {
+    static let arrayCodec = "__bjs_arrayCodec"
+    static let optionalCodec = "__bjs_optionalCodec"
+    static let dictCodec = "__bjs_dictCodec"
+
+    static let namedCodecPrefix = "__bjs_codec_"
+
+    private static let combinatorIntrinsicName = "containerCodecCombinators"
+    private static let primitiveCodecIntrinsicName = "containerPrimitiveCodecs"
+
+    static func combinatorDeclarations() -> [String] {
+        let i32 = JSGlueVariableScope.reservedI32Stack
+        let stringCodec = JSGlueVariableScope.reservedStringCodec
+        return [
+            "const \(arrayCodec)Cache = new WeakMap();",
+            "function \(arrayCodec)(elementCodec) {",
+            "    let codec = \(arrayCodec)Cache.get(elementCodec);",
+            "    if (codec !== undefined) {",
+            "        return codec;",
+            "    }",
+            "    codec = {",
+            "        lower(value) {",
+            "            for (let i = 0; i < value.length; i++) {",
+            "                elementCodec.lower(value[i]);",
+            "            }",
+            "            \(i32).push(value.length);",
+            "        },",
+            "        lift() {",
+            "            const count = \(i32).pop();",
+            "            if (count === -1) {",
+            "                return \(JSGlueVariableScope.reservedTaStack).pop();",
+            "            }",
+            "            const result = new Array(count);",
+            "            for (let i = count - 1; i >= 0; i--) {",
+            "                result[i] = elementCodec.lift();",
+            "            }",
+            "            return result;",
+            "        },",
+            "    };",
+            "    \(arrayCodec)Cache.set(elementCodec, codec);",
+            "    return codec;",
+            "}",
+            "const \(optionalCodec)Cache = new WeakMap();",
+            "const \(optionalCodec)UndefinedOrCache = new WeakMap();",
+            "function \(optionalCodec)(elementCodec, isUndefinedOr = false) {",
+            "    const cache = isUndefinedOr ? \(optionalCodec)UndefinedOrCache : \(optionalCodec)Cache;",
+            "    let codec = cache.get(elementCodec);",
+            "    if (codec !== undefined) {",
+            "        return codec;",
+            "    }",
+            "    codec = {",
+            "        lower(value) {",
+            "            const isSome = isUndefinedOr ? value !== undefined : value != null;",
+            "            if (isSome) {",
+            "                elementCodec.lower(value);",
+            "                \(i32).push(1);",
+            "            } else {",
+            "                \(i32).push(0);",
+            "            }",
+            "        },",
+            "        lift() {",
+            "            if (\(i32).pop() === 0) {",
+            "                return isUndefinedOr ? undefined : null;",
+            "            }",
+            "            return elementCodec.lift();",
+            "        },",
+            "    };",
+            "    cache.set(elementCodec, codec);",
+            "    return codec;",
+            "}",
+            "const \(dictCodec)Cache = new WeakMap();",
+            "function \(dictCodec)(valueCodec) {",
+            "    let codec = \(dictCodec)Cache.get(valueCodec);",
+            "    if (codec !== undefined) {",
+            "        return codec;",
+            "    }",
+            "    codec = {",
+            "        lower(value) {",
+            "            const keys = Object.keys(value);",
+            "            for (let i = 0; i < keys.length; i++) {",
+            "                \(stringCodec).lower(keys[i]);",
+            "                valueCodec.lower(value[keys[i]]);",
+            "            }",
+            "            \(i32).push(keys.length);",
+            "        },",
+            "        lift() {",
+            "            const count = \(i32).pop();",
+            "            const result = {};",
+            "            for (let i = 0; i < count; i++) {",
+            "                const value = valueCodec.lift();",
+            "                const key = \(stringCodec).lift();",
+            "                result[key] = value;",
+            "            }",
+            "            return result;",
+            "        },",
+            "    };",
+            "    \(dictCodec)Cache.set(valueCodec, codec);",
+            "    return codec;",
+            "}",
+        ]
+    }
+
+    static func optionalCodecExpression(elementCodec: String, kind: JSOptionalKind) -> String {
+        switch kind {
+        case .null: return "\(optionalCodec)(\(elementCodec))"
+        case .undefined: return "\(optionalCodec)(\(elementCodec), true)"
+        }
+    }
+
+    static func registerCombinators(scope: JSGlueVariableScope) {
+        scope.registerIntrinsic(combinatorIntrinsicName) { printer in
+            printer.write(lines: combinatorDeclarations())
+        }
+    }
+
+    static func registerPrimitiveCodecs(context: IntrinsicJSFragment.PrintCodeContext) throws {
+        try context.scope.registerIntrinsic(primitiveCodecIntrinsicName) { printer in
+            let stringCodec = JSGlueVariableScope.reservedStringCodec
+            try writeCodecLiteral(
+                type: .string,
+                into: printer,
+                context: context,
+                prefix: "const \(stringCodec) = ",
+                suffix: ";"
+            )
+            printer.write("const \(JSGlueVariableScope.reservedPrimitiveCodecs) = {")
+            try printer.indent {
+                for primitive in BridgeType.genericBridgeablePrimitives {
+                    if case .string = primitive.type {
+                        printer.write("\(primitive.token): \(stringCodec),")
+                    } else {
+                        try writeCodecLiteral(
+                            type: primitive.type,
+                            into: printer,
+                            context: context,
+                            prefix: "\(primitive.token): ",
+                            suffix: ","
+                        )
+                    }
+                }
+            }
+            printer.write("};")
+        }
+    }
+
+    static func writeCodecLiteral(
+        type: BridgeType,
+        into printer: CodeFragmentPrinter,
+        context: IntrinsicJSFragment.PrintCodeContext,
+        prefix: String = "",
+        suffix: String = ","
+    ) throws {
+        func literalContext() -> IntrinsicJSFragment.PrintCodeContext {
+            context.with(\.printer, printer).with(\.scope, context.scope.makeChildScope())
+        }
+        let lowerFragment = try IntrinsicJSFragment.stackLowerFragment(elementType: type)
+        let liftFragment = try IntrinsicJSFragment.stackLiftFragment(elementType: type)
+        printer.write("\(prefix){")
+        try printer.indent {
+            printer.write("lower: (v) => {")
+            try printer.indent {
+                _ = try lowerFragment.printCode(["v"], literalContext())
+            }
+            printer.write("},")
+            printer.write("lift: () => {")
+            try printer.indent {
+                let results = try liftFragment.printCode([], literalContext())
+                printer.write("return \(results[0]);")
+            }
+            printer.write("},")
+        }
+        printer.write("}\(suffix)")
+    }
+
+    struct NamedCodec {
+        let expression: String
+        let token: String
+    }
+
+    static func codecExpression(
+        for elementType: BridgeType,
+        context: IntrinsicJSFragment.PrintCodeContext
+    ) throws -> String {
+        try namedCodec(for: elementType, context: context).expression
+    }
+
+    static func namedCodec(
+        for elementType: BridgeType,
+        context: IntrinsicJSFragment.PrintCodeContext
+    ) throws -> NamedCodec {
+        registerCombinators(scope: context.scope)
+        try registerPrimitiveCodecs(context: context)
+        let type = elementType.unaliased
+        switch type {
+        case .array(let element):
+            let element = try namedCodec(for: element, context: context)
+            return composedCodec(
+                token: "Array_\(element.token)",
+                factory: "\(arrayCodec)(\(element.expression))",
+                context: context
+            )
+        case .dictionary(let value):
+            let value = try namedCodec(for: value, context: context)
+            return composedCodec(
+                token: "Dict_\(value.token)",
+                factory: "\(dictCodec)(\(value.expression))",
+                context: context
+            )
+        case .nullable(let wrapped, let kind):
+            let wrapped = try namedCodec(for: wrapped, context: context)
+            let prefix = kind == .null ? "Optional" : "UndefinedOr"
+            return composedCodec(
+                token: "\(prefix)_\(wrapped.token)",
+                factory: optionalCodecExpression(elementCodec: wrapped.expression, kind: kind),
+                context: context
+            )
+        case .string, .rawValueEnum(_, .string):
+            return NamedCodec(expression: JSGlueVariableScope.reservedStringCodec, token: "String")
+        default:
+            if let token = BridgeType.genericBridgeablePrimitives.first(where: { $0.type == type })?.token {
+                return NamedCodec(
+                    expression: "\(JSGlueVariableScope.reservedPrimitiveCodecs).\(token)",
+                    token: token
+                )
+            }
+            return try leafCodec(for: type, context: context)
+        }
+    }
+
+    private static func composedCodec(
+        token: String,
+        factory: String,
+        context: IntrinsicJSFragment.PrintCodeContext
+    ) -> NamedCodec {
+        let name = "\(namedCodecPrefix)\(token)"
+        context.scope.registerNamedCodec(name) { printer in
+            printer.write("const \(name) = \(factory);")
+        }
+        return NamedCodec(expression: name, token: token)
+    }
+
+    private static func leafCodec(
+        for type: BridgeType,
+        context: IntrinsicJSFragment.PrintCodeContext
+    ) throws -> NamedCodec {
+        let token = leafToken(for: type, scope: context.scope)
+        let name = "\(namedCodecPrefix)\(token)"
+        let hoistedContext = context.with(\.hasDirectAccessToSwiftClass, false)
+        try context.scope.registerNamedCodec(name) { printer in
+            try writeCodecLiteral(
+                type: type,
+                into: printer,
+                context: hoistedContext,
+                prefix: "const \(name) = ",
+                suffix: ";"
+            )
+        }
+        return NamedCodec(expression: name, token: token)
+    }
+
+    private static func leafToken(for type: BridgeType, scope: JSGlueVariableScope) -> String {
+        func identifierComponent(_ name: String) -> String {
+            HelperNaming.identifierComponent(name)
+        }
+        func qualified(_ name: String) -> String {
+            scope.helperKey(forTypeNamed: name)
+        }
+        switch type {
+        case .jsObject(nil):
+            return "JSObject"
+        case .jsObject(let name?):
+            return identifierComponent(name)
+        case .swiftStruct(let name),
+            .swiftHeapObject(let name),
+            .swiftProtocol(let name),
+            .caseEnum(let name),
+            .rawValueEnum(let name, _),
+            .associatedValueEnum(let name),
+            .namespaceEnum(let name):
+            return qualified(name)
+        default:
+            return identifierComponent(type.mangleTypeName)
+        }
+    }
+}
+
 /// A fragment of JS code used to convert a value between Swift and JS.
 ///
 /// See `BridgeJSIntrinsics.swift` in the main JavaScriptKit module for Swift side lowering/lifting implementation.
@@ -615,12 +996,13 @@ struct IntrinsicJSFragment: Sendable {
 
     // MARK: - Associated Enum Fragments
 
-    static func associatedEnumLowerParameter(enumBase: String) -> IntrinsicJSFragment {
+    static func associatedEnumLowerParameter(enumName: String) -> IntrinsicJSFragment {
         IntrinsicJSFragment(
             parameters: ["value"],
             printCode: { arguments, context in
                 let (scope, printer) = (context.scope, context.printer)
                 let value = arguments[0]
+                let enumBase = scope.helperKey(forTypeNamed: enumName)
                 let caseIdName = scope.variable("\(value)CaseId")
                 printer.write(
                     "const \(caseIdName) = \(JSGlueVariableScope.reservedEnumHelpers).\(enumBase).lower(\(value));"
@@ -630,11 +1012,12 @@ struct IntrinsicJSFragment: Sendable {
         )
     }
 
-    static func associatedEnumLiftReturn(enumBase: String) -> IntrinsicJSFragment {
+    static func associatedEnumLiftReturn(enumName: String) -> IntrinsicJSFragment {
         IntrinsicJSFragment(
             parameters: [],
             printCode: { _, context in
                 let (scope, printer) = (context.scope, context.printer)
+                let enumBase = scope.helperKey(forTypeNamed: enumName)
                 let retName = scope.variable("ret")
                 printer.write(
                     "const \(retName) = \(JSGlueVariableScope.reservedEnumHelpers).\(enumBase).lift(\(scope.popI32()));"
@@ -668,40 +1051,35 @@ struct IntrinsicJSFragment: Sendable {
             )
         }
 
-        let innerFragment =
-            if wrappedType.optionalConvention == .stackABI {
-                try stackLiftFragment(elementType: wrappedType)
-            } else {
-                try liftParameter(type: wrappedType, context: bridgeContext)
-            }
+        if wrappedType.optionalParameterUsesStackABI {
+            return try optionalElementRaiseFragment(wrappedType: wrappedType, kind: kind)
+        }
         return compositeOptionalLiftParameter(
             wrappedType: wrappedType,
             kind: kind,
-            innerFragment: innerFragment
+            innerFragment: try liftParameter(type: wrappedType, context: bridgeContext)
         )
     }
 
+    /// Lift an optional parameter whose presence flag arrives as a wasm
+    /// parameter (not on the i32 stack), with the payload either in further
+    /// wasm parameters or on the stacks. The shared optional codec combinator
+    /// pops its flag from the i32 stack, so this ABI cannot go through it;
+    /// stack-convention payloads still lift through the shared container
+    /// codecs via `stackLiftFragment`.
     private static func compositeOptionalLiftParameter(
         wrappedType: BridgeType,
         kind: JSOptionalKind,
         innerFragment: IntrinsicJSFragment
     ) -> IntrinsicJSFragment {
-        let isStackConvention = wrappedType.optionalConvention == .stackABI
         let absenceLiteral = kind.absenceLiteral
 
-        let outerParams: [String]
-        if isStackConvention {
-            outerParams = ["isSome"]
-        } else {
-            outerParams = ["isSome"] + innerFragment.parameters
-        }
-
         return IntrinsicJSFragment(
-            parameters: outerParams,
+            parameters: ["isSome"] + innerFragment.parameters,
             printCode: { arguments, context in
                 let (scope, printer) = (context.scope, context.printer)
                 let isSome = arguments[0]
-                let innerArgs = isStackConvention ? [] : Array(arguments.dropFirst())
+                let innerArgs = Array(arguments.dropFirst())
 
                 let bufferPrinter = CodeFragmentPrinter()
                 let innerResults = try innerFragment.printCode(
@@ -761,26 +1139,26 @@ struct IntrinsicJSFragment: Sendable {
             )
         }
 
-        let innerFragment =
-            if wrappedType.optionalConvention == .stackABI {
-                try stackLowerFragment(elementType: wrappedType)
-            } else {
-                try lowerParameter(type: wrappedType)
-            }
+        if wrappedType.optionalParameterUsesStackABI {
+            // Stack convention: the conditional flag-plus-payload protocol is
+            // the shared optional codec's stack ABI.
+            return try optionalElementLowerFragment(wrappedType: wrappedType, kind: kind)
+        }
         return try compositeOptionalLowerParameter(
             wrappedType: wrappedType,
             kind: kind,
-            innerFragment: innerFragment
+            innerFragment: try lowerParameter(type: wrappedType)
         )
     }
 
+    /// Lower an optional parameter using the direct `(isSome, ...payload)` wasm
+    /// parameter ABI with zero placeholders for nil. This is not the container
+    /// stack ABI, so it cannot go through the shared optional codec combinator.
     private static func compositeOptionalLowerParameter(
         wrappedType: BridgeType,
         kind: JSOptionalKind,
         innerFragment: IntrinsicJSFragment
     ) throws -> IntrinsicJSFragment {
-        let isStackConvention = wrappedType.optionalConvention == .stackABI
-
         return IntrinsicJSFragment(
             parameters: ["value"],
             printCode: { arguments, context in
@@ -797,7 +1175,7 @@ struct IntrinsicJSFragment: Sendable {
 
                 let resultVars = innerResults.map { _ in scope.variable("result") }
                 assert(
-                    isStackConvention || resultVars.count == wrappedType.wasmParams.count,
+                    resultVars.count == wrappedType.wasmParams.count,
                     "Inner fragment result count (\(resultVars.count)) must match wasmParams count (\(wrappedType.wasmParams.count)) for \(wrappedType)"
                 )
                 if !resultVars.isEmpty {
@@ -814,8 +1192,7 @@ struct IntrinsicJSFragment: Sendable {
                     }
                 }
 
-                let hasPlaceholders = !isStackConvention && !wrappedType.wasmParams.isEmpty
-                if hasPlaceholders {
+                if !wrappedType.wasmParams.isEmpty {
                     printer.write("} else {")
                     printer.indent {
                         for (resultVar, param) in zip(resultVars, wrappedType.wasmParams) {
@@ -825,12 +1202,7 @@ struct IntrinsicJSFragment: Sendable {
                 }
                 printer.write("}")
 
-                if isStackConvention {
-                    scope.emitPushI32Parameter("+\(isSomeVar)", printer: printer)
-                    return []
-                } else {
-                    return ["+\(isSomeVar)"] + resultVars
-                }
+                return ["+\(isSomeVar)"] + resultVars
             }
         )
     }
@@ -848,6 +1220,9 @@ struct IntrinsicJSFragment: Sendable {
         )
     }
 
+    /// Lift an optional return whose presence flag travels on the i32 stack but
+    /// whose payload uses the wrapped type's regular (non-stack) return ABI, so
+    /// it cannot go through the shared optional codec combinator.
     private static func optionalLiftReturnWithPresenceFlag(
         wrappedType: BridgeType,
         kind: JSOptionalKind
@@ -860,12 +1235,7 @@ struct IntrinsicJSFragment: Sendable {
                 let isSomeVar = scope.variable("isSome")
                 printer.write("const \(isSomeVar) = \(scope.popI32());")
 
-                let innerFragment =
-                    if wrappedType.optionalConvention == .stackABI {
-                        try stackLiftFragment(elementType: wrappedType)
-                    } else {
-                        try liftReturn(type: wrappedType)
-                    }
+                let innerFragment = try liftReturn(type: wrappedType)
 
                 let innerPrinter = CodeFragmentPrinter()
                 let innerResults = try innerFragment.printCode([], context.with(\.printer, innerPrinter))
@@ -898,12 +1268,12 @@ struct IntrinsicJSFragment: Sendable {
         fullName: String,
         kind: JSOptionalKind
     ) -> IntrinsicJSFragment {
-        let base = fullName.components(separatedBy: ".").last ?? fullName
         let absenceLiteral = kind.absenceLiteral
         return IntrinsicJSFragment(
             parameters: [],
             printCode: { _, context in
                 let (scope, printer) = (context.scope, context.printer)
+                let base = scope.helperKey(forTypeNamed: fullName)
                 let resultVar = scope.variable("optResult")
                 let tagVar = scope.variable("tag")
                 printer.write("const \(tagVar) = \(scope.popI32());")
@@ -942,31 +1312,13 @@ struct IntrinsicJSFragment: Sendable {
         )
     }
 
-    private static func optionalLiftReturnStruct(
-        fullName: String,
-        kind: JSOptionalKind
-    ) -> IntrinsicJSFragment {
-        let base = fullName.replacingOccurrences(of: ".", with: "_")
-        let absenceLiteral = kind.absenceLiteral
-        return IntrinsicJSFragment(
-            parameters: [],
-            printCode: { _, context in
-                let (scope, printer) = (context.scope, context.printer)
-                let isSomeVar = scope.variable("isSome")
-                let resultVar = scope.variable("optResult")
-                printer.write("const \(isSomeVar) = \(scope.popI32());")
-                printer.write(
-                    "const \(resultVar) = \(isSomeVar) ? \(JSGlueVariableScope.reservedStructHelpers).\(base).lift() : \(absenceLiteral);"
-                )
-                return [resultVar]
-            }
-        )
-    }
-
     static func optionalLiftReturn(
         wrappedType: BridgeType,
         kind: JSOptionalKind
-    ) -> IntrinsicJSFragment {
+    ) throws -> IntrinsicJSFragment {
+        // Side-channel optionals deliver their payload through dedicated
+        // storage/imports instead of the bridge stacks, so they cannot go
+        // through the shared optional codec combinator.
         if let scalarKind = wrappedType.optionalScalarKind {
             return optionalLiftReturnFromStorage(storage: scalarKind.storageName)
         }
@@ -974,18 +1326,21 @@ struct IntrinsicJSFragment: Sendable {
             return optionalLiftReturnFromStorage(storage: JSGlueVariableScope.reservedStorageToReturnString)
         }
 
+        // Heap object optionals use the tmpRetOptionalHeapObject side channel.
         if case .swiftHeapObject(let className) = wrappedType {
             return optionalLiftReturnHeapObject(className: className, kind: kind)
         }
 
-        if case .swiftStruct(let fullName) = wrappedType {
-            return optionalLiftReturnStruct(fullName: fullName, kind: kind)
-        }
-
+        // Sentinel optionals encode nil in-band (tag -1), with no presence flag.
         if wrappedType.nilSentinel.hasSentinel, case .associatedValueEnum(let fullName) = wrappedType {
             return optionalLiftReturnAssociatedEnum(fullName: fullName, kind: kind)
         }
 
+        if wrappedType.optionalConvention == .stackABI {
+            // Stack convention: route through the shared optional codec combinator.
+            return try optionalElementRaiseFragment(wrappedType: wrappedType, kind: kind)
+        }
+
         return optionalLiftReturnWithPresenceFlag(wrappedType: wrappedType, kind: kind)
     }
 
@@ -1111,12 +1466,8 @@ struct IntrinsicJSFragment: Sendable {
         }
 
         if wrappedType.optionalConvention == .stackABI {
-            let innerFragment = try stackLowerFragment(elementType: wrappedType)
-            return stackOptionalLower(
-                wrappedType: wrappedType,
-                kind: kind,
-                innerFragment: innerFragment
-            )
+            // Stack convention: route through the shared optional codec combinator.
+            return try optionalElementLowerFragment(wrappedType: wrappedType, kind: kind)
         }
 
         if wrappedType.nilSentinel.hasSentinel {
@@ -1188,6 +1539,7 @@ struct IntrinsicJSFragment: Sendable {
     // MARK: - Protocol Support
 
     static func protocolPropertyOptionalToSideChannel(wrappedType: BridgeType) throws -> IntrinsicJSFragment {
+        let wrappedType = wrappedType.unaliased
         if let scalarKind = wrappedType.optionalScalarKind {
             let storage = scalarKind.storageName
             return IntrinsicJSFragment(
@@ -1247,44 +1599,11 @@ struct IntrinsicJSFragment: Sendable {
         }
     }
 
-    /// Lower an optional value to the stack using the **conditional** protocol:
-    /// push isSome flag, then conditionally push the payload (no placeholders for nil).
-    private static func stackOptionalLower(
-        wrappedType: BridgeType,
-        kind: JSOptionalKind,
-        innerFragment: IntrinsicJSFragment
-    ) -> IntrinsicJSFragment {
-        IntrinsicJSFragment(
-            parameters: ["value"],
-            printCode: { arguments, context in
-                let (scope, printer) = (context.scope, context.printer)
-                let value = arguments[0]
-                let isSomeVar = scope.variable("isSome")
-                printer.write("const \(isSomeVar) = \(kind.presenceCheck(value: value));")
-
-                let ifBodyPrinter = CodeFragmentPrinter()
-                try ifBodyPrinter.indent {
-                    let _ = try innerFragment.printCode(
-                        [value],
-                        context.with(\.printer, ifBodyPrinter)
-                    )
-                }
-                printer.write("if (\(isSomeVar)) {")
-                for line in ifBodyPrinter.lines {
-                    printer.write(line)
-                }
-                printer.write("}")
-                scope.emitPushI32Parameter("\(isSomeVar) ? 1 : 0", printer: printer)
-                return []
-            }
-        )
-    }
-
     // MARK: - ExportSwift
 
     /// Returns a fragment that lowers a JS value to Wasm core values for parameters
     static func lowerParameter(type: BridgeType) throws -> IntrinsicJSFragment {
-        switch type {
+        switch type.unaliased {
         case .bool, .integer, .float, .double, .unsafePointer, .caseEnum:
             return .identity
         case .rawValueEnum(_, let rawType) where rawType != .string:
@@ -1299,11 +1618,9 @@ struct IntrinsicJSFragment: Sendable {
             return try .optionalLowerParameter(wrappedType: wrappedType, kind: kind)
         case .rawValueEnum(_, .string): return .stringLowerParameter
         case .associatedValueEnum(let fullName):
-            let base = fullName.components(separatedBy: ".").last ?? fullName
-            return .associatedEnumLowerParameter(enumBase: base)
+            return .associatedEnumLowerParameter(enumName: fullName)
         case .swiftStruct(let fullName):
-            let base = fullName.replacingOccurrences(of: ".", with: "_")
-            return swiftStructLowerParameter(structBase: base)
+            return swiftStructLowerParameter(structName: fullName)
         case .closure:
             return IntrinsicJSFragment(
                 parameters: ["closure"],
@@ -1330,7 +1647,7 @@ struct IntrinsicJSFragment: Sendable {
 
     /// Returns a fragment that lifts a Wasm core value to a JS value for return values
     static func liftReturn(type: BridgeType) throws -> IntrinsicJSFragment {
-        switch type {
+        switch type.unaliased {
         case .bool, .rawValueEnum(_, .bool):
             return .boolLiftReturn
         case .integer(let t) where !t.is64Bit && !t.isSigned:
@@ -1356,14 +1673,12 @@ struct IntrinsicJSFragment: Sendable {
         case .swiftProtocol: return .jsObjectLiftReturn
         case .void: return .void
         case .nullable(let wrappedType, let kind):
-            return .optionalLiftReturn(wrappedType: wrappedType, kind: kind)
+            return try .optionalLiftReturn(wrappedType: wrappedType, kind: kind)
         case .rawValueEnum(_, .string): return .stringLiftReturn
         case .associatedValueEnum(let fullName):
-            let base = fullName.components(separatedBy: ".").last ?? fullName
-            return .associatedEnumLiftReturn(enumBase: base)
+            return .associatedEnumLiftReturn(enumName: fullName)
         case .swiftStruct(let fullName):
-            let base = fullName.replacingOccurrences(of: ".", with: "_")
-            return swiftStructLiftReturn(structBase: base)
+            return swiftStructLiftReturn(structName: fullName)
         case .closure:
             return IntrinsicJSFragment(
                 parameters: ["funcRef"],
@@ -1389,7 +1704,7 @@ struct IntrinsicJSFragment: Sendable {
 
     /// Returns a fragment that lifts Wasm core values to JS values for parameters
     static func liftParameter(type: BridgeType, context: BridgeContext = .importTS) throws -> IntrinsicJSFragment {
-        switch type {
+        switch type.unaliased {
         case .bool, .rawValueEnum(_, .bool):
             return .boolLiftParameter
         case .integer(let t) where !t.is64Bit && !t.isSigned:
@@ -1422,45 +1737,32 @@ struct IntrinsicJSFragment: Sendable {
             return try .optionalLiftParameter(wrappedType: wrappedType, kind: kind, context: context)
         case .rawValueEnum(_, .string): return .stringLiftParameter
         case .associatedValueEnum(let fullName):
-            switch context {
-            case .importTS:
-                throw BridgeJSLinkError(
-                    message:
-                        "Associated value enums are not supported to be passed as parameters to imported JS functions: \(fullName)"
-                )
-            case .exportSwift:
-                let base = fullName.components(separatedBy: ".").last ?? fullName
-                return IntrinsicJSFragment(
-                    parameters: ["caseId"],
-                    printCode: { arguments, context in
-                        let (scope, printer) = (context.scope, context.printer)
-                        let caseId = arguments[0]
-                        let resultVar = scope.variable("enumValue")
-                        printer.write(
-                            "const \(resultVar) = \(JSGlueVariableScope.reservedEnumHelpers).\(base).lift(\(caseId));"
-                        )
-                        return [resultVar]
-                    }
-                )
-            }
+            return IntrinsicJSFragment(
+                parameters: ["caseId"],
+                printCode: { arguments, context in
+                    let (scope, printer) = (context.scope, context.printer)
+                    let base = scope.helperKey(forTypeNamed: fullName)
+                    let caseId = arguments[0]
+                    let resultVar = scope.variable("enumValue")
+                    printer.write(
+                        "const \(resultVar) = \(JSGlueVariableScope.reservedEnumHelpers).\(base).lift(\(caseId));"
+                    )
+                    return [resultVar]
+                }
+            )
         case .swiftStruct(let fullName):
-            switch context {
-            case .importTS:
-                return .jsObjectLiftRetainedObjectId
-            case .exportSwift:
-                let base = fullName.replacingOccurrences(of: ".", with: "_")
-                return IntrinsicJSFragment(
-                    parameters: [],
-                    printCode: { arguments, context in
-                        let (scope, printer) = (context.scope, context.printer)
-                        let resultVar = scope.variable("structValue")
-                        printer.write(
-                            "const \(resultVar) = \(JSGlueVariableScope.reservedStructHelpers).\(base).lift();"
-                        )
-                        return [resultVar]
-                    }
-                )
-            }
+            return IntrinsicJSFragment(
+                parameters: [],
+                printCode: { arguments, context in
+                    let (scope, printer) = (context.scope, context.printer)
+                    let base = scope.helperKey(forTypeNamed: fullName)
+                    let resultVar = scope.variable("structValue")
+                    printer.write(
+                        "const \(resultVar) = \(JSGlueVariableScope.reservedStructHelpers).\(base).lift();"
+                    )
+                    return [resultVar]
+                }
+            )
         case .closure:
             return IntrinsicJSFragment(
                 parameters: ["funcRef"],
@@ -1485,7 +1787,7 @@ struct IntrinsicJSFragment: Sendable {
 
     /// Returns a fragment that lowers a JS value to Wasm core values for return values
     static func lowerReturn(type: BridgeType, context: BridgeContext = .importTS) throws -> IntrinsicJSFragment {
-        switch type {
+        switch type.unaliased {
         case .bool, .rawValueEnum(_, .bool):
             return .boolLowerReturn
         case .integer, .float, .double, .unsafePointer, .caseEnum:
@@ -1502,22 +1804,9 @@ struct IntrinsicJSFragment: Sendable {
             return try .optionalLowerReturn(wrappedType: wrappedType, kind: kind)
         case .rawValueEnum(_, .string): return .stringLowerReturn
         case .associatedValueEnum(let fullName):
-            switch context {
-            case .importTS:
-                throw BridgeJSLinkError(
-                    message:
-                        "Associated value enums are not supported to be returned from imported JS functions: \(fullName)"
-                )
-            case .exportSwift:
-                return associatedValueLowerReturn(fullName: fullName)
-            }
+            return associatedValueLowerReturn(fullName: fullName)
         case .swiftStruct(let fullName):
-            switch context {
-            case .importTS:
-                return .jsObjectLowerReturn
-            case .exportSwift:
-                return swiftStructLowerReturn(fullName: fullName)
-            }
+            return swiftStructLowerReturn(fullName: fullName)
         case .closure:
             return IntrinsicJSFragment(
                 parameters: ["value"],
@@ -1548,11 +1837,11 @@ struct IntrinsicJSFragment: Sendable {
     // MARK: - Enums Payload Fragments
 
     static func associatedValueLowerReturn(fullName: String) -> IntrinsicJSFragment {
-        let base = fullName.components(separatedBy: ".").last ?? fullName
         return IntrinsicJSFragment(
             parameters: ["value"],
             printCode: { arguments, context in
                 let (scope, printer) = (context.scope, context.printer)
+                let base = scope.helperKey(forTypeNamed: fullName)
                 let value = arguments[0]
                 let caseIdVar = scope.variable("caseId")
                 printer.write(
@@ -1591,17 +1880,20 @@ struct IntrinsicJSFragment: Sendable {
         )
     }
 
-    /// Generates the enum helper factory function (lower/lift closures).
-    /// This is placed inside `createInstantiator` alongside struct helpers,
-    /// so it has access to `_exports` for class references.
-    static func associatedValueEnumHelperFactory(enumDefinition: ExportedEnum) -> IntrinsicJSFragment {
+    static func associatedValueEnumHelperFactory(
+        enumDefinition: ExportedEnum,
+        moduleName: String
+    ) -> IntrinsicJSFragment {
+        let factoryName = HelperNaming.enumHelperFactory(
+            HelperNaming.type(module: moduleName, swiftName: enumDefinition.swiftCallName)
+        )
         return IntrinsicJSFragment(
             parameters: ["enumName"],
             printCode: { arguments, context in
                 let (scope, printer) = (context.scope, context.printer)
                 let enumName = arguments[0]
 
-                printer.write("const __bjs_create\(enumName)Helpers = () => ({")
+                printer.write("const \(factoryName) = () => ({")
                 try printer.indent {
                     printer.write("lower: (value) => {")
                     try printer.indent {
@@ -1775,6 +2067,7 @@ struct IntrinsicJSFragment: Sendable {
     }
 
     private static func associatedValuePushPayload(type: BridgeType) throws -> IntrinsicJSFragment {
+        let type = type.unaliased
         switch type {
         case .nullable(let wrappedType, let kind):
             return try optionalElementLowerFragment(wrappedType: wrappedType, kind: kind)
@@ -1784,6 +2077,7 @@ struct IntrinsicJSFragment: Sendable {
     }
 
     private static func associatedValuePopPayload(type: BridgeType) throws -> IntrinsicJSFragment {
+        let type = type.unaliased
         switch type {
         case .nullable(let wrappedType, let kind):
             return try optionalElementRaiseFragment(wrappedType: wrappedType, kind: kind)
@@ -1792,11 +2086,12 @@ struct IntrinsicJSFragment: Sendable {
         }
     }
 
-    private static func swiftStructLower(structBase: String) -> IntrinsicJSFragment {
+    private static func swiftStructLower(structName: String) -> IntrinsicJSFragment {
         IntrinsicJSFragment(
             parameters: ["value"],
             printCode: { arguments, context in
                 let printer = context.printer
+                let structBase = context.scope.helperKey(forTypeNamed: structName)
                 let value = arguments[0]
                 printer.write(
                     "\(JSGlueVariableScope.reservedStructHelpers).\(structBase).lower(\(value));"
@@ -1807,18 +2102,19 @@ struct IntrinsicJSFragment: Sendable {
     }
 
     static func swiftStructLowerReturn(fullName: String) -> IntrinsicJSFragment {
-        swiftStructLower(structBase: fullName.replacingOccurrences(of: ".", with: "_"))
+        swiftStructLower(structName: fullName)
     }
 
-    static func swiftStructLowerParameter(structBase: String) -> IntrinsicJSFragment {
-        swiftStructLower(structBase: structBase)
+    static func swiftStructLowerParameter(structName: String) -> IntrinsicJSFragment {
+        swiftStructLower(structName: structName)
     }
 
-    static func swiftStructLiftReturn(structBase: String) -> IntrinsicJSFragment {
+    static func swiftStructLiftReturn(structName: String) -> IntrinsicJSFragment {
         return IntrinsicJSFragment(
             parameters: [],
             printCode: { arguments, context in
                 let (scope, printer) = (context.scope, context.printer)
+                let structBase = scope.helperKey(forTypeNamed: structName)
                 let resultVar = scope.variable("structValue")
                 printer.write(
                     "const \(resultVar) = \(JSGlueVariableScope.reservedStructHelpers).\(structBase).lift();"
@@ -1830,133 +2126,53 @@ struct IntrinsicJSFragment: Sendable {
 
     // MARK: - Array Helpers
 
-    /// Lowers an array from JS to Swift by iterating elements and pushing to stacks
     static func arrayLower(elementType: BridgeType) throws -> IntrinsicJSFragment {
         return IntrinsicJSFragment(
             parameters: ["arr"],
             printCode: { arguments, context in
-                let (scope, printer) = (context.scope, context.printer)
-                let arr = arguments[0]
-
-                let elemVar = scope.variable("elem")
-                printer.write("for (const \(elemVar) of \(arr)) {")
-                try printer.indent {
-                    let elementFragment = try stackLowerFragment(elementType: elementType)
-                    let _ = try elementFragment.printCode(
-                        [elemVar],
-                        context
-                    )
-                }
-                printer.write("}")
-                scope.emitPushI32Parameter("\(arr).length", printer: printer)
+                let codec = try ContainerCodecJS.codecExpression(for: .array(elementType), context: context)
+                context.printer.write("\(codec).lower(\(arguments[0]));")
                 return []
             }
         )
     }
 
-    /// Lowers a dictionary from JS to Swift by iterating entries and pushing to stacks
     static func dictionaryLower(valueType: BridgeType) throws -> IntrinsicJSFragment {
         return IntrinsicJSFragment(
             parameters: ["dict"],
             printCode: { arguments, context in
-                let (scope, printer) = (context.scope, context.printer)
-                let dict = arguments[0]
-
-                let entriesVar = scope.variable("entries")
-                let entryVar = scope.variable("entry")
-                printer.write("const \(entriesVar) = Object.entries(\(dict));")
-                printer.write("for (const \(entryVar) of \(entriesVar)) {")
-                try printer.indent {
-                    let keyVar = scope.variable("key")
-                    let valueVar = scope.variable("value")
-                    printer.write("const [\(keyVar), \(valueVar)] = \(entryVar);")
-
-                    let keyFragment = try stackLowerFragment(elementType: .string)
-                    let _ = try keyFragment.printCode(
-                        [keyVar],
-                        context
-                    )
-
-                    let valueFragment = try stackLowerFragment(elementType: valueType)
-                    let _ = try valueFragment.printCode(
-                        [valueVar],
-                        context
-                    )
-                }
-                printer.write("}")
-                scope.emitPushI32Parameter("\(entriesVar).length", printer: printer)
+                let codec = try ContainerCodecJS.codecExpression(for: .dictionary(valueType), context: context)
+                context.printer.write("\(codec).lower(\(arguments[0]));")
                 return []
             }
         )
     }
 
-    /// Lifts an array from Swift to JS by popping elements from stacks
     static func arrayLift(elementType: BridgeType) throws -> IntrinsicJSFragment {
         return IntrinsicJSFragment(
             parameters: [],
-            printCode: { arguments, context in
-                let (scope, printer) = (context.scope, context.printer)
-                let resultVar = scope.variable("arrayResult")
-                let lenVar = scope.variable("arrayLen")
-
-                printer.write("const \(lenVar) = \(scope.popI32());")
-                printer.write("let \(resultVar);")
-                printer.write("if (\(lenVar) === -1) {")
-                printer.indent {
-                    // Bulk path: Swift pushed a typed array onto the typed-array stack
-                    printer.write("\(resultVar) = \(JSGlueVariableScope.reservedTaStack).pop();")
-                }
-                printer.write("} else {")
-                try printer.indent {
-                    // Element-by-element path (original behavior)
-                    let iVar = scope.variable("i")
-                    printer.write("\(resultVar) = [];")
-                    printer.write("for (let \(iVar) = 0; \(iVar) < \(lenVar); \(iVar)++) {")
-                    try printer.indent {
-                        let elementFragment = try stackLiftFragment(elementType: elementType)
-                        let elementResults = try elementFragment.printCode([], context)
-                        if let elementExpr = elementResults.first {
-                            printer.write("\(resultVar).push(\(elementExpr));")
-                        }
-                    }
-                    printer.write("}")
-                    printer.write("\(resultVar).reverse();")
-                }
-                printer.write("}")
+            printCode: { _, context in
+                let codec = try ContainerCodecJS.codecExpression(for: .array(elementType), context: context)
+                let resultVar = context.scope.variable("arrayResult")
+                context.printer.write("const \(resultVar) = \(codec).lift();")
                 return [resultVar]
             }
         )
     }
 
-    /// Lifts a dictionary from Swift to JS by popping key/value pairs from stacks
     static func dictionaryLift(valueType: BridgeType) throws -> IntrinsicJSFragment {
         return IntrinsicJSFragment(
             parameters: [],
-            printCode: { arguments, context in
-                let (scope, printer) = (context.scope, context.printer)
-                let resultVar = scope.variable("dictResult")
-                let lenVar = scope.variable("dictLen")
-                let iVar = scope.variable("i")
-
-                printer.write("const \(lenVar) = \(scope.popI32());")
-                printer.write("const \(resultVar) = {};")
-                printer.write("for (let \(iVar) = 0; \(iVar) < \(lenVar); \(iVar)++) {")
-                try printer.indent {
-                    let valueFragment = try stackLiftFragment(elementType: valueType)
-                    let valueResults = try valueFragment.printCode([], context)
-                    let keyFragment = try stackLiftFragment(elementType: .string)
-                    let keyResults = try keyFragment.printCode([], context)
-                    if let keyExpr = keyResults.first, let valueExpr = valueResults.first {
-                        printer.write("\(resultVar)[\(keyExpr)] = \(valueExpr);")
-                    }
-                }
-                printer.write("}")
+            printCode: { _, context in
+                let codec = try ContainerCodecJS.codecExpression(for: .dictionary(valueType), context: context)
+                let resultVar = context.scope.variable("dictResult")
+                context.printer.write("const \(resultVar) = \(codec).lift();")
                 return [resultVar]
             }
         )
     }
 
-    private static func stackLiftFragment(elementType: BridgeType) throws -> IntrinsicJSFragment {
+    static func stackLiftFragment(elementType: BridgeType) throws -> IntrinsicJSFragment {
         if case .nullable(let wrappedType, let kind) = elementType {
             return try optionalElementRaiseFragment(wrappedType: wrappedType, kind: kind)
         }
@@ -2021,11 +2237,11 @@ struct IntrinsicJSFragment: Sendable {
                 }
             )
         case .swiftStruct(let fullName):
-            let structBase = fullName.replacingOccurrences(of: ".", with: "_")
             return IntrinsicJSFragment(
                 parameters: [],
                 printCode: { arguments, context in
                     let (scope, printer) = (context.scope, context.printer)
+                    let structBase = scope.helperKey(forTypeNamed: fullName)
                     let resultVar = scope.variable("struct")
                     printer.write(
                         "const \(resultVar) = \(JSGlueVariableScope.reservedStructHelpers).\(structBase).lift();"
@@ -2034,11 +2250,11 @@ struct IntrinsicJSFragment: Sendable {
                 }
             )
         case .associatedValueEnum(let fullName):
-            let base = fullName.components(separatedBy: ".").last ?? fullName
             return IntrinsicJSFragment(
                 parameters: [],
                 printCode: { arguments, context in
                     let (scope, printer) = (context.scope, context.printer)
+                    let base = scope.helperKey(forTypeNamed: fullName)
                     let resultVar = scope.variable("enumValue")
                     printer.write(
                         "const \(resultVar) = \(JSGlueVariableScope.reservedEnumHelpers).\(base).lift(\(scope.popI32()));"
@@ -2083,7 +2299,7 @@ struct IntrinsicJSFragment: Sendable {
         }
     }
 
-    private static func stackLowerFragment(elementType: BridgeType) throws -> IntrinsicJSFragment {
+    static func stackLowerFragment(elementType: BridgeType) throws -> IntrinsicJSFragment {
         if case .nullable(let wrappedType, let kind) = elementType {
             return try optionalElementLowerFragment(wrappedType: wrappedType, kind: kind)
         }
@@ -2143,11 +2359,11 @@ struct IntrinsicJSFragment: Sendable {
                 }
             )
         case .swiftStruct(let fullName):
-            let structBase = fullName.replacingOccurrences(of: ".", with: "_")
             return IntrinsicJSFragment(
                 parameters: ["value"],
                 printCode: { arguments, context in
                     let printer = context.printer
+                    let structBase = context.scope.helperKey(forTypeNamed: fullName)
                     let value = arguments[0]
                     printer.write(
                         "\(JSGlueVariableScope.reservedStructHelpers).\(structBase).lower(\(value));"
@@ -2157,11 +2373,11 @@ struct IntrinsicJSFragment: Sendable {
             )
 
         case .associatedValueEnum(let fullName):
-            let base = fullName.components(separatedBy: ".").last ?? fullName
             return IntrinsicJSFragment(
                 parameters: ["value"],
                 printCode: { arguments, context in
                     let (scope, printer) = (context.scope, context.printer)
+                    let base = scope.helperKey(forTypeNamed: fullName)
                     let value = arguments[0]
                     let caseIdVar = scope.variable("caseId")
                     printer.write(
@@ -2208,122 +2424,32 @@ struct IntrinsicJSFragment: Sendable {
         wrappedType: BridgeType,
         kind: JSOptionalKind
     ) throws -> IntrinsicJSFragment {
-        if case .associatedValueEnum(let fullName) = wrappedType {
-            let base = fullName.components(separatedBy: ".").last ?? fullName
-            let absenceLiteral = kind.absenceLiteral
-            return IntrinsicJSFragment(
-                parameters: [],
-                printCode: { arguments, context in
-                    let (scope, printer) = (context.scope, context.printer)
-                    let caseIdVar = scope.variable("caseId")
-                    let resultVar = scope.variable("optValue")
-
-                    printer.write("const \(caseIdVar) = \(scope.popI32());")
-                    printer.write("let \(resultVar);")
-                    printer.write("if (\(caseIdVar) === -1) {")
-                    printer.indent {
-                        printer.write("\(resultVar) = \(absenceLiteral);")
-                    }
-                    printer.write("} else {")
-                    printer.indent {
-                        printer.write(
-                            "\(resultVar) = \(JSGlueVariableScope.reservedEnumHelpers).\(base).lift(\(caseIdVar));"
-                        )
-                    }
-                    printer.write("}")
-
-                    return [resultVar]
-                }
-            )
-        }
-
-        let absenceLiteral = kind.absenceLiteral
         return IntrinsicJSFragment(
             parameters: [],
-            printCode: { arguments, context in
-                let (scope, printer) = (context.scope, context.printer)
-                let isSomeVar = scope.variable("isSome")
-                let resultVar = scope.variable("optValue")
-
-                printer.write("const \(isSomeVar) = \(scope.popI32());")
-                printer.write("let \(resultVar);")
-                printer.write("if (\(isSomeVar) === 0) {")
-                printer.indent {
-                    printer.write("\(resultVar) = \(absenceLiteral);")
-                }
-                printer.write("} else {")
-                try printer.indent {
-                    let innerFragment = try stackLiftFragment(elementType: wrappedType)
-                    let innerResults = try innerFragment.printCode([], context)
-                    if let innerResult = innerResults.first {
-                        printer.write("\(resultVar) = \(innerResult);")
-                    } else {
-                        printer.write("\(resultVar) = undefined;")
-                    }
-                }
-                printer.write("}")
-
+            printCode: { _, context in
+                let codec = try ContainerCodecJS.codecExpression(
+                    for: .nullable(wrappedType, kind),
+                    context: context
+                )
+                let resultVar = context.scope.variable("optValue")
+                context.printer.write("const \(resultVar) = \(codec).lift();")
                 return [resultVar]
             }
         )
     }
 
-    /// Lower an optional element to the stack using the **conditional** protocol:
-    /// push isSome flag, then conditionally push the payload (no placeholders for nil).
     private static func optionalElementLowerFragment(
         wrappedType: BridgeType,
         kind: JSOptionalKind
     ) throws -> IntrinsicJSFragment {
-        if case .associatedValueEnum(let fullName) = wrappedType {
-            let base = fullName.components(separatedBy: ".").last ?? fullName
-            return IntrinsicJSFragment(
-                parameters: ["value"],
-                printCode: { arguments, context in
-                    let (scope, printer) = (context.scope, context.printer)
-                    let value = arguments[0]
-                    let isSomeVar = scope.variable("isSome")
-                    let presenceExpr = kind.presenceCheck(value: value)
-
-                    printer.write("const \(isSomeVar) = \(presenceExpr) ? 1 : 0;")
-                    printer.write("if (\(isSomeVar)) {")
-                    printer.indent {
-                        let caseIdVar = scope.variable("caseId")
-                        printer.write(
-                            "const \(caseIdVar) = \(JSGlueVariableScope.reservedEnumHelpers).\(base).lower(\(value));"
-                        )
-                        scope.emitPushI32Parameter(caseIdVar, printer: printer)
-                    }
-                    printer.write("} else {")
-                    printer.indent {
-                        scope.emitPushI32Parameter("-1", printer: printer)
-                    }
-                    printer.write("}")
-
-                    return []
-                }
-            )
-        }
-
         return IntrinsicJSFragment(
             parameters: ["value"],
             printCode: { arguments, context in
-                let (scope, printer) = (context.scope, context.printer)
-                let value = arguments[0]
-                let isSomeVar = scope.variable("isSome")
-
-                let presenceExpr = kind.presenceCheck(value: value)
-                printer.write("const \(isSomeVar) = \(presenceExpr) ? 1 : 0;")
-                printer.write("if (\(isSomeVar)) {")
-                try printer.indent {
-                    let innerFragment = try stackLowerFragment(elementType: wrappedType)
-                    let _ = try innerFragment.printCode(
-                        [value],
-                        context
-                    )
-                }
-                printer.write("}")
-                scope.emitPushI32Parameter(isSomeVar, printer: printer)
-
+                let codec = try ContainerCodecJS.codecExpression(
+                    for: .nullable(wrappedType, kind),
+                    context: context
+                )
+                context.printer.write("\(codec).lower(\(arguments[0]));")
                 return []
             }
         )
@@ -2331,16 +2457,22 @@ struct IntrinsicJSFragment: Sendable {
 
     // MARK: - Struct Helpers
 
-    static func structHelper(structDefinition: ExportedStruct, allStructs: [ExportedStruct]) -> IntrinsicJSFragment {
+    static func structHelper(
+        structDefinition: ExportedStruct,
+        allStructs: [ExportedStruct],
+        moduleName: String
+    ) -> IntrinsicJSFragment {
+        let factoryName = HelperNaming.structHelperFactory(
+            HelperNaming.type(module: moduleName, swiftName: structDefinition.swiftCallName)
+        )
         return IntrinsicJSFragment(
-            parameters: ["structName"],
+            parameters: [],
             printCode: { arguments, context in
                 let printer = context.printer
-                let structName = arguments[0]
                 let capturedStructDef = structDefinition
                 let capturedAllStructs = allStructs
 
-                printer.write("const __bjs_create\(structName)Helpers = () => ({")
+                printer.write("const \(factoryName) = () => ({")
                 try printer.indent {
                     printer.write("lower: (value) => {")
                     try printer.indent {
@@ -2435,11 +2567,11 @@ struct IntrinsicJSFragment: Sendable {
             for method in structDef.methods where !method.effects.isStatic {
                 let paramList = DefaultValueUtils.formatParameterList(method.parameters)
                 printer.write(
-                    "\(instanceVar).\(method.name) = function(\(paramList)) {"
+                    "\(instanceVar).\(method.resolvedJSName) = function(\(paramList)) {"
                 )
                 try printer.indent {
                     printer.write(
-                        "\(JSGlueVariableScope.reservedStructHelpers).\(structDef.abiName).lower(this);"
+                        "\(JSGlueVariableScope.reservedStructHelpers).\(context.scope.helperKey(forTypeNamed: structDef.swiftCallName)).lower(this);"
                     )
 
                     var paramForwardings: [String] = []
@@ -2453,14 +2585,10 @@ struct IntrinsicJSFragment: Sendable {
                     if method.returnType == .void {
                         printer.write("\(callExpr);")
                     } else {
-                        printer.write("const ret = \(callExpr);")
-                    }
-
-                    // Lift return value if needed
-                    if method.returnType != .void {
                         let liftFragment = try IntrinsicJSFragment.liftReturn(type: method.returnType)
-                        let liftArgs = liftFragment.parameters.isEmpty ? [] : ["ret"]
-                        let lifted = try liftFragment.printCode(liftArgs, context)
+                        let returnVariable = context.scope.variable("ret")
+                        printer.write("const \(returnVariable) = \(callExpr);")
+                        let lifted = try liftFragment.printCode([returnVariable], context)
                         if let liftedValue = lifted.first {
                             printer.write("return \(liftedValue);")
                         }
@@ -2480,6 +2608,7 @@ struct IntrinsicJSFragment: Sendable {
         fieldName: String,
         allStructs: [ExportedStruct]
     ) throws -> IntrinsicJSFragment {
+        let type = type.unaliased
         switch type {
         case .jsValue:
             preconditionFailure("Struct field of JSValue is not supported yet")
@@ -2513,9 +2642,10 @@ struct IntrinsicJSFragment: Sendable {
                 parameters: ["value"],
                 printCode: { arguments, context in
                     let printer = context.printer
+                    let nestedBase = context.scope.helperKey(forTypeNamed: nestedName)
                     let value = arguments[0]
                     printer.write(
-                        "\(JSGlueVariableScope.reservedStructHelpers).\(nestedName.replacingOccurrences(of: ".", with: "_")).lower(\(value));"
+                        "\(JSGlueVariableScope.reservedStructHelpers).\(nestedBase).lower(\(value));"
                     )
                     return []
                 }
@@ -2541,7 +2671,8 @@ struct IntrinsicJSFragment: Sendable {
         field: ExportedProperty,
         allStructs: [ExportedStruct]
     ) throws -> IntrinsicJSFragment {
-        switch field.type {
+        let fieldType = field.type.unaliased
+        switch fieldType {
         case .jsValue:
             preconditionFailure("Struct field of JSValue is not supported yet")
         case .nullable(let wrappedType, let kind):
@@ -2551,9 +2682,10 @@ struct IntrinsicJSFragment: Sendable {
                 parameters: [],
                 printCode: { arguments, context in
                     let (scope, printer) = (context.scope, context.printer)
+                    let nestedBase = scope.helperKey(forTypeNamed: nestedName)
                     let structVar = scope.variable("struct")
                     printer.write(
-                        "const \(structVar) = \(JSGlueVariableScope.reservedStructHelpers).\(nestedName.replacingOccurrences(of: ".", with: "_")).lift();"
+                        "const \(structVar) = \(JSGlueVariableScope.reservedStructHelpers).\(nestedBase).lift();"
                     )
                     return [structVar]
                 }
@@ -2592,7 +2724,7 @@ struct IntrinsicJSFragment: Sendable {
                 }
             )
         default:
-            return try stackLiftFragment(elementType: field.type)
+            return try stackLiftFragment(elementType: fieldType)
         }
     }
 }
@@ -2603,7 +2735,10 @@ fileprivate extension WasmCoreType {
     var jsZeroLiteral: String {
         switch self {
         case .f32, .f64: return "0.0"
-        case .i32, .i64, .pointer: return "0"
+        // A Wasm `i64` parameter is passed as a JavaScript `BigInt`, so its zero
+        // placeholder must be a BigInt literal rather than a plain number.
+        case .i64: return "0n"
+        case .i32, .pointer: return "0"
         }
     }
 }
@@ -2689,10 +2824,30 @@ private extension BridgeType {
             return .inlineFlag
         case .closure:
             return .inlineFlag
-        case .swiftStruct, .array, .dictionary, .void, .namespaceEnum:
+        case .swiftStruct, .array, .dictionary, .void, .namespaceEnum, .generic:
             return .stackABI
         case .nullable(let wrapped, _):
             return wrapped.optionalConvention
+        case .alias(_, let underlying):
+            return underlying.optionalConvention
+        }
+    }
+
+    /// Whether an optional of this type pushes its payload onto the bridge stack
+    /// when passed as a *parameter*.
+    ///
+    /// This usually matches `optionalConvention == .stackABI`, but `jsObject`
+    /// optionals are the exception: their return values travel through the stack
+    /// while their parameters use the direct `(isSome, objId)` ABI, matching plain
+    /// `Optional<JSObject>` and exported `@JS class` parameters.
+    var optionalParameterUsesStackABI: Bool {
+        switch self {
+        case .jsObject:
+            return false
+        case .nullable(let wrapped, _):
+            return wrapped.optionalParameterUsesStackABI
+        default:
+            return optionalConvention == .stackABI
         }
     }
 
@@ -2767,10 +2922,12 @@ private extension BridgeType {
             return [("caseId", .i32)]
         case .closure:
             return [("funcRef", .i32)]
-        case .void, .namespaceEnum, .swiftStruct, .array, .dictionary:
+        case .void, .namespaceEnum, .swiftStruct, .array, .dictionary, .generic:
             return []
         case .nullable(let wrapped, _):
             return wrapped.wasmParams
+        case .alias(_, let underlying):
+            return underlying.wasmParams
         }
     }
 
diff --git a/Plugins/BridgeJS/Sources/BridgeJSLink/JSIntrinsicRegistry.swift b/Plugins/BridgeJS/Sources/BridgeJSLink/JSIntrinsicRegistry.swift
index e3654e89f..d0bf2781f 100644
--- a/Plugins/BridgeJS/Sources/BridgeJSLink/JSIntrinsicRegistry.swift
+++ b/Plugins/BridgeJS/Sources/BridgeJSLink/JSIntrinsicRegistry.swift
@@ -7,6 +7,11 @@ final class JSIntrinsicRegistry {
     private var entries: [String: [String]] = [:]
     var classNamespaces: [String: [String]] = [:]
 
+    var typeOwnerModules: [String: String] = [:]
+
+    private var codecNameOrder: [String] = []
+    private var codecBodies: [String: [String]] = [:]
+
     var isEmpty: Bool {
         entries.isEmpty
     }
@@ -18,9 +23,29 @@ final class JSIntrinsicRegistry {
         entries[name] = printer.lines
     }
 
+    func registerNamedCodec(name: String, build: (CodeFragmentPrinter) throws -> Void) rethrows {
+        guard codecBodies[name] == nil else { return }
+        let printer = CodeFragmentPrinter()
+        try build(printer)
+        guard codecBodies[name] == nil else { return }
+        codecBodies[name] = printer.lines
+        codecNameOrder.append(name)
+    }
+
+    var hasNamedCodecs: Bool {
+        !codecNameOrder.isEmpty
+    }
+
+    func emitNamedCodecLines() -> [String] {
+        codecNameOrder.flatMap { codecBodies[$0] ?? [] }
+    }
+
     func reset() {
         entries.removeAll()
         classNamespaces.removeAll()
+        typeOwnerModules.removeAll()
+        codecNameOrder.removeAll()
+        codecBodies.removeAll()
     }
 
     func emitLines() -> [String] {
diff --git a/Plugins/BridgeJS/Sources/BridgeJSSkeleton/BridgeJSSkeleton.swift b/Plugins/BridgeJS/Sources/BridgeJSSkeleton/BridgeJSSkeleton.swift
index 346b7333b..8aaa6d5cd 100644
--- a/Plugins/BridgeJS/Sources/BridgeJSSkeleton/BridgeJSSkeleton.swift
+++ b/Plugins/BridgeJS/Sources/BridgeJSSkeleton/BridgeJSSkeleton.swift
@@ -14,6 +14,14 @@ extension NamespacedExportedType {
         }
         return name
     }
+
+    public var tsPathComponents: [String] {
+        (namespace ?? []) + [name]
+    }
+
+    public var tsFullPath: String {
+        tsPathComponents.joined(separator: ".")
+    }
 }
 
 // MARK: - ABI Name Generation
@@ -22,6 +30,14 @@ extension NamespacedExportedType {
 public struct ABINameGenerator {
     static let prefixComponent = "bjs"
 
+    public static func genericTypeIdParameterName(index: Int) -> String { "_generic\(index)TypeId" }
+
+    public static func typeRegistrationFunctionName(moduleName: String) -> String {
+        "bjs_\(moduleName)_register_type_handles"
+    }
+
+    public static let coreTypeRegistrationFunctionName = "bjs_core_register_type_handles"
+
     /// Generates ABI name using standardized namespace + context pattern
     public static func generateABIName(
         baseName: String,
@@ -157,7 +173,8 @@ public struct ClosureSignature: Codable, Equatable, Hashable, Sendable {
             ? "y"
             : parameters.map { $0.mangleTypeName }.joined()
         let sendingPart = sendingParameters ? "s" : ""
-        let signaturePart = "\(sendingPart)\(paramPart)_\(returnType.mangleTypeName)"
+        let effects = (isAsync ? "Ya" : "") + (isThrows ? "K" : "")
+        let signaturePart = "\(sendingPart)\(effects)\(paramPart)_\(returnType.mangleTypeName)"
         self.mangleName = "\(moduleName.count)\(moduleName)\(signaturePart)"
     }
 }
@@ -272,7 +289,102 @@ public enum BridgeType: Codable, Equatable, Hashable, Sendable {
     case namespaceEnum(String)
     case swiftProtocol(String)
     case swiftStruct(String)
+    case generic(String)
     indirect case closure(ClosureSignature, useJSTypedClosure: Bool)
+    indirect case alias(name: String, underlying: BridgeType)
+}
+
+extension BridgeType {
+    public var referencedGenericName: String? {
+        switch self {
+        case .generic(let name): return name
+        case .array(.generic(let name)): return name
+        case .nullable(.generic(let name), _): return name
+        case .dictionary(.generic(let name)): return name
+        default: return nil
+        }
+    }
+
+    public static let genericBridgeablePrimitives: [(token: String, type: BridgeType)] = [
+        ("Bool", .bool),
+        ("Int", .integer(.int)),
+        ("Int8", .integer(.int8)),
+        ("UInt8", .integer(.uint8)),
+        ("Int16", .integer(.int16)),
+        ("UInt16", .integer(.uint16)),
+        ("Int32", .integer(.int32)),
+        ("UInt32", .integer(.uint32)),
+        ("UInt", .integer(.uint)),
+        ("Int64", .integer(.int64)),
+        ("UInt64", .integer(.uint64)),
+        ("Float", .float),
+        ("Double", .double),
+        ("String", .string),
+        ("JSValue", .jsValue),
+    ]
+
+}
+
+public struct GenericBridgeableTypeEntry: Sendable {
+    public let swiftName: String
+    public let bridgeType: BridgeType
+
+    public init(swiftName: String, bridgeType: BridgeType) {
+        self.swiftName = swiftName
+        self.bridgeType = bridgeType
+    }
+}
+
+extension ExportedEnum {
+    public var genericBridgeType: BridgeType? {
+        switch enumType {
+        case .simple:
+            return .caseEnum(swiftCallName)
+        case .rawValue:
+            guard let rawType = rawType else { return nil }
+            return .rawValueEnum(swiftCallName, rawType)
+        case .associatedValue:
+            return .associatedValueEnum(swiftCallName)
+        case .namespace:
+            return nil
+        }
+    }
+}
+
+extension ExportedSkeleton {
+    /// Keep this order in sync with the generated registration codec array.
+    public var genericBridgeableTypeEntries: [GenericBridgeableTypeEntry] {
+        var entries: [GenericBridgeableTypeEntry] = []
+        for structDef in structs {
+            entries.append(
+                GenericBridgeableTypeEntry(
+                    swiftName: structDef.swiftCallName,
+                    bridgeType: .swiftStruct(structDef.swiftCallName)
+                )
+            )
+        }
+        for klass in classes where klass.isFinal == true {
+            entries.append(
+                GenericBridgeableTypeEntry(
+                    swiftName: klass.swiftCallName,
+                    bridgeType: .swiftHeapObject(klass.swiftCallName)
+                )
+            )
+        }
+        for enumDef in enums {
+            guard let bridgeType = enumDef.genericBridgeType else { continue }
+            entries.append(GenericBridgeableTypeEntry(swiftName: enumDef.swiftCallName, bridgeType: bridgeType))
+        }
+        return entries
+    }
+}
+
+extension BridgeJSSkeleton {
+    public var typeRegistrationEntries: [GenericBridgeableTypeEntry]? {
+        let exportedEntries = exported?.genericBridgeableTypeEntries ?? []
+        guard !exportedEntries.isEmpty else { return nil }
+        return exportedEntries
+    }
 }
 
 public enum WasmCoreType: String, Codable, Sendable {
@@ -672,6 +784,7 @@ public struct ExportedStruct: Codable, Equatable, Sendable, NamespacedExportedTy
     public var constructor: ExportedConstructor?
     public var methods: [ExportedFunction]
     public let namespace: [String]?
+    public var documentation: String?
 
     public init(
         name: String,
@@ -680,7 +793,8 @@ public struct ExportedStruct: Codable, Equatable, Sendable, NamespacedExportedTy
         properties: [ExportedProperty] = [],
         constructor: ExportedConstructor? = nil,
         methods: [ExportedFunction] = [],
-        namespace: [String]?
+        namespace: [String]?,
+        documentation: String? = nil
     ) {
         self.name = name
         self.swiftCallName = swiftCallName
@@ -689,6 +803,7 @@ public struct ExportedStruct: Codable, Equatable, Sendable, NamespacedExportedTy
         self.constructor = constructor
         self.methods = methods
         self.namespace = namespace
+        self.documentation = documentation
     }
 }
 
@@ -758,6 +873,7 @@ public struct ExportedEnum: Codable, Equatable, Sendable, NamespacedExportedType
     public let emitStyle: EnumEmitStyle
     public var staticMethods: [ExportedFunction]
     public var staticProperties: [ExportedProperty] = []
+    public var documentation: String?
     public var enumType: EnumType {
         if cases.isEmpty {
             return .namespace
@@ -786,7 +902,8 @@ public struct ExportedEnum: Codable, Equatable, Sendable, NamespacedExportedType
         namespace: [String]?,
         emitStyle: EnumEmitStyle,
         staticMethods: [ExportedFunction] = [],
-        staticProperties: [ExportedProperty] = []
+        staticProperties: [ExportedProperty] = [],
+        documentation: String? = nil
     ) {
         self.name = name
         self.swiftCallName = swiftCallName
@@ -798,6 +915,7 @@ public struct ExportedEnum: Codable, Equatable, Sendable, NamespacedExportedType
         self.emitStyle = emitStyle
         self.staticMethods = staticMethods
         self.staticProperties = staticProperties
+        self.documentation = documentation
     }
 }
 
@@ -814,15 +932,18 @@ public struct ExportedProtocolProperty: Codable, Equatable, Sendable {
     public let name: String
     public let type: BridgeType
     public let isReadonly: Bool
+    public var documentation: String?
 
     public init(
         name: String,
         type: BridgeType,
-        isReadonly: Bool
+        isReadonly: Bool,
+        documentation: String? = nil
     ) {
         self.name = name
         self.type = type
         self.isReadonly = isReadonly
+        self.documentation = documentation
     }
 }
 
@@ -831,45 +952,56 @@ public struct ExportedProtocol: Codable, Equatable {
     public let methods: [ExportedFunction]
     public let properties: [ExportedProtocolProperty]
     public let namespace: [String]?
+    public var documentation: String?
 
     public init(
         name: String,
         methods: [ExportedFunction],
         properties: [ExportedProtocolProperty] = [],
-        namespace: [String]? = nil
+        namespace: [String]? = nil,
+        documentation: String? = nil
     ) {
         self.name = name
         self.methods = methods
         self.properties = properties
         self.namespace = namespace
+        self.documentation = documentation
     }
 }
 
 public struct ExportedFunction: Codable, Equatable, Sendable {
     public var name: String
+    public var jsName: String?
     public var abiName: String
     public var parameters: [Parameter]
     public var returnType: BridgeType
     public var effects: Effects
     public var namespace: [String]?
     public var staticContext: StaticContext?
+    public var documentation: String?
+
+    public var resolvedJSName: String { jsName ?? name }
 
     public init(
         name: String,
+        jsName: String? = nil,
         abiName: String,
         parameters: [Parameter],
         returnType: BridgeType,
         effects: Effects,
         namespace: [String]? = nil,
-        staticContext: StaticContext? = nil
+        staticContext: StaticContext? = nil,
+        documentation: String? = nil
     ) {
         self.name = name
+        self.jsName = jsName
         self.abiName = abiName
         self.parameters = parameters
         self.returnType = returnType
         self.effects = effects
         self.namespace = namespace
         self.staticContext = staticContext
+        self.documentation = documentation
     }
 }
 
@@ -882,6 +1014,8 @@ public struct ExportedClass: Codable, NamespacedExportedType {
     public var properties: [ExportedProperty]
     public var namespace: [String]?
     public var identityMode: Bool?  // nil = use config default, true/false = override
+    public var documentation: String?
+    public var isFinal: Bool?
 
     public init(
         name: String,
@@ -891,7 +1025,9 @@ public struct ExportedClass: Codable, NamespacedExportedType {
         methods: [ExportedFunction],
         properties: [ExportedProperty] = [],
         namespace: [String]? = nil,
-        identityMode: Bool? = nil
+        identityMode: Bool? = nil,
+        documentation: String? = nil,
+        isFinal: Bool? = nil
     ) {
         self.name = name
         self.swiftCallName = swiftCallName
@@ -901,6 +1037,8 @@ public struct ExportedClass: Codable, NamespacedExportedType {
         self.properties = properties
         self.namespace = namespace
         self.identityMode = identityMode
+        self.documentation = documentation
+        self.isFinal = isFinal
     }
 }
 
@@ -909,37 +1047,53 @@ public struct ExportedConstructor: Codable, Equatable, Sendable {
     public var parameters: [Parameter]
     public var effects: Effects
     public var namespace: [String]?
+    public var documentation: String?
 
-    public init(abiName: String, parameters: [Parameter], effects: Effects, namespace: [String]? = nil) {
+    public init(
+        abiName: String,
+        parameters: [Parameter],
+        effects: Effects,
+        namespace: [String]? = nil,
+        documentation: String? = nil
+    ) {
         self.abiName = abiName
         self.parameters = parameters
         self.effects = effects
         self.namespace = namespace
+        self.documentation = documentation
     }
 }
 
 public struct ExportedProperty: Codable, Equatable, Sendable {
     public var name: String
+    public var jsName: String?
     public var type: BridgeType
     public var isReadonly: Bool
     public var isStatic: Bool
     public var namespace: [String]?
     public var staticContext: StaticContext?
+    public var documentation: String?
+
+    public var resolvedJSName: String { jsName ?? name }
 
     public init(
         name: String,
+        jsName: String? = nil,
         type: BridgeType,
         isReadonly: Bool = false,
         isStatic: Bool = false,
         namespace: [String]? = nil,
-        staticContext: StaticContext? = nil
+        staticContext: StaticContext? = nil,
+        documentation: String? = nil
     ) {
         self.name = name
+        self.jsName = jsName
         self.type = type
         self.isReadonly = isReadonly
         self.isStatic = isStatic
         self.namespace = namespace
         self.staticContext = staticContext
+        self.documentation = documentation
     }
 
     public func callName(prefix: String? = nil) -> String {
@@ -977,12 +1131,23 @@ public struct ExportedProperty: Codable, Equatable, Sendable {
     }
 }
 
+public struct ExportedAlias: Codable, Equatable, Sendable {
+    public let swiftCallName: String
+    public let underlying: BridgeType
+
+    public init(swiftCallName: String, underlying: BridgeType) {
+        self.swiftCallName = swiftCallName
+        self.underlying = underlying
+    }
+}
+
 public struct ExportedSkeleton: Codable {
     public var functions: [ExportedFunction]
     public var classes: [ExportedClass]
     public var enums: [ExportedEnum]
     public var structs: [ExportedStruct]
     public var protocols: [ExportedProtocol]
+    public var aliases: [ExportedAlias]
     /// Whether to expose exported APIs to the global namespace.
     ///
     /// When `true`, exported functions, classes, and namespaces are available
@@ -1002,6 +1167,7 @@ public struct ExportedSkeleton: Codable {
         enums: [ExportedEnum],
         structs: [ExportedStruct] = [],
         protocols: [ExportedProtocol] = [],
+        aliases: [ExportedAlias] = [],
         exposeToGlobal: Bool,
         identityMode: String? = nil
     ) {
@@ -1010,6 +1176,7 @@ public struct ExportedSkeleton: Codable {
         self.enums = enums
         self.structs = structs
         self.protocols = protocols
+        self.aliases = aliases
         self.exposeToGlobal = exposeToGlobal
         self.identityMode = identityMode
     }
@@ -1020,12 +1187,60 @@ public struct ExportedSkeleton: Codable {
         self.enums.append(contentsOf: other.enums)
         self.structs.append(contentsOf: other.structs)
         self.protocols.append(contentsOf: other.protocols)
+        self.aliases.append(contentsOf: other.aliases)
         assert(self.exposeToGlobal == other.exposeToGlobal)
         assert(self.identityMode == other.identityMode)
     }
 
     public var isEmpty: Bool {
-        functions.isEmpty && classes.isEmpty && enums.isEmpty && structs.isEmpty && protocols.isEmpty
+        functions.isEmpty && classes.isEmpty && enums.isEmpty && structs.isEmpty && protocols.isEmpty && aliases.isEmpty
+    }
+
+    /// Distinct `async` return types needing a `Promise_resolve_<mangled>` helper, deduplicated
+    /// by mangled name. Shared by the Swift codegen and JS link.
+    public var asyncPromiseResolveReturnTypes: [BridgeType] {
+        var seen = Set<String>()
+        var result: [BridgeType] = []
+        func consider(_ returnType: BridgeType, _ effects: Effects) {
+            guard effects.isAsync, returnType.isAsyncResolvable,
+                seen.insert(returnType.mangleTypeName).inserted
+            else { return }
+            result.append(returnType)
+        }
+        for function in functions { consider(function.returnType, function.effects) }
+        for klass in classes {
+            for method in klass.methods { consider(method.returnType, method.effects) }
+        }
+        for structDef in structs {
+            for method in structDef.methods { consider(method.returnType, method.effects) }
+        }
+        for enumDef in enums {
+            for method in enumDef.staticMethods { consider(method.returnType, method.effects) }
+        }
+        for returnType in asyncClosureResolveReturnTypes {
+            consider(returnType, Effects(isAsync: true, isThrows: false))
+        }
+        return result
+    }
+
+    private var asyncClosureResolveReturnTypes: [BridgeType] {
+        let collector = AsyncClosureReturnTypeCollector()
+        var walker = BridgeSkeletonWalker(visitor: collector)
+        walker.walk(self)
+        return walker.visitor.returnTypes
+    }
+}
+
+private struct AsyncClosureReturnTypeCollector: BridgeSkeletonVisitor {
+    private(set) var returnTypes: [BridgeType] = []
+
+    mutating func visitClosure(
+        _ signature: ClosureSignature,
+        useJSTypedClosure: Bool,
+        accessLevel: BridgeJSAccessLevel
+    ) {
+        guard signature.isAsync else { return }
+        returnTypes.append(signature.returnType)
     }
 }
 
@@ -1034,8 +1249,108 @@ public struct ExportedSkeleton: Codable {
 /// Controls where BridgeJS reads imported JS values from.
 ///
 /// - `global`: Read from `globalThis`.
-public enum JSImportFrom: String, Codable {
+/// - `snippet`: Read from a `/`-rooted JavaScript file inside the Swift target,
+///   which packaging copies into the generated output.
+/// - `module`: Read from an external ECMAScript module named by a bare specifier
+///   that the JavaScript host resolves (e.g. `node:path`, `lodash/fp`).
+///
+/// `.global` encodes as the string `"global"`; the other two encode as tagged
+/// objects that name their kind, so the JSON mirrors the Swift cases and is
+/// readable without knowing that a `/`-prefixed string means one thing and any
+/// other string means another. A plain string is never used for a specifier,
+/// which also avoids colliding with the `"global"` sentinel — `global` is itself
+/// a valid npm package name.
+public enum JSImportFrom: Codable, Equatable, Sendable {
     case global
+    case snippet(String)
+    case module(String)
+
+    private enum CodingKeys: String, CodingKey {
+        case kind, path, specifier
+    }
+
+    public init(from decoder: any Decoder) throws {
+        if let container = try? decoder.singleValueContainer(), let value = try? container.decode(String.self) {
+            guard value == "global" else {
+                throw DecodingError.dataCorruptedError(
+                    in: container,
+                    debugDescription: "Unknown import origin '\(value)'. Expected \"global\"."
+                )
+            }
+            self = .global
+            return
+        }
+        let container = try decoder.container(keyedBy: CodingKeys.self)
+        let kind = try container.decode(String.self, forKey: .kind)
+        switch kind {
+        case "snippet":
+            let path = try container.decode(String.self, forKey: .path)
+            // A snippet names a file we resolve inside the Swift target, so it must be
+            // rooted there and must not traverse out of it.
+            guard path.hasPrefix("/"), !path.split(separator: "/").contains("..") else {
+                throw DecodingError.dataCorruptedError(
+                    forKey: .path,
+                    in: container,
+                    debugDescription: "Snippet path '\(path)' must start with '/' and must not contain '..'."
+                )
+            }
+            self = .snippet(path)
+        case "module":
+            let specifier = try container.decode(String.self, forKey: .specifier)
+            // A bare specifier is resolved by the JavaScript host, so almost anything is
+            // legal, but the shapes that can never work are rejected here as well as at
+            // parse time: an empty specifier, a relative one, and a rooted path.
+            guard !specifier.isEmpty else {
+                throw DecodingError.dataCorruptedError(
+                    forKey: .specifier,
+                    in: container,
+                    debugDescription: "Module specifier must not be empty."
+                )
+            }
+            guard !specifier.hasPrefix("."), !specifier.hasPrefix("/") else {
+                throw DecodingError.dataCorruptedError(
+                    forKey: .specifier,
+                    in: container,
+                    debugDescription: "Module specifier '\(specifier)' must not be a path. Use a snippet instead."
+                )
+            }
+            self = .module(specifier)
+        default:
+            throw DecodingError.dataCorruptedError(
+                forKey: .kind,
+                in: container,
+                debugDescription: "Unknown import origin kind '\(kind)'. Expected \"snippet\" or \"module\"."
+            )
+        }
+    }
+
+    public func encode(to encoder: any Encoder) throws {
+        switch self {
+        case .global:
+            var container = encoder.singleValueContainer()
+            try container.encode("global")
+        case .snippet(let path):
+            var container = encoder.container(keyedBy: CodingKeys.self)
+            try container.encode("snippet", forKey: .kind)
+            try container.encode(path, forKey: .path)
+        case .module(let specifier):
+            var container = encoder.container(keyedBy: CodingKeys.self)
+            try container.encode("module", forKey: .kind)
+            try container.encode(specifier, forKey: .specifier)
+        }
+    }
+
+    /// The path of a target-local JavaScript file, rooted at the Swift target directory.
+    public var snippetPath: String? {
+        guard case .snippet(let path) = self else { return nil }
+        return path
+    }
+
+    /// The bare specifier of an external ECMAScript module, resolved by the JavaScript host.
+    public var moduleSpecifier: String? {
+        guard case .module(let specifier) = self else { return nil }
+        return specifier
+    }
 }
 
 public struct ImportedFunctionSkeleton: Codable {
@@ -1052,6 +1367,11 @@ public struct ImportedFunctionSkeleton: Codable {
     /// determine the access level of bridge-generated helpers (e.g. typed
     /// closure inits) that surface through this function's signature.
     public let accessLevel: BridgeJSAccessLevel
+    public let genericParameters: [String]?
+    public var genericParameterNames: [String] { genericParameters ?? [] }
+    public var isGeneric: Bool { !genericParameterNames.isEmpty }
+
+    public var resolvedJSName: String { jsName ?? name }
 
     public init(
         name: String,
@@ -1061,7 +1381,8 @@ public struct ImportedFunctionSkeleton: Codable {
         returnType: BridgeType,
         effects: Effects = Effects(isAsync: false, isThrows: true),
         documentation: String? = nil,
-        accessLevel: BridgeJSAccessLevel = .internal
+        accessLevel: BridgeJSAccessLevel = .internal,
+        genericParameters: [String]? = nil
     ) {
         self.name = name
         self.jsName = jsName
@@ -1071,10 +1392,11 @@ public struct ImportedFunctionSkeleton: Codable {
         self.effects = effects
         self.documentation = documentation
         self.accessLevel = accessLevel
+        self.genericParameters = genericParameters
     }
 
     private enum CodingKeys: String, CodingKey {
-        case name, jsName, from, parameters, returnType, effects, documentation, accessLevel
+        case name, jsName, from, parameters, returnType, effects, documentation, accessLevel, genericParameters
     }
 
     public init(from decoder: any Decoder) throws {
@@ -1087,6 +1409,7 @@ public struct ImportedFunctionSkeleton: Codable {
         self.effects = try container.decode(Effects.self, forKey: .effects)
         self.documentation = try container.decodeIfPresent(String.self, forKey: .documentation)
         self.accessLevel = try container.decodeIfPresent(BridgeJSAccessLevel.self, forKey: .accessLevel) ?? .internal
+        self.genericParameters = try container.decodeIfPresent([String].self, forKey: .genericParameters)
     }
 
     public func abiName(context: ImportedTypeSkeleton?) -> String {
@@ -1107,20 +1430,29 @@ public struct ImportedConstructorSkeleton: Codable {
     /// Source access level of the originating Swift `init`. Inherits from the
     /// enclosing `@JSClass` type when not annotated explicitly.
     public let accessLevel: BridgeJSAccessLevel
+    public let genericParameters: [String]?
+    public var genericParameterNames: [String] { genericParameters ?? [] }
+    public var isGeneric: Bool { !genericParameterNames.isEmpty }
 
-    public init(parameters: [Parameter], accessLevel: BridgeJSAccessLevel = .internal) {
+    public init(
+        parameters: [Parameter],
+        accessLevel: BridgeJSAccessLevel = .internal,
+        genericParameters: [String]? = nil
+    ) {
         self.parameters = parameters
         self.accessLevel = accessLevel
+        self.genericParameters = genericParameters
     }
 
     private enum CodingKeys: String, CodingKey {
-        case parameters, accessLevel
+        case parameters, accessLevel, genericParameters
     }
 
     public init(from decoder: any Decoder) throws {
         let container = try decoder.container(keyedBy: CodingKeys.self)
         self.parameters = try container.decode([Parameter].self, forKey: .parameters)
         self.accessLevel = try container.decodeIfPresent(BridgeJSAccessLevel.self, forKey: .accessLevel) ?? .internal
+        self.genericParameters = try container.decodeIfPresent([String].self, forKey: .genericParameters)
     }
 
     public func abiName(context: ImportedTypeSkeleton) -> String {
@@ -1144,6 +1476,8 @@ public struct ImportedGetterSkeleton: Codable {
     /// Source access level of the originating Swift declaration.
     public let accessLevel: BridgeJSAccessLevel
 
+    public var resolvedJSName: String { jsName ?? name }
+
     public init(
         name: String,
         jsName: String? = nil,
@@ -1204,6 +1538,8 @@ public struct ImportedSetterSkeleton: Codable {
     /// Source access level of the originating Swift declaration.
     public let accessLevel: BridgeJSAccessLevel
 
+    public var resolvedJSName: String { jsName ?? name }
+
     public init(
         name: String,
         jsName: String? = nil,
@@ -1266,6 +1602,8 @@ public struct ImportedTypeSkeleton: Codable {
     /// Source access level of the originating Swift `@JSClass` declaration.
     public let accessLevel: BridgeJSAccessLevel
 
+    public var resolvedJSName: String { jsName ?? name }
+
     public init(
         name: String,
         jsName: String? = nil,
@@ -1361,6 +1699,17 @@ public struct ImportedFileSkeleton: Codable {
     }
 }
 
+extension ImportedFileSkeleton {
+    public var hasGenericDeclarations: Bool {
+        functions.contains(where: \.isGeneric)
+            || types.contains {
+                $0.methods.contains(where: \.isGeneric)
+                    || $0.staticMethods.contains(where: \.isGeneric)
+                    || ($0.constructor?.isGeneric ?? false)
+            }
+    }
+}
+
 public struct ImportedModuleSkeleton: Codable {
     public var children: [ImportedFileSkeleton]
 
@@ -1369,6 +1718,12 @@ public struct ImportedModuleSkeleton: Codable {
     }
 }
 
+extension ImportedModuleSkeleton {
+    public var hasGenericDeclarations: Bool {
+        children.contains { $0.hasGenericDeclarations }
+    }
+}
+
 // MARK: - Closure signature collection visitor
 
 public struct ClosureSignatureCollectorVisitor: BridgeSkeletonVisitor {
@@ -1400,11 +1755,18 @@ public struct ClosureSignatureCollectorVisitor: BridgeSkeletonVisitor {
         accessLevel: BridgeJSAccessLevel
     ) {
         recordSignature(signature, accessLevel: accessLevel)
+
+        if signature.isAsync {
+            recordInjectedSignatures(
+                forReturnType: signature.returnType,
+                accessLevel: accessLevel
+            )
+        }
     }
 
     /// Insert `signature` at `accessLevel`, or upgrade the existing level to
     /// the more permissive of the two. Centralizing the merge here keeps
-    /// `visitClosure` and `recordInjectedSignature` in lockstep — if the
+    /// `visitClosure` and `recordInjectedSignatures` in lockstep - if the
     /// merge policy ever needs to change (e.g. adding a diagnostic for
     /// conflicting levels), there's only one place to update.
     private mutating func recordSignature(
@@ -1420,56 +1782,48 @@ public struct ClosureSignatureCollectorVisitor: BridgeSkeletonVisitor {
     public mutating func visitImportedFunction(_ function: ImportedFunctionSkeleton) {
         guard function.effects.isAsync else { return }
 
-        // When async imports exist, inject closure signatures for the typed resolve
-        // and reject callbacks used by _bjs_awaitPromise.
-        // - Reject always uses (sending JSValue) -> Void
-        // - Resolve uses a typed closure matching the return type (or () -> Void for void)
-        // All async callback closures use `sending` parameters so values can be
-        // transferred through the checked continuation without Sendable constraints.
+        recordInjectedSignatures(
+            forReturnType: function.returnType,
+            accessLevel: function.accessLevel
+        )
+    }
 
+    private mutating func recordInjectedSignatures(
+        forReturnType returnType: BridgeType,
+        accessLevel: BridgeJSAccessLevel
+    ) {
         // Reject callback
-        recordInjectedSignature(
+        recordSignature(
             ClosureSignature(
                 parameters: [.jsValue],
                 returnType: .void,
                 moduleName: moduleName,
                 sendingParameters: true
             ),
-            for: function
+            accessLevel: accessLevel
         )
         // Resolve callback (typed per return type)
-        if function.returnType == .void {
-            recordInjectedSignature(
+        if returnType == .void {
+            recordSignature(
                 ClosureSignature(
                     parameters: [],
                     returnType: .void,
                     moduleName: moduleName
                 ),
-                for: function
+                accessLevel: accessLevel
             )
         } else {
-            recordInjectedSignature(
+            recordSignature(
                 ClosureSignature(
-                    parameters: [function.returnType],
+                    parameters: [returnType],
                     returnType: .void,
                     moduleName: moduleName,
                     sendingParameters: true
                 ),
-                for: function
+                accessLevel: accessLevel
             )
         }
     }
-
-    /// Inject a closure signature derived from an async import (e.g. Promise
-    /// resolve/reject callbacks). The injected signature inherits the access
-    /// level of the originating function so its synthesized init matches the
-    /// visibility of the async API surface.
-    private mutating func recordInjectedSignature(
-        _ signature: ClosureSignature,
-        for function: ImportedFunctionSkeleton
-    ) {
-        recordSignature(signature, accessLevel: function.accessLevel)
-    }
 }
 
 // MARK: - Unified Skeleton
@@ -1535,6 +1889,20 @@ extension BridgeType {
         }
     }
 
+    public var unaliased: BridgeType {
+        switch self {
+        case .alias(_, let underlying): return underlying.unaliased
+        case .nullable(let wrapped, let kind): return .nullable(wrapped.unaliased, kind)
+        case .array(let element): return .array(element.unaliased)
+        case .dictionary(let value): return .dictionary(value.unaliased)
+        case .bool, .integer, .float, .double, .string, .jsValue, .jsObject,
+            .swiftHeapObject, .unsafePointer, .swiftProtocol, .void,
+            .caseEnum, .rawValueEnum, .associatedValueEnum, .swiftStruct,
+            .namespaceEnum, .closure, .generic:
+            return self
+        }
+    }
+
     public var abiReturnType: WasmCoreType? {
         switch self {
         case .void: return nil
@@ -1575,6 +1943,10 @@ extension BridgeType {
         case .dictionary:
             // Dictionaries use stack-based return with entry count (no direct WASM return type)
             return nil
+        case .alias(_, let underlying):
+            return underlying.abiReturnType
+        case .generic:
+            return nil
         }
     }
 
@@ -1584,6 +1956,25 @@ extension BridgeType {
         return false
     }
 
+    /// Whether a value of this type can be passed to a generated `Promise_resolve_<mangled>`
+    /// settlement helper, i.e. lowered through the imported-parameter ABI. Every `async`
+    /// exported return settles through `_bjs_makePromise`; the few types that cannot be lowered
+    /// (protocols, namespace enums, and their compositions) are diagnosed.
+    public var isAsyncResolvable: Bool {
+        switch self {
+        case .swiftProtocol, .namespaceEnum:
+            return false
+        case .nullable(let wrapped, _):
+            return wrapped.isAsyncResolvable
+        case .array(let element):
+            return element.isAsyncResolvable
+        case .dictionary(let value):
+            return value.isAsyncResolvable
+        default:
+            return true
+        }
+    }
+
     /// Simplified Swift ABI-style mangled name
     /// https://github.com/swiftlang/swift/blob/main/docs/ABI/Mangling.rst#types
     public var mangleTypeName: String {
@@ -1596,11 +1987,11 @@ extension BridgeType {
         case .void: return "y"
         case .jsObject(let name):
             let typeName = name ?? "JSObject"
-            return "\(typeName.count)\(typeName)C"
+            return "\(Self.mangleQualifiedName(typeName))C"
         case .jsValue:
             return "7JSValueV"
         case .swiftHeapObject(let name):
-            return "\(name.count)\(name)C"
+            return "\(Self.mangleQualifiedName(name))C"
         case .unsafePointer(let ptr):
             func sanitize(_ s: String) -> String {
                 s.filter { $0.isNumber || $0.isLetter }
@@ -1625,26 +2016,39 @@ extension BridgeType {
             .rawValueEnum(let name, _),
             .associatedValueEnum(let name),
             .namespaceEnum(let name):
-            return "\(name.count)\(name)O"
+            return "\(Self.mangleQualifiedName(name))O"
         case .swiftProtocol(let name):
-            return "\(name.count)\(name)P"
+            return "\(Self.mangleQualifiedName(name))P"
         case .swiftStruct(let name):
-            return "\(name.count)\(name)V"
+            return "\(Self.mangleQualifiedName(name))V"
         case .closure(let signature, let useJSTypedClosure):
             let params =
                 signature.parameters.isEmpty
                 ? "y"
                 : signature.parameters.map { $0.mangleTypeName }.joined()
-            return "K\(params)_\(signature.returnType.mangleTypeName)\(useJSTypedClosure ? "J" : "")"
+            let effects = (signature.isAsync ? "Ya" : "") + (signature.isThrows ? "K" : "")
+            return "K\(effects)\(params)_\(signature.returnType.mangleTypeName)\(useJSTypedClosure ? "J" : "")"
         case .array(let elementType):
             // Array mangling: "Sa" prefix followed by element type
             return "Sa\(elementType.mangleTypeName)"
         case .dictionary(let valueType):
             // Dictionary mangling: "SD" prefix followed by value type (key is always String)
             return "SD\(valueType.mangleTypeName)"
+        case .alias(let name, _):
+            // `name` is the namespace-qualified swiftCallName (unique), so the underlying
+            // representation isn't mangled in - aliases bridge via their JS type's ABI.
+            return "Al\(Self.mangleQualifiedName(name))"
+        case .generic(let name):
+            return "\(name.count)\(name)T"
         }
     }
 
+    /// Transforms a namespace-qualified name into a valid identifier by removing
+    /// each dot and prefixing each component with length (e.g. `Workshop.Bench` -> `8Workshop5Bench`).
+    private static func mangleQualifiedName(_ name: String) -> String {
+        name.split(separator: ".").map { "\($0.count)\($0)" }.joined()
+    }
+
     /// Determines if an optional type requires side-channel communication for protocol property returns
     ///
     /// Side channels are needed when the wrapped type cannot be directly returned via WASM,
@@ -1653,8 +2057,11 @@ extension BridgeType {
         guard case .nullable(let wrappedType, _) = self else {
             return false
         }
+        return wrappedType.requiresSideChannelForOptionalReturnIfWrapped
+    }
 
-        switch wrappedType {
+    private var requiresSideChannelForOptionalReturnIfWrapped: Bool {
+        switch self {
         case .string, .integer, .float, .double, .swiftProtocol:
             return true
         case .rawValueEnum(_, let rawType):
@@ -1668,6 +2075,8 @@ extension BridgeType {
             }
         case .bool, .caseEnum, .swiftHeapObject, .associatedValueEnum, .jsObject:
             return false
+        case .alias(_, let underlying):
+            return underlying.requiresSideChannelForOptionalReturnIfWrapped
         default:
             return false
         }
diff --git a/Plugins/BridgeJS/Sources/BridgeJSTool/BridgeJSTool.swift b/Plugins/BridgeJS/Sources/BridgeJSTool/BridgeJSTool.swift
index 005af04a8..d3d9a484e 100644
--- a/Plugins/BridgeJS/Sources/BridgeJSTool/BridgeJSTool.swift
+++ b/Plugins/BridgeJS/Sources/BridgeJSTool/BridgeJSTool.swift
@@ -2,7 +2,6 @@
 @preconcurrency import func Foundation.fputs
 @preconcurrency import func Foundation.open
 @preconcurrency import func Foundation.strerror
-@preconcurrency import var Foundation.stderr
 @preconcurrency import var Foundation.errno
 @preconcurrency import var Foundation.O_WRONLY
 @preconcurrency import var Foundation.O_CREAT
@@ -15,6 +14,17 @@
 @preconcurrency import class Foundation.FileManager
 @preconcurrency import class Foundation.JSONDecoder
 @preconcurrency import class Foundation.ProcessInfo
+
+#if canImport(Darwin)
+@preconcurrency import var Darwin.stderr
+#elseif canImport(Glibc)
+@preconcurrency import var Glibc.stderr
+#elseif canImport(Musl)
+@preconcurrency import var Musl.stderr
+#elseif canImport(Android)
+@preconcurrency import var Android.stderr
+#endif
+
 import SwiftParser
 import SwiftSyntax
 
@@ -176,7 +186,13 @@ import BridgeJSUtilities
                 moduleName: moduleName,
                 exposeToGlobal: config.exposeToGlobal,
                 externalModuleIndex: externalModuleIndex,
-                identityMode: config.identityMode
+                identityMode: config.identityMode,
+                javaScriptModuleExists: { path in
+                    guard let file = JavaScriptModulePath.resolve(path, relativeTo: targetDirectory) else {
+                        return false
+                    }
+                    return JavaScriptModulePath.isRegularFile(at: file)
+                }
             )
             for inputFile in inputFiles.sorted() {
                 try withSpan("Parsing \(inputFile)") {
@@ -201,6 +217,9 @@ import BridgeJSUtilities
             let skeleton = try withSpan("SwiftToSkeleton.finalize") {
                 return try swiftToSkeleton.finalize()
             }
+            for (file, diagnostic) in swiftToSkeleton.warnings {
+                printStderr(diagnostic.formattedDescription(fileName: file))
+            }
 
             var exporter: ExportSwift?
             if let skeleton = skeleton.exported {
@@ -231,9 +250,12 @@ import BridgeJSUtilities
                 return try exporter?.finalize()
             }
 
+            // Type-handle registration is shared by exported types and generic imports.
+            let typeRegistration = GenericTypeRegistrationCodegen().render(for: skeleton)
+
             // Combine and write unified Swift output
             let outputSwiftURL = outputDirectory.appending(path: "BridgeJS.swift")
-            let combinedSwift = [closureSupport, exportResult, importResult].compactMap { $0 }
+            let combinedSwift = [closureSupport, exportResult, importResult, typeRegistration].compactMap { $0 }
             let outputSwift = combineGeneratedSwift(
                 combinedSwift,
                 importingExternalModules: skeleton.usedExternalModules
@@ -393,7 +415,7 @@ private func inputSwiftFiles(targetDirectory: URL, positionalArguments: [String]
     if positionalArguments.isEmpty {
         return recursivelyCollectSwiftFiles(from: targetDirectory).map(\.path)
     }
-    return positionalArguments
+    return positionalArguments.filter { URL(fileURLWithPath: $0).pathExtension == "swift" }
 }
 
 extension Profiling {
diff --git a/Plugins/BridgeJS/Sources/BridgeJSToolInternal/BridgeJSToolInternal.swift b/Plugins/BridgeJS/Sources/BridgeJSToolInternal/BridgeJSToolInternal.swift
index f4de24093..f57f50756 100644
--- a/Plugins/BridgeJS/Sources/BridgeJSToolInternal/BridgeJSToolInternal.swift
+++ b/Plugins/BridgeJS/Sources/BridgeJSToolInternal/BridgeJSToolInternal.swift
@@ -60,6 +60,11 @@ import ArgumentParser
                 swiftToSkeleton.addSourceFile(sourceFile, inputFilePath: inputFile)
             }
             let skeleton = try swiftToSkeleton.finalize()
+            for (file, diagnostic) in swiftToSkeleton.warnings {
+                FileHandle.standardError.write(
+                    Data((diagnostic.formattedDescription(fileName: file, colorize: false) + "\n").utf8)
+                )
+            }
             let encoder = JSONEncoder()
             encoder.outputFormatting = [.prettyPrinted, .sortedKeys]
             let skeletonData = try encoder.encode(skeleton)
@@ -93,7 +98,8 @@ import ArgumentParser
                     skeleton: $0
                 ).finalize()
             }
-            let combinedSwift = [exported, imported].compactMap { $0 }
+            let typeRegistration = GenericTypeRegistrationCodegen().render(for: skeleton)
+            let combinedSwift = [exported, imported, typeRegistration].compactMap { $0 }
             print(combinedSwift.joined(separator: "\n\n"))
         }
     }
@@ -104,7 +110,7 @@ import ArgumentParser
             let skeletonData = try readData(from: skeletonFile)
             skeletons.append(try JSONDecoder().decode(BridgeJSSkeleton.self, from: skeletonData))
         }
-        let link = BridgeJSLink(skeletons: skeletons, sharedMemory: false)
+        let link = BridgeJSLink(skeletons: skeletons)
         return try link.link()
     }
 
@@ -117,8 +123,7 @@ import ArgumentParser
         var skeletonFiles: [String]
 
         func run() throws {
-            let (outputJs, _) = try linkSkeletons(skeletonFiles: skeletonFiles)
-            print(outputJs)
+            print(try linkSkeletons(skeletonFiles: skeletonFiles).outputJs)
         }
     }
 
@@ -131,8 +136,7 @@ import ArgumentParser
         var skeletonFiles: [String]
 
         func run() throws {
-            let (_, outputDts) = try linkSkeletons(skeletonFiles: skeletonFiles)
-            print(outputDts)
+            print(try linkSkeletons(skeletonFiles: skeletonFiles).outputDts)
         }
     }
 }
diff --git a/Plugins/BridgeJS/Sources/BridgeJSUtilities/JavaScriptModulePath.swift b/Plugins/BridgeJS/Sources/BridgeJSUtilities/JavaScriptModulePath.swift
new file mode 100644
index 000000000..8067f7233
--- /dev/null
+++ b/Plugins/BridgeJS/Sources/BridgeJSUtilities/JavaScriptModulePath.swift
@@ -0,0 +1,25 @@
+import Foundation
+
+public enum JavaScriptModulePath {
+    public static func resolve(_ path: String, relativeTo targetDirectory: URL) -> URL? {
+        let lowercasedPath = path.lowercased()
+        guard path.hasPrefix("/"),
+            !path.split(separator: "/").contains(".."),
+            lowercasedPath.hasSuffix(".js") || lowercasedPath.hasSuffix(".mjs")
+        else {
+            return nil
+        }
+
+        let targetRoot = targetDirectory.standardizedFileURL
+        let file = URL(fileURLWithPath: targetRoot.path + path).standardizedFileURL
+        let targetPrefix = targetRoot.path.hasSuffix("/") ? targetRoot.path : targetRoot.path + "/"
+        guard file.path.hasPrefix(targetPrefix) else {
+            return nil
+        }
+        return file
+    }
+
+    public static func isRegularFile(at url: URL) -> Bool {
+        (try? url.resourceValues(forKeys: [.isRegularFileKey]))?.isRegularFile == true
+    }
+}
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/BridgeJSCodegenTests.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/BridgeJSCodegenTests.swift
index 8b8e8b8a2..11347dc40 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/BridgeJSCodegenTests.swift
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/BridgeJSCodegenTests.swift
@@ -4,6 +4,7 @@ import SwiftParser
 import Testing
 
 @testable import BridgeJSCore
+@testable import BridgeJSLink
 @testable import BridgeJSSkeleton
 
 @Suite struct BridgeJSCodegenTests {
@@ -13,6 +14,106 @@ import Testing
     static let multifileInputsDirectory = URL(fileURLWithPath: #filePath).deletingLastPathComponent()
         .appendingPathComponent("Inputs").appendingPathComponent("MacroSwift").appendingPathComponent("Multifile")
 
+    @Test
+    func javaScriptModuleReferencesAreStoredWithoutSourceContents() throws {
+        let modulePath = "/Modules/math.mjs"
+        let swiftSource = """
+            @JSFunction(from: .snippet("/Modules/math.mjs"))
+            func add(_ lhs: Int, _ rhs: Int) throws(JSException) -> Int
+
+            @JSGetter(jsName: "version", from: .snippet("/Modules/math.mjs"))
+            var moduleVersion: String
+            """
+        var validationCount = 0
+        let generator = SwiftToSkeleton(
+            progress: .silent,
+            moduleName: "TestModule",
+            exposeToGlobal: false,
+            externalModuleIndex: .empty,
+            javaScriptModuleExists: {
+                validationCount += 1
+                return $0 == modulePath
+            }
+        )
+        generator.addSourceFile(Parser.parse(source: swiftSource), inputFilePath: "Imports.swift")
+        let skeleton = try generator.finalize()
+        let encoded = String(decoding: try JSONEncoder().encode(skeleton), as: UTF8.self)
+        let imported = try #require(skeleton.imported)
+
+        #expect(validationCount == 1)
+        #expect(imported.children.flatMap(\.functions).first?.from == .snippet(modulePath))
+        #expect(!encoded.contains(#""modules""#))
+    }
+
+    @Test
+    func invalidJSImportFromValueFailsToDecode() {
+        #expect(throws: DecodingError.self) {
+            try JSONDecoder().decode(JSImportFrom.self, from: Data(#""module.js""#.utf8))
+        }
+        // A bare path string is no longer an origin at all; snippets are tagged.
+        #expect(throws: DecodingError.self) {
+            try JSONDecoder().decode(JSImportFrom.self, from: Data(#""/Modules/utils.mjs""#.utf8))
+        }
+    }
+
+    @Test(arguments: [
+        JSImportFrom.global,
+        JSImportFrom.snippet("/Modules/utils.mjs"),
+        JSImportFrom.module("node:path"),
+        JSImportFrom.module("@scope/package/sub"),
+        // A package literally named "global" is why specifiers are encoded as tagged
+        // objects rather than plain strings: a plain string would be indistinguishable
+        // from the `.global` sentinel.
+        JSImportFrom.module("global"),
+        JSImportFrom.module("#internal"),
+        JSImportFrom.module("https://esm.sh/lodash@4"),
+    ])
+    func jsImportFromRoundTrips(origin: JSImportFrom) throws {
+        let encoded = try JSONEncoder().encode(origin)
+        #expect(try JSONDecoder().decode(JSImportFrom.self, from: encoded) == origin)
+    }
+
+    @Test
+    func originsEncodeToTheirDocumentedShapes() throws {
+        let encoder = JSONEncoder()
+        encoder.outputFormatting = [.sortedKeys]
+        #expect(String(data: try encoder.encode(JSImportFrom.global), encoding: .utf8) == #""global""#)
+        #expect(
+            String(data: try encoder.encode(JSImportFrom.snippet("/a.js")), encoding: .utf8)
+                == #"{"kind":"snippet","path":"\/a.js"}"#
+        )
+        #expect(
+            String(data: try encoder.encode(JSImportFrom.module("node:path")), encoding: .utf8)
+                == #"{"kind":"module","specifier":"node:path"}"#
+        )
+    }
+
+    @Test
+    func unknownJSImportFromKindFailsToDecode() {
+        #expect(throws: DecodingError.self) {
+            try JSONDecoder().decode(
+                JSImportFrom.self,
+                from: Data(#"{"kind": "somethingElse", "specifier": "x"}"#.utf8)
+            )
+        }
+    }
+
+    /// The keyed form must reject what the string form rejects, so a specifier cannot reach
+    /// code generation through the tagged object that the plain-string path would refuse.
+    @Test(arguments: [
+        #"{"kind": "module", "specifier": ""}"#,
+        #"{"kind": "module", "specifier": "./relative.mjs"}"#,
+        #"{"kind": "module", "specifier": "/../../escape.mjs"}"#,
+        #"{"kind": "snippet", "path": "node:path"}"#,
+        #"{"kind": "snippet", "path": "/../../escape.mjs"}"#,
+        #"{"kind": "snippet", "path": "relative.mjs"}"#,
+    ])
+    func invalidKeyedJSImportFromFailsToDecode(json: String) {
+        #expect(throws: DecodingError.self) {
+            try JSONDecoder().decode(JSImportFrom.self, from: Data(json.utf8))
+        }
+    }
+
     private func snapshotCodegen(
         skeleton: BridgeJSSkeleton,
         name: String,
@@ -40,6 +141,9 @@ import Testing
                 swiftParts.append(s)
             }
         }
+        if let typeRegistration = GenericTypeRegistrationCodegen().render(for: skeleton) {
+            swiftParts.append(typeRegistration)
+        }
         let combinedSwift =
             swiftParts
             .map { $0.trimmingCharacters(in: .newlines) }
@@ -66,6 +170,17 @@ import Testing
         )
     }
 
+    /// Target-local JavaScript module files that each input pretends to have on disk.
+    static let existingModulePaths: [String: Set<String>] = [
+        "JSImportModule.swift": [
+            "/Modules/JSImportModule.mjs",
+            "/Modules/ModuleCounter.mjs",
+        ],
+        "JSImportBareModule.swift": [
+            "/Modules/DefaultExport.mjs"
+        ],
+    ]
+
     static func collectInputs() -> [String] {
         let fileManager = FileManager.default
         let inputs = try! fileManager.contentsOfDirectory(atPath: Self.inputsDirectory.path)
@@ -77,11 +192,13 @@ import Testing
         let url = Self.inputsDirectory.appendingPathComponent(input)
         let name = url.deletingPathExtension().lastPathComponent
         let sourceFile = Parser.parse(source: try String(contentsOf: url, encoding: .utf8))
+        let modulePaths = Self.existingModulePaths[input] ?? []
         let swiftAPI = SwiftToSkeleton(
             progress: .silent,
             moduleName: "TestModule",
             exposeToGlobal: false,
-            externalModuleIndex: .empty
+            externalModuleIndex: .empty,
+            javaScriptModuleExists: { modulePaths.contains($0) }
         )
         swiftAPI.addSourceFile(sourceFile, inputFilePath: input)
         let skeleton = try swiftAPI.finalize()
@@ -219,6 +336,52 @@ import Testing
         try snapshotCodegen(skeleton: skeleton, name: "CrossFileExtension")
     }
 
+    @Test
+    func codegenCrossFileNestedTypeExtension() throws {
+        let swiftAPI = SwiftToSkeleton(
+            progress: .silent,
+            moduleName: "TestModule",
+            exposeToGlobal: false,
+            externalModuleIndex: .empty
+        )
+        let classURL = Self.multifileInputsDirectory.appendingPathComponent("CrossFileNestedTypeClass.swift")
+        swiftAPI.addSourceFile(
+            Parser.parse(source: try String(contentsOf: classURL, encoding: .utf8)),
+            inputFilePath: "CrossFileNestedTypeClass.swift"
+        )
+        let extensionURL = Self.multifileInputsDirectory.appendingPathComponent("CrossFileNestedTypeExtension.swift")
+        swiftAPI.addSourceFile(
+            Parser.parse(source: try String(contentsOf: extensionURL, encoding: .utf8)),
+            inputFilePath: "CrossFileNestedTypeExtension.swift"
+        )
+        let skeleton = try swiftAPI.finalize()
+        try snapshotCodegen(skeleton: skeleton, name: "CrossFileNestedTypeExtension")
+    }
+
+    @Test
+    func codegenCrossFileExtensionOrderIndependence() throws {
+        let swiftAPI = SwiftToSkeleton(
+            progress: .silent,
+            moduleName: "TestModule",
+            exposeToGlobal: false,
+            externalModuleIndex: .empty
+        )
+        let memberURL = Self.multifileInputsDirectory.appendingPathComponent("CrossFileExtensionOrderMember.swift")
+        swiftAPI.addSourceFile(
+            Parser.parse(source: try String(contentsOf: memberURL, encoding: .utf8)),
+            inputFilePath: "CrossFileExtensionOrderMember.swift"
+        )
+        let typeURL = Self.multifileInputsDirectory.appendingPathComponent("CrossFileExtensionOrderType.swift")
+        swiftAPI.addSourceFile(
+            Parser.parse(source: try String(contentsOf: typeURL, encoding: .utf8)),
+            inputFilePath: "CrossFileExtensionOrderType.swift"
+        )
+        let skeleton = try swiftAPI.finalize()
+        let record = skeleton.exported?.structs.first { $0.swiftCallName == "Archive.Record" }
+        #expect(record?.methods.map(\.name) == ["describeRecord"])
+        try snapshotCodegen(skeleton: skeleton, name: "CrossFileExtensionOrderIndependence")
+    }
+
     @Test
     func codegenSkipsEmptySkeletons() throws {
         let swiftAPI = SwiftToSkeleton(
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/BridgeJSLinkTests.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/BridgeJSLinkTests.swift
index 2f3f46fdb..f96ec2d8d 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/BridgeJSLinkTests.swift
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/BridgeJSLinkTests.swift
@@ -14,13 +14,13 @@ import Testing
         function: String = #function,
         sourceLocation: Testing.SourceLocation = #_sourceLocation
     ) throws {
-        let (outputJs, outputDts) = try bridgeJSLink.link()
+        let output = try bridgeJSLink.link()
         try assertSnapshot(
             name: name,
             filePath: filePath,
             function: function,
             sourceLocation: sourceLocation,
-            input: outputJs.data(using: .utf8)!,
+            input: output.outputJs.data(using: .utf8)!,
             fileExtension: "js"
         )
         try assertSnapshot(
@@ -28,7 +28,7 @@ import Testing
             filePath: filePath,
             function: function,
             sourceLocation: sourceLocation,
-            input: outputDts.data(using: .utf8)!,
+            input: output.outputDts.data(using: .utf8)!,
             fileExtension: "d.ts"
         )
     }
@@ -37,6 +37,17 @@ import Testing
         "Inputs"
     ).appendingPathComponent("MacroSwift")
 
+    /// Target-local JavaScript module files that each input pretends to have on disk.
+    static let existingModulePaths: [String: Set<String>] = [
+        "JSImportModule.swift": [
+            "/Modules/JSImportModule.mjs",
+            "/Modules/ModuleCounter.mjs",
+        ],
+        "JSImportBareModule.swift": [
+            "/Modules/DefaultExport.mjs"
+        ],
+    ]
+
     static func collectInputs(extension: String) -> [String] {
         let fileManager = FileManager.default
         let inputs = try! fileManager.contentsOfDirectory(atPath: Self.inputsDirectory.path)
@@ -49,15 +60,17 @@ import Testing
         let name = url.deletingPathExtension().lastPathComponent
 
         let sourceFile = Parser.parse(source: try String(contentsOf: url, encoding: .utf8))
+        let modulePaths = Self.existingModulePaths[input] ?? []
         let importSwift = SwiftToSkeleton(
             progress: .silent,
             moduleName: "TestModule",
             exposeToGlobal: false,
-            externalModuleIndex: .empty
+            externalModuleIndex: .empty,
+            javaScriptModuleExists: { modulePaths.contains($0) }
         )
         importSwift.addSourceFile(sourceFile, inputFilePath: "\(name).swift")
         let importResult = try importSwift.finalize()
-        var bridgeJSLink = BridgeJSLink(sharedMemory: false)
+        var bridgeJSLink = BridgeJSLink()
         let encoder = JSONEncoder()
         encoder.outputFormatting = [.prettyPrinted, .sortedKeys]
         let unifiedData = try encoder.encode(importResult)
@@ -86,8 +99,7 @@ import Testing
         let bridgeJSLink: BridgeJSLink = BridgeJSLink(
             skeletons: [
                 outputSkeleton
-            ],
-            sharedMemory: false
+            ]
         )
         try snapshot(bridgeJSLink: bridgeJSLink, name: name + ".Global")
     }
@@ -120,12 +132,31 @@ import Testing
             skeletons: [
                 globalSkeleton,
                 privateSkeleton,
-            ],
-            sharedMemory: false
+            ]
         )
         try snapshot(bridgeJSLink: bridgeJSLink, name: "MixedModules")
     }
 
+    private func linkedJS(forFixture input: String) throws -> String {
+        let url = Self.inputsDirectory.appendingPathComponent(input)
+        let name = url.deletingPathExtension().lastPathComponent
+        let sourceFile = Parser.parse(source: try String(contentsOf: url, encoding: .utf8))
+        let importSwift = SwiftToSkeleton(
+            progress: .silent,
+            moduleName: "TestModule",
+            exposeToGlobal: false,
+            externalModuleIndex: .empty
+        )
+        importSwift.addSourceFile(sourceFile, inputFilePath: "\(name).swift")
+        let importResult = try importSwift.finalize()
+        var bridgeJSLink = BridgeJSLink()
+        let encoder = JSONEncoder()
+        encoder.outputFormatting = [.prettyPrinted, .sortedKeys]
+        let unifiedData = try encoder.encode(importResult)
+        try bridgeJSLink.addSkeletonFile(data: unifiedData)
+        return try bridgeJSLink.link().0
+    }
+
     @Test
     func perClassIdentityModeFromAnnotation() throws {
         let url = Self.inputsDirectory.appendingPathComponent("IdentityModeClass.swift")
@@ -149,7 +180,7 @@ import Testing
         #expect(explicitlyUncachedClass?.identityMode == false)
 
         // Verify generated JS via snapshot
-        let bridgeJSLink = BridgeJSLink(skeletons: [outputSkeleton], sharedMemory: false)
+        let bridgeJSLink = BridgeJSLink(skeletons: [outputSkeleton])
         try snapshot(bridgeJSLink: bridgeJSLink, name: "IdentityModeClass.PerClass")
     }
 
@@ -173,7 +204,7 @@ import Testing
         #expect(explicitlyUncachedClass?.identityMode == false)
 
         // Verify generated JS via snapshot
-        let bridgeJSLink = BridgeJSLink(skeletons: [outputSkeleton], sharedMemory: false)
+        let bridgeJSLink = BridgeJSLink(skeletons: [outputSkeleton])
         try snapshot(bridgeJSLink: bridgeJSLink, name: "IdentityModeClass.ConfigPointer")
     }
 }
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/ClosureAsyncDiagnosticsTests.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/ClosureAsyncDiagnosticsTests.swift
new file mode 100644
index 000000000..55d9e1bd3
--- /dev/null
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/ClosureAsyncDiagnosticsTests.swift
@@ -0,0 +1,151 @@
+import Foundation
+import SwiftParser
+import SwiftSyntax
+import Testing
+
+@testable import BridgeJSCore
+@testable import BridgeJSSkeleton
+
+@Suite struct ClosureAsyncDiagnosticsTests {
+    @Test
+    func parsesAsyncClosureParameter() throws {
+        let app = try resolveApp(
+            source: """
+                @JS public func process(_ cb: (Int) async -> String) {}
+                """
+        )
+        let function = try #require(app.exported?.functions.first(where: { $0.name == "process" }))
+        let parameter = try #require(function.parameters.first)
+        guard case .closure(let signature, _) = parameter.type else {
+            Issue.record("Expected closure parameter type, got \(parameter.type)")
+            return
+        }
+        #expect(signature.isAsync)
+    }
+
+    @Test
+    func collectsResolveRejectSignaturesForAsyncClosure() throws {
+        let app = try resolveApp(
+            source: """
+                @JS public func process(_ cb: (Int) async -> String) {}
+                """
+        )
+        let signatures = collectSignatures(from: app)
+
+        let reject = ClosureSignature(
+            parameters: [.jsValue],
+            returnType: .void,
+            moduleName: "App",
+            sendingParameters: true
+        )
+        let resolve = ClosureSignature(
+            parameters: [.string],
+            returnType: .void,
+            moduleName: "App",
+            sendingParameters: true
+        )
+
+        #expect(signatures.contains(reject))
+        #expect(signatures.contains(resolve))
+    }
+
+    @Test
+    func collectsVoidResolveSignatureForVoidReturningAsyncClosure() throws {
+        let app = try resolveApp(
+            source: """
+                @JS public func process(_ cb: (Int) async -> Void) {}
+                """
+        )
+        let signatures = collectSignatures(from: app)
+
+        let reject = ClosureSignature(
+            parameters: [.jsValue],
+            returnType: .void,
+            moduleName: "App",
+            sendingParameters: true
+        )
+        let voidResolve = ClosureSignature(
+            parameters: [],
+            returnType: .void,
+            moduleName: "App"
+        )
+
+        #expect(signatures.contains(reject))
+        #expect(signatures.contains(voidResolve))
+    }
+
+    @Test
+    func supportsAsyncClosureReturningJSStruct() throws {
+        let app = try resolveApp(
+            source: """
+                @JS struct Point { var x: Int }
+                @JS public func makePoint() -> JSTypedClosure<(Int) async -> Point> {
+                    fatalError()
+                }
+                """
+        )
+        let resolveTypes = try #require(app.exported?.asyncPromiseResolveReturnTypes)
+        #expect(resolveTypes.contains { $0.mangleTypeName == "5PointV" })
+    }
+
+    @Test
+    func supportsAsyncThrowsClosureReturningJSStruct() throws {
+        let app = try resolveApp(
+            source: """
+                @JS struct Point { var x: Int }
+                @JS public func makePoint() -> JSTypedClosure<(Int) async throws(JSException) -> Point> {
+                    fatalError()
+                }
+                """
+        )
+        let resolveTypes = try #require(app.exported?.asyncPromiseResolveReturnTypes)
+        #expect(resolveTypes.contains { $0.mangleTypeName == "5PointV" })
+    }
+
+    @Test
+    func supportsAsyncClosureReturningAssociatedValueEnum() throws {
+        let app = try resolveApp(
+            source: """
+                @JS enum Shape { case circle(radius: Double); case square(side: Double) }
+                @JS public func process(_ cb: (Int) async -> Shape) {}
+                """
+        )
+        let resolveTypes = try #require(app.exported?.asyncPromiseResolveReturnTypes)
+        #expect(resolveTypes.contains { $0.mangleTypeName == "5ShapeO" })
+    }
+
+    @Test
+    func supportsAsyncThrowsClosureReturningAssociatedValueEnum() throws {
+        let app = try resolveApp(
+            source: """
+                @JS enum Shape { case circle(radius: Double); case square(side: Double) }
+                @JS public func makeShape() -> JSTypedClosure<(Int) async throws(JSException) -> Shape> {
+                    fatalError()
+                }
+                """
+        )
+        let resolveTypes = try #require(app.exported?.asyncPromiseResolveReturnTypes)
+        #expect(resolveTypes.contains { $0.mangleTypeName == "5ShapeO" })
+    }
+
+    // MARK: - Utilities
+
+    private func collectSignatures(from skeleton: BridgeJSSkeleton) -> Set<ClosureSignature> {
+        let collector = ClosureSignatureCollectorVisitor(moduleName: skeleton.moduleName)
+        var walker = BridgeSkeletonWalker(visitor: collector)
+        walker.walk(skeleton)
+        return walker.visitor.signatures
+    }
+
+    private func resolveApp(source appSource: String) throws -> BridgeJSSkeleton {
+        let swiftAPI = SwiftToSkeleton(
+            progress: .silent,
+            moduleName: "App",
+            exposeToGlobal: false,
+            externalModuleIndex: ExternalModuleIndex(dependencies: [])
+        )
+        let sourceFile = Parser.parse(source: appSource)
+        swiftAPI.addSourceFile(sourceFile, inputFilePath: "App.swift")
+        return try swiftAPI.finalize()
+    }
+}
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/ClosureManglingTests.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/ClosureManglingTests.swift
new file mode 100644
index 000000000..3675c805a
--- /dev/null
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/ClosureManglingTests.swift
@@ -0,0 +1,30 @@
+import Testing
+
+@testable import BridgeJSSkeleton
+
+@Suite struct ClosureManglingTests {
+    private func sig(async a: Bool, throws t: Bool) -> ClosureSignature {
+        ClosureSignature(
+            parameters: [.integer(.int)],
+            returnType: .integer(.int),
+            moduleName: "M",
+            isAsync: a,
+            isThrows: t
+        )
+    }
+
+    @Test func effectsDisambiguateMangle() {
+        let plain = sig(async: false, throws: false).mangleName
+        let thr = sig(async: false, throws: true).mangleName
+        let asy = sig(async: true, throws: false).mangleName
+        let both = sig(async: true, throws: true).mangleName
+        #expect(Set([plain, thr, asy, both]).count == 4)
+        #expect(thr.contains("K"))
+        #expect(asy.contains("Ya"))
+        if let ya = both.range(of: "Ya"), let k = both.range(of: "K") {
+            #expect(ya.lowerBound < k.lowerBound)
+        } else {
+            Issue.record("expected both Ya and K in async-throws mangle")
+        }
+    }
+}
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/ClosureThrowsDiagnosticsTests.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/ClosureThrowsDiagnosticsTests.swift
new file mode 100644
index 000000000..eb41d0132
--- /dev/null
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/ClosureThrowsDiagnosticsTests.swift
@@ -0,0 +1,56 @@
+import Foundation
+import SwiftParser
+import SwiftSyntax
+import Testing
+
+@testable import BridgeJSCore
+@testable import BridgeJSSkeleton
+
+@Suite struct ClosureThrowsDiagnosticsTests {
+    @Test
+    func parsesThrowsJSExceptionClosureParameter() throws {
+        let app = try resolveApp(
+            source: """
+                @JS public func process(_ cb: (Int) throws(JSException) -> Int) {}
+                """
+        )
+        let function = try #require(app.exported?.functions.first(where: { $0.name == "process" }))
+        let parameter = try #require(function.parameters.first)
+        guard case .closure(let signature, _) = parameter.type else {
+            Issue.record("Expected closure parameter type, got \(parameter.type)")
+            return
+        }
+        #expect(signature.isThrows)
+        #expect(!signature.isAsync)
+    }
+
+    @Test
+    func rejectsPlainThrowsClosureParameter() throws {
+        do {
+            _ = try resolveApp(
+                source: """
+                    @JS public func process(_ cb: (Int) throws -> Int) {}
+                    """
+            )
+            Issue.record("Expected a plain-throws closure diagnostic, but resolution succeeded")
+        } catch let error as BridgeJSCoreDiagnosticError {
+            let combined = error.diagnostics.map(\.diagnostic.message).joined(separator: "\n")
+            #expect(combined.contains("JSException"))
+            #expect(!combined.contains("Throws is not supported for Swift closures yet."))
+        }
+    }
+
+    // MARK: - Utilities
+
+    private func resolveApp(source appSource: String) throws -> BridgeJSSkeleton {
+        let swiftAPI = SwiftToSkeleton(
+            progress: .silent,
+            moduleName: "App",
+            exposeToGlobal: false,
+            externalModuleIndex: ExternalModuleIndex(dependencies: [])
+        )
+        let sourceFile = Parser.parse(source: appSource)
+        swiftAPI.addSourceFile(sourceFile, inputFilePath: "App.swift")
+        return try swiftAPI.finalize()
+    }
+}
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/CodegenTestSupport.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/CodegenTestSupport.swift
new file mode 100644
index 000000000..b66a5ba6f
--- /dev/null
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/CodegenTestSupport.swift
@@ -0,0 +1,40 @@
+import Foundation
+import SwiftParser
+import SwiftSyntax
+import Testing
+
+@testable import BridgeJSLink
+@testable import BridgeJSCore
+@testable import BridgeJSSkeleton
+
+func makeSkeleton(
+    _ source: String,
+    moduleName: String = "TestModule",
+    dependencies: [(moduleName: String, skeleton: BridgeJSSkeleton)] = []
+) throws -> BridgeJSSkeleton {
+    let swiftAPI = SwiftToSkeleton(
+        progress: .silent,
+        moduleName: moduleName,
+        exposeToGlobal: false,
+        externalModuleIndex: ExternalModuleIndex(dependencies: dependencies)
+    )
+    swiftAPI.addSourceFile(Parser.parse(source: source), inputFilePath: "\(moduleName).swift")
+    return try swiftAPI.finalize()
+}
+
+func expectDiagnostic(
+    source: String,
+    moduleName: String = "App",
+    contains message: String,
+    sourceLocation: Testing.SourceLocation = #_sourceLocation
+) {
+    do {
+        _ = try makeSkeleton(source, moduleName: moduleName)
+        Issue.record("Expected diagnostic but resolution succeeded", sourceLocation: sourceLocation)
+    } catch let error as BridgeJSCoreDiagnosticError {
+        let combined = error.diagnostics.map(\.diagnostic.message).joined(separator: "\n")
+        #expect(combined.contains(message), sourceLocation: sourceLocation)
+    } catch {
+        Issue.record("Unexpected error: \(error)", sourceLocation: sourceLocation)
+    }
+}
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/CrossModuleResolutionTests.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/CrossModuleResolutionTests.swift
index 4f12a88fa..3f0ee88db 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/CrossModuleResolutionTests.swift
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/CrossModuleResolutionTests.swift
@@ -457,6 +457,36 @@ import Testing
         }
     }
 
+    @Test
+    func crossModuleChainedJSAsDiagnostic() throws {
+        let core = try buildDependencySkeleton(
+            moduleName: "Core",
+            source: """
+                @JS(as: Box.self) public struct Wrapped {
+                    public consuming func bridgeToJS() -> Box { fatalError() }
+                    public static func bridgeFromJS(_ value: consuming Box) -> Wrapped { fatalError() }
+                }
+                @JS public final class Box { @JS public init() {} }
+                """
+        )
+        do {
+            _ = try resolveApp(
+                source: """
+                    import Core
+                    @JS(as: Wrapped.self) public struct Doubly {
+                        public consuming func bridgeToJS() -> Wrapped { fatalError() }
+                        public static func bridgeFromJS(_ value: consuming Wrapped) -> Doubly { fatalError() }
+                    }
+                    """,
+                dependencies: [(moduleName: "Core", skeleton: core)]
+            )
+            Issue.record("Expected chained-alias diagnostic for cross-module `@JS(as:)` target")
+        } catch let error as BridgeJSCoreDiagnosticError {
+            let combinedMessages = error.diagnostics.map(\.diagnostic.message).joined(separator: "\n")
+            #expect(combinedMessages.contains("not another `@JS(as:)` type"))
+        }
+    }
+
     // MARK: - Utillites
 
     private func resolveApp(
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/DiagnosticsTests.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/DiagnosticsTests.swift
index e71a1f84e..4f45a9880 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/DiagnosticsTests.swift
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/DiagnosticsTests.swift
@@ -1,3 +1,4 @@
+import Foundation
 import SwiftParser
 import SwiftSyntax
 import Testing
@@ -6,6 +7,254 @@ import Testing
 @testable import BridgeJSSkeleton
 
 @Suite struct DiagnosticsTests {
+    private func moduleDiagnostics(source: String) -> BridgeJSCoreDiagnosticError? {
+        let swiftAPI = SwiftToSkeleton(
+            progress: .silent,
+            moduleName: "TestModule",
+            exposeToGlobal: false,
+            externalModuleIndex: .empty
+        )
+        swiftAPI.addSourceFile(Parser.parse(source: source), inputFilePath: "test.swift")
+        do {
+            _ = try swiftAPI.finalize()
+            return nil
+        } catch let error as BridgeJSCoreDiagnosticError {
+            return error
+        } catch {
+            Issue.record("Unexpected error: \(error)")
+            return nil
+        }
+    }
+
+    @Test
+    func extensionOfUnknownTypeWithJSMemberProducesDiagnostic() throws {
+        let source = """
+            extension Unknown {
+                @JS func bridged() -> Int { 42 }
+            }
+            """
+        let diagnostics = try #require(moduleDiagnostics(source: source))
+        #expect(diagnostics.description.contains("Unsupported type 'Unknown'"))
+    }
+
+    @Test
+    func extensionWithoutJSMembersIsIgnored() throws {
+        let source = """
+            extension String {
+                func helper() -> Int { 42 }
+            }
+            """
+        #expect(moduleDiagnostics(source: source) == nil)
+    }
+
+    @Test
+    func invalidJSMemberInsideExtensionProducesDiagnostic() throws {
+        let source = """
+            @JS class Host {
+                @JS init() {}
+            }
+
+            extension Host {
+                @JS struct Bad {
+                    var field = 1
+                }
+            }
+            """
+        let diagnostics = try #require(moduleDiagnostics(source: source))
+        #expect(diagnostics.description.contains("Struct field must have explicit type annotation"))
+    }
+
+    @Test
+    func missingJavaScriptModuleProducesDiagnostic() throws {
+        let source = """
+            let unrelated = 0
+            @JSFunction(from: .snippet("/missing.js")) func imported() throws(JSException)
+            """
+        let diagnostics = try #require(moduleDiagnostics(source: source))
+        #expect(diagnostics.description.contains("JavaScript snippet file was not found at '/missing.js'"))
+        #expect(diagnostics.description.contains("test.swift:2:28:"))
+    }
+
+    @Test
+    func bareJavaScriptModuleSpecifierIsAccepted() throws {
+        let source = """
+            let unrelated = 0
+            @JSFunction(jsName: "basename", from: .module("node:path")) func imported() throws(JSException)
+            """
+        #expect(moduleDiagnostics(source: source) == nil)
+    }
+
+    @Test
+    func relativeJavaScriptModuleSpecifierIsRejected() throws {
+        let source = """
+            let unrelated = 0
+            @JSFunction(from: .module("./missing.js")) func imported() throws(JSException)
+            """
+        let diagnostics = try #require(moduleDiagnostics(source: source))
+        #expect(diagnostics.description.contains("Relative JavaScript module specifiers are not supported"))
+        #expect(diagnostics.description.contains("test.swift:2:27:"))
+    }
+
+    @Test
+    func emptyJavaScriptModuleSpecifierIsRejected() throws {
+        let source = """
+            let unrelated = 0
+            @JSFunction(from: .module("")) func imported() throws(JSException)
+            """
+        let diagnostics = try #require(moduleDiagnostics(source: source))
+        #expect(diagnostics.description.contains("JavaScript module specifier must not be empty."))
+    }
+
+    @Test
+    func defaultExportRequiresModuleOrigin() throws {
+        let source = """
+            let unrelated = 0
+            @JSFunction(jsName: .default) func imported() throws(JSException)
+            """
+        let diagnostics = try #require(moduleDiagnostics(source: source))
+        #expect(
+            diagnostics.description.contains(
+                "'jsName: .default' requires 'from: .module(...)' or 'from: .snippet(...)'."
+            )
+        )
+    }
+
+    @Test
+    func defaultExportIsRejectedForGlobalOrigin() throws {
+        let source = """
+            let unrelated = 0
+            @JSFunction(jsName: .default, from: .global) func imported() throws(JSException)
+            """
+        let diagnostics = try #require(moduleDiagnostics(source: source))
+        #expect(diagnostics.description.contains("globalThis has no default export"))
+    }
+
+    @Test
+    func defaultExportIsRejectedForSetter() throws {
+        let source = """
+            @JSClass(from: .module("node:fs")) struct Wrapper {
+                @JSSetter(jsName: .default) func setValue(_ value: Int) throws(JSException)
+            }
+            """
+        let diagnostics = try #require(moduleDiagnostics(source: source))
+        #expect(diagnostics.description.contains("ECMAScript module bindings are read-only"))
+    }
+
+    @Test
+    func defaultExportIsRejectedForClassMember() throws {
+        let source = """
+            @JSClass(from: .module("node:fs")) struct Wrapper {
+                @JSFunction(jsName: .default) func value() throws(JSException) -> Int
+            }
+            """
+        let diagnostics = try #require(moduleDiagnostics(source: source))
+        #expect(diagnostics.description.contains("is not supported on a class member"))
+    }
+
+    /// `jsName: nil` is valid Swift and means the same as omitting the argument.
+    @Test
+    func explicitNilJSNameIsAccepted() throws {
+        let source = """
+            let unrelated = 0
+            @JSFunction(jsName: nil, from: .global) func imported() throws(JSException)
+            """
+        #expect(moduleDiagnostics(source: source) == nil)
+    }
+
+    /// `JSName.name(_:)` is public and documented, so its explicit spelling must work.
+    @Test
+    func explicitNameCaseSpellingIsAccepted() throws {
+        let source = """
+            let unrelated = 0
+            @JSFunction(jsName: .name("basename"), from: .module("node:path")) func imported() throws(JSException)
+            """
+        #expect(moduleDiagnostics(source: source) == nil)
+    }
+
+    @Test
+    func jsNameMustBeStringLiteralOrDefault() throws {
+        let source = """
+            let name = "basename"
+            @JSFunction(jsName: name, from: .module("node:path")) func imported() throws(JSException)
+            """
+        let diagnostics = try #require(moduleDiagnostics(source: source))
+        #expect(diagnostics.description.contains("jsName must be a string literal or '.default'."))
+    }
+
+    /// A rooted path in `.module(...)` is the most likely mistake now that the two cases
+    /// are separate, so it must point at `.snippet(...)` rather than being passed to the
+    /// JavaScript resolver where it would fail much later.
+    @Test
+    func rootedPathInModuleSuggestsSnippet() throws {
+        let source = """
+            let unrelated = 0
+            @JSFunction(from: .module("/Modules/utils.mjs")) func imported() throws(JSException)
+            """
+        let diagnostics = try #require(moduleDiagnostics(source: source))
+        #expect(diagnostics.description.contains("looks like a file in this target"))
+        #expect(diagnostics.description.contains(#"from: .snippet("/Modules/utils.mjs")"#))
+    }
+
+    /// The reverse mistake: a bare specifier in `.snippet(...)` must point at `.module(...)`.
+    @Test
+    func bareSpecifierInSnippetSuggestsModule() throws {
+        let source = """
+            let unrelated = 0
+            @JSFunction(from: .snippet("node:path")) func imported() throws(JSException)
+            """
+        let diagnostics = try #require(moduleDiagnostics(source: source))
+        #expect(diagnostics.description.contains("JavaScript snippet paths must start with '/'"))
+        #expect(diagnostics.description.contains(#"from: .module("node:path")"#))
+    }
+
+    /// A snippet origin may also name a default export.
+    @Test
+    func defaultExportIsAcceptedForSnippetOrigin() throws {
+        let source = """
+            let unrelated = 0
+            @JSGetter(jsName: .default, from: .snippet("/Modules/utils.mjs")) var value: JSObject
+            """
+        let diagnostics = try #require(moduleDiagnostics(source: source))
+        // The file does not exist in this fixture, so the missing file must be the only
+        // complaint. Match on the diagnostic wording, not on `.default` itself, since the
+        // rendered diagnostic echoes the source line back.
+        #expect(diagnostics.description.contains("JavaScript snippet file was not found"))
+        #expect(!diagnostics.description.contains("requires 'from:"))
+    }
+
+    @Test
+    func javaScriptModulePathMustNotTraverse() throws {
+        let source = """
+            let unrelated = 0
+            @JSFunction(from: .snippet("/../missing.js")) func imported() throws(JSException)
+            """
+        let diagnostics = try #require(moduleDiagnostics(source: source))
+        #expect(diagnostics.description.contains("JavaScript snippet paths must not contain '..'"))
+        #expect(diagnostics.description.contains("test.swift:2:28:"))
+    }
+
+    @Test
+    func javaScriptModulePathMustUseSupportedExtension() throws {
+        let source = """
+            let unrelated = 0
+            @JSFunction(from: .snippet("/module.ts")) func imported() throws(JSException)
+            """
+        let diagnostics = try #require(moduleDiagnostics(source: source))
+        #expect(diagnostics.description.contains("JavaScript snippets must use a '.js' or '.mjs' extension"))
+        #expect(diagnostics.description.contains("test.swift:2:28:"))
+    }
+
+    @Test
+    func javaScriptModulePathMustBeStringLiteral() throws {
+        let source = """
+            let modulePath = "/module.js"
+            @JSFunction(from: .module(modulePath)) func imported() throws(JSException)
+            """
+        let diagnostics = try #require(moduleDiagnostics(source: source))
+        #expect(diagnostics.description.contains("JavaScript module specifier must be a string literal."))
+        #expect(diagnostics.description.contains("test.swift:2:27:"))
+    }
+
     /// Returns the first parameter's type node from a function in the source (the first `@JS func`-like decl), for pinpointing diagnostics.
     private func firstParameterTypeNode(source: String) -> TypeSyntax? {
         let tree = Parser.parse(source: source)
@@ -305,6 +554,229 @@ import Testing
         #expect(skeleton.exported != nil)
     }
 
+    // MARK: - Async return validation
+
+    @Test
+    func asyncReturnOfUnsupportedTypeIsDiagnosed() throws {
+        // Protocol existentials still can't be lowered through the imported-parameter ABI, so
+        // an async return of one must still be diagnosed.
+        let source = """
+            @JS protocol PayloadDelegate {
+                func notify()
+            }
+            @JS func loadPayload() async -> PayloadDelegate {
+                fatalError()
+            }
+            """
+        let swiftAPI = SwiftToSkeleton(
+            progress: .silent,
+            moduleName: "TestModule",
+            exposeToGlobal: false,
+            externalModuleIndex: .empty
+        )
+        swiftAPI.addSourceFile(Parser.parse(source: source), inputFilePath: "test.swift")
+        let skeleton = try swiftAPI.finalize()
+        let exported = try #require(skeleton.exported)
+        let exportSwift = ExportSwift(progress: .silent, moduleName: skeleton.moduleName, skeleton: exported)
+        #expect(throws: BridgeJSCoreError.self) {
+            _ = try exportSwift.finalize()
+        }
+    }
+
+    @Test
+    func asyncReturnOfConvertibleTypeSucceeds() throws {
+        let source = """
+            @JS func loadCount() async -> Int {
+                1
+            }
+            """
+        let swiftAPI = SwiftToSkeleton(
+            progress: .silent,
+            moduleName: "TestModule",
+            exposeToGlobal: false,
+            externalModuleIndex: .empty
+        )
+        swiftAPI.addSourceFile(Parser.parse(source: source), inputFilePath: "test.swift")
+        let skeleton = try swiftAPI.finalize()
+        let exported = try #require(skeleton.exported)
+        let exportSwift = ExportSwift(progress: .silent, moduleName: skeleton.moduleName, skeleton: exported)
+        #expect(try exportSwift.finalize() != nil)
+    }
+
+    @Test
+    func chainedJSAsDiagnostic() throws {
+        let source = """
+            @JS(as: B.self) struct A {
+                consuming func bridgeToJS() -> B { fatalError() }
+                static func bridgeFromJS(_ value: consuming B) -> A { fatalError() }
+            }
+            @JS(as: C.self) struct B {
+                consuming func bridgeToJS() -> C { fatalError() }
+                static func bridgeFromJS(_ value: consuming C) -> B { fatalError() }
+            }
+            @JS class C { @JS init() {} }
+            """
+        let swiftAPI = SwiftToSkeleton(
+            progress: .silent,
+            moduleName: "TestModule",
+            exposeToGlobal: false,
+            externalModuleIndex: .empty
+        )
+        swiftAPI.addSourceFile(Parser.parse(source: source), inputFilePath: "test.swift")
+        #expect(throws: BridgeJSCoreDiagnosticError.self) {
+            _ = try swiftAPI.finalize()
+        }
+    }
+
+    @Test
+    func cyclicJSAsDiagnostic() throws {
+        let source = """
+            @JS(as: B.self) struct A {
+                consuming func bridgeToJS() -> B { fatalError() }
+                static func bridgeFromJS(_ value: consuming B) -> A { fatalError() }
+            }
+            @JS(as: A.self) struct B {
+                consuming func bridgeToJS() -> A { fatalError() }
+                static func bridgeFromJS(_ value: consuming A) -> B { fatalError() }
+            }
+            """
+        let swiftAPI = SwiftToSkeleton(
+            progress: .silent,
+            moduleName: "TestModule",
+            exposeToGlobal: false,
+            externalModuleIndex: .empty
+        )
+        swiftAPI.addSourceFile(Parser.parse(source: source), inputFilePath: "test.swift")
+        #expect(throws: BridgeJSCoreDiagnosticError.self) {
+            _ = try swiftAPI.finalize()
+        }
+    }
+
+    @Test
+    func jsAsProtocolTargetDiagnostic() throws {
+        let source = """
+            @JS protocol Audible {
+                func play()
+            }
+            @JS(as: Audible.self) struct AudibleTag {
+                consuming func bridgeToJS() -> any Audible { fatalError() }
+                static func bridgeFromJS(_ value: consuming any Audible) -> AudibleTag { fatalError() }
+            }
+            """
+        let swiftAPI = SwiftToSkeleton(
+            progress: .silent,
+            moduleName: "TestModule",
+            exposeToGlobal: false,
+            externalModuleIndex: .empty
+        )
+        swiftAPI.addSourceFile(Parser.parse(source: source), inputFilePath: "test.swift")
+        #expect(throws: BridgeJSCoreDiagnosticError.self) {
+            _ = try swiftAPI.finalize()
+        }
+    }
+
+    @Test
+    func jsAsWithNamespaceDiagnostic() throws {
+        let source = """
+            @JS final class Box { @JS init() {} }
+            @JS(as: Box.self, namespace: "Foo") struct Wrapped {
+                consuming func bridgeToJS() -> Box { fatalError() }
+                static func bridgeFromJS(_ value: consuming Box) -> Wrapped { fatalError() }
+            }
+            """
+        let swiftAPI = SwiftToSkeleton(
+            progress: .silent,
+            moduleName: "TestModule",
+            exposeToGlobal: false,
+            externalModuleIndex: .empty
+        )
+        swiftAPI.addSourceFile(Parser.parse(source: source), inputFilePath: "test.swift")
+        #expect(throws: BridgeJSCoreDiagnosticError.self) {
+            _ = try swiftAPI.finalize()
+        }
+    }
+
+    @Test
+    func jsNameOnClassDiagnostic() throws {
+        let source = """
+            @JS("Renamed") class Box { @JS init() {} }
+            """
+        let diagnostics = try #require(moduleDiagnostics(source: source))
+        #expect(diagnostics.description.contains("A separate name for JavaScript is not supported here"))
+    }
+
+    @Test
+    func jsNameOnStructDiagnostic() throws {
+        let source = """
+            @JS("Renamed") struct Box { var x: Int }
+            """
+        let diagnostics = try #require(moduleDiagnostics(source: source))
+        #expect(diagnostics.description.contains("A separate name for JavaScript is not supported here"))
+    }
+
+    @Test
+    func jsNameOnEnumDiagnostic() throws {
+        let source = """
+            @JS("Renamed") enum Box { case a }
+            """
+        let diagnostics = try #require(moduleDiagnostics(source: source))
+        #expect(diagnostics.description.contains("A separate name for JavaScript is not supported here"))
+    }
+
+    @Test
+    func jsNameOnProtocolDiagnostic() throws {
+        let source = """
+            @JS("Renamed") protocol Box { func run() }
+            """
+        let diagnostics = try #require(moduleDiagnostics(source: source))
+        #expect(diagnostics.description.contains("A separate name for JavaScript is not supported here"))
+    }
+
+    @Test
+    func jsNameOnInitializerDiagnostic() throws {
+        let source = """
+            @JS class Box { @JS("create") init() {} }
+            """
+        let diagnostics = try #require(moduleDiagnostics(source: source))
+        #expect(diagnostics.description.contains("A separate name for JavaScript is not supported here"))
+    }
+
+    @Test
+    func jsNameOnProtocolRequirementDiagnostic() throws {
+        let source = """
+            @JS protocol Box { @JS("run") func run() }
+            """
+        let diagnostics = try #require(moduleDiagnostics(source: source))
+        #expect(diagnostics.description.contains("A separate name for JavaScript is not supported here"))
+    }
+
+    @Test
+    func invalidJSNameDiagnostic() throws {
+        let source = """
+            @JS("1notAnIdentifier") func a() -> Int { 42 }
+            @JS("has space") func b() -> Int { 42 }
+            @JS("has-dash") func c() -> Int { 42 }
+            @JS("") func d() -> Int { 42 }
+            """
+        let diagnostics = try #require(moduleDiagnostics(source: source))
+        #expect(diagnostics.description.contains("`1notAnIdentifier` is not a valid JavaScript identifier"))
+        #expect(diagnostics.description.contains("`has space` is not a valid JavaScript identifier"))
+        #expect(diagnostics.description.contains("`has-dash` is not a valid JavaScript identifier"))
+        #expect(diagnostics.description.contains("`` is not a valid JavaScript identifier"))
+    }
+
+    @Test
+    func jsNameOnMultipleBindingsDiagnostic() throws {
+        let source = """
+            @JS class Box {
+                @JS init() {}
+                @JS("renamed") var first: Int = 1, second: Int = 2
+            }
+            """
+        let diagnostics = try #require(moduleDiagnostics(source: source))
+        #expect(diagnostics.description.contains("Name targets declaration with multiple bindings"))
+    }
+
     @Test
     func omitsNextLineWhenErrorIsOnLastLine() throws {
         let source = """
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/GenericExportDiagnosticsTests.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/GenericExportDiagnosticsTests.swift
new file mode 100644
index 000000000..37f2a0318
--- /dev/null
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/GenericExportDiagnosticsTests.swift
@@ -0,0 +1,63 @@
+import Testing
+
+@Suite struct GenericExportDiagnosticsTests {
+
+    @Test
+    func genericExportedFunctionRejected() {
+        expectDiagnostic(
+            source: """
+                @JS public func identity<T: BridgedSwiftGenericBridgeable>(_ value: T) -> T { value }
+                """,
+            contains: "Generic parameters on exported @JS functions are not supported yet"
+        )
+    }
+
+    @Test
+    func genericMethodOnExportedClassRejected() {
+        expectDiagnostic(
+            source: """
+                @JS final class Box {
+                    @JS init() {}
+                    @JS func wrap<T: BridgedSwiftGenericBridgeable>(_ value: T) -> T { value }
+                }
+                """,
+            contains: "Generic parameters on exported @JS functions are not supported yet"
+        )
+    }
+
+    @Test
+    func genericMethodOnExportedStructRejected() {
+        expectDiagnostic(
+            source: """
+                @JS struct Pair {
+                    @JS init() {}
+                    @JS func first<T: BridgedSwiftGenericBridgeable>(_ value: T) -> T { value }
+                }
+                """,
+            contains: "Generic parameters on exported @JS functions are not supported yet"
+        )
+    }
+
+    @Test
+    func genericStaticMethodOnExportedEnumRejected() {
+        expectDiagnostic(
+            source: """
+                @JS enum Factory {
+                    case primary
+                    @JS static func one<T: BridgedSwiftGenericBridgeable>(_ value: T) -> T { value }
+                }
+                """,
+            contains: "Generic parameters on exported @JS functions are not supported yet"
+        )
+    }
+
+    @Test
+    func unconstrainedGenericExportedFunctionRejected() {
+        expectDiagnostic(
+            source: """
+                @JS public func identity<T>(_ value: T) -> T { value }
+                """,
+            contains: "Generic parameters on exported @JS functions are not supported yet"
+        )
+    }
+}
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/GenericImportDiagnosticsTests.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/GenericImportDiagnosticsTests.swift
new file mode 100644
index 000000000..4a421b73b
--- /dev/null
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/GenericImportDiagnosticsTests.swift
@@ -0,0 +1,210 @@
+import Testing
+
+@testable import BridgeJSSkeleton
+
+@Suite struct GenericImportDiagnosticsTests {
+
+    @Test
+    func genericParameterRequiresBridgeableConstraint() {
+        expectDiagnostic(
+            source: """
+                @JSFunction func identity<T>(_ value: T) throws(JSException) -> T
+                """,
+            contains: "Generic parameter 'T' must be constrained to 'BridgedSwiftGenericBridgeable'"
+        )
+    }
+
+    @Test
+    func genericWhereClauseUnsupported() {
+        expectDiagnostic(
+            source: """
+                @JSFunction func identity<T: BridgedSwiftGenericBridgeable>(_ value: T) throws(JSException) -> T where T: Sendable
+                """,
+            contains: "'where' clauses are not supported on @JSFunction"
+        )
+    }
+
+    @Test
+    func asyncGenericImportUnsupported() {
+        expectDiagnostic(
+            source: """
+                @JSFunction func identityAsync<T: BridgedSwiftGenericBridgeable>(_ value: T) async throws(JSException) -> T
+                """,
+            contains: "Generic @JSFunction declarations cannot be 'async' yet."
+        )
+    }
+
+    @Test
+    func genericImportedMethodIsParsed() throws {
+        let skeleton = try makeSkeleton(
+            """
+            @JSClass struct Box {
+                @JSFunction func member<T: BridgedSwiftGenericBridgeable>(_ value: T) throws(JSException) -> T
+            }
+            """,
+            moduleName: "App"
+        )
+        let imported = try #require(skeleton.imported)
+        let types = imported.children.flatMap { $0.types }
+        let box = try #require(types.first { $0.name == "Box" })
+        let method = try #require(box.methods.first { $0.name == "member" })
+        #expect(method.genericParameters == ["T"])
+    }
+
+    @Test
+    func genericImportedConstructorIsParsed() throws {
+        let skeleton = try makeSkeleton(
+            """
+            @JSClass struct Box {
+                @JSFunction init<T: BridgedSwiftGenericBridgeable>(_ value: T) throws(JSException)
+            }
+            """,
+            moduleName: "App"
+        )
+        let imported = try #require(skeleton.imported)
+        let types = imported.children.flatMap { $0.types }
+        let box = try #require(types.first { $0.name == "Box" })
+        let constructor = try #require(box.constructor)
+        #expect(constructor.genericParameters == ["T"])
+        #expect(constructor.parameters.map(\.type) == [.generic("T")])
+    }
+
+    @Test
+    func genericImportedConstructorUnconstrainedParamIsRejected() {
+        expectDiagnostic(
+            source: """
+                @JSClass struct Box {
+                    @JSFunction init<T>(_ value: T) throws(JSException)
+                }
+                """,
+            contains:
+                "Generic parameter 'T' must be constrained to 'BridgedSwiftGenericBridgeable' to be used with @JSFunction."
+        )
+    }
+
+    @Test
+    func genericImportedConstructorUnusedTypeParamIsRejected() {
+        expectDiagnostic(
+            source: """
+                @JSClass struct Box {
+                    @JSFunction init<T: BridgedSwiftGenericBridgeable>(_ value: Int) throws(JSException)
+                }
+                """,
+            contains:
+                "The generic parameter 'T' must be used in a parameter of a generic @JSFunction initializer."
+        )
+    }
+
+    @Test
+    func genericImportedConstructorAsyncIsRejected() {
+        expectDiagnostic(
+            source: """
+                @JSClass struct Box {
+                    @JSFunction init<T: BridgedSwiftGenericBridgeable>(_ value: T) async throws(JSException)
+                }
+                """,
+            contains: "Generic @JSFunction declarations cannot be 'async' yet."
+        )
+    }
+
+    @Test
+    func genericImportedConstructorUnsupportedWrapperFormIsRejected() {
+        expectDiagnostic(
+            source: """
+                @JSClass struct Box {
+                    @JSFunction init<T: BridgedSwiftGenericBridgeable>(_ value: [[T]]) throws(JSException)
+                }
+                """,
+            contains: "may only be used as a bare type"
+        )
+    }
+
+    @Test(arguments: [
+        ("[[T]]", "@JSFunction func f<T: BridgedSwiftGenericBridgeable>(_ v: [[T]]) throws(JSException)"),
+        ("[T?]", "@JSFunction func f<T: BridgedSwiftGenericBridgeable>(_ v: [T?]) throws(JSException)"),
+        ("T??", "@JSFunction func f<T: BridgedSwiftGenericBridgeable>(_ v: T??) throws(JSException)"),
+        ("[Int: T]", "@JSFunction func f<T: BridgedSwiftGenericBridgeable>(_ v: [Int: T]) throws(JSException)"),
+    ])
+    func unsupportedGenericWrapperFormsInParameter(label: String, source: String) {
+        expectDiagnostic(
+            source: source,
+            contains: "may only be used as a bare type"
+        )
+    }
+
+    @Test(arguments: [
+        ("[[T]]", "@JSFunction func f<T: BridgedSwiftGenericBridgeable>(_ v: T) throws(JSException) -> [[T]]"),
+        ("[T?]", "@JSFunction func f<T: BridgedSwiftGenericBridgeable>(_ v: T) throws(JSException) -> [T?]"),
+        ("T??", "@JSFunction func f<T: BridgedSwiftGenericBridgeable>(_ v: T) throws(JSException) -> T??"),
+        ("[Int: T]", "@JSFunction func f<T: BridgedSwiftGenericBridgeable>(_ v: T) throws(JSException) -> [Int: T]"),
+    ])
+    func unsupportedGenericWrapperFormsInReturn(label: String, source: String) {
+        expectDiagnostic(
+            source: source,
+            contains: "may only be used as a bare type"
+        )
+    }
+
+    @Test
+    func genericImportedMethodAsyncIsRejected() {
+        expectDiagnostic(
+            source: """
+                @JSClass struct Box {
+                    @JSFunction func member<T: BridgedSwiftGenericBridgeable>(_ value: T) async throws(JSException) -> T
+                }
+                """,
+            contains: "Generic @JSFunction declarations cannot be 'async' yet."
+        )
+    }
+
+    @Test
+    func genericImportedMethodUnconstrainedParamIsRejected() {
+        expectDiagnostic(
+            source: """
+                @JSClass struct Box {
+                    @JSFunction func member<T>(_ value: T) throws(JSException) -> T
+                }
+                """,
+            contains:
+                "Generic parameter 'T' must be constrained to 'BridgedSwiftGenericBridgeable' to be used with @JSFunction."
+        )
+    }
+
+    @Test
+    func genericImportedFunctionUnusedTypeParamIsRejected() {
+        expectDiagnostic(
+            source: """
+                @JSFunction func unused<T: BridgedSwiftGenericBridgeable>() throws(JSException) -> Int
+                """,
+            contains:
+                "The generic parameter 'T' must be used in a parameter or return type of a generic @JSFunction declaration."
+        )
+    }
+
+    @Test
+    func genericImportedMethodUnusedTypeParamIsRejected() {
+        expectDiagnostic(
+            source: """
+                @JSClass struct Box {
+                    @JSFunction func member<T: BridgedSwiftGenericBridgeable>() throws(JSException) -> Int
+                }
+                """,
+            contains:
+                "The generic parameter 'T' must be used in a parameter or return type of a generic @JSFunction declaration."
+        )
+    }
+
+    @Test
+    func genericImportedReturnOnlyTypeParamIsAllowed() throws {
+        let skeleton = try makeSkeleton(
+            """
+            @JSFunction func make<T: BridgedSwiftGenericBridgeable>() throws(JSException) -> T
+            """,
+            moduleName: "App"
+        )
+        let imported = try #require(skeleton.imported)
+        let functions = imported.children.flatMap { $0.functions }
+        let function = try #require(functions.first { $0.name == "make" })
+        #expect(function.genericParameters == ["T"])
+    }
+}
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/ImportedJSModuleRegistryTests.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/ImportedJSModuleRegistryTests.swift
new file mode 100644
index 000000000..7c5d168d2
--- /dev/null
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/ImportedJSModuleRegistryTests.swift
@@ -0,0 +1,222 @@
+import Foundation
+import Testing
+
+@testable import BridgeJSLink
+@testable import BridgeJSSkeleton
+
+/// Covers module-origin behavior that the single-Swift-module snapshot tests cannot reach:
+/// how references from *several* Swift modules are deduplicated, ordered, and named.
+@Suite struct ImportedJSModuleRegistryTests {
+    private func skeleton(
+        moduleName: String,
+        functions: [ImportedFunctionSkeleton] = [],
+        types: [ImportedTypeSkeleton] = []
+    ) -> BridgeJSSkeleton {
+        BridgeJSSkeleton(
+            moduleName: moduleName,
+            imported: ImportedModuleSkeleton(
+                children: [ImportedFileSkeleton(functions: functions, types: types)]
+            )
+        )
+    }
+
+    private func function(
+        _ name: String,
+        jsName: String? = nil,
+        from: JSImportFrom
+    ) -> ImportedFunctionSkeleton {
+        ImportedFunctionSkeleton(
+            name: name,
+            jsName: jsName,
+            from: from,
+            parameters: [],
+            returnType: .void
+        )
+    }
+
+    private func importLines(_ skeletons: [BridgeJSSkeleton]) throws -> [String] {
+        var link = BridgeJSLink()
+        let encoder = JSONEncoder()
+        for skeleton in skeletons {
+            _ = try link.addSkeletonFile(data: try encoder.encode(skeleton))
+        }
+        let js = try link.link().outputJs
+        return js.split(separator: "\n").map(String.init).filter { $0.hasPrefix("import ") }
+    }
+
+    /// A bare specifier names the same module regardless of which Swift module mentions it,
+    /// so two Swift modules must share one import and one binding.
+    @Test func bareSpecifierIsSharedAcrossSwiftModules() throws {
+        let lines = try importLines([
+            skeleton(moduleName: "Alpha", functions: [function("a", jsName: "basename", from: .module("node:path"))]),
+            skeleton(moduleName: "Beta", functions: [function("b", jsName: "dirname", from: .module("node:path"))]),
+        ])
+        #expect(lines.count == 1)
+        #expect(lines[0].contains("from \"node:path\""))
+        #expect(lines[0].contains("basename as "))
+        #expect(lines[0].contains("dirname as "))
+    }
+
+    /// A local path is only meaningful relative to its Swift target, so the same path in two
+    /// Swift modules must stay two separate copies with two separate imports.
+    @Test func localPathIsNotSharedAcrossSwiftModules() throws {
+        let lines = try importLines([
+            skeleton(moduleName: "Alpha", functions: [function("a", from: .snippet("/utils.mjs"))]),
+            skeleton(moduleName: "Beta", functions: [function("b", from: .snippet("/utils.mjs"))]),
+        ])
+        #expect(lines.count == 2)
+        #expect(lines.contains { $0.contains("bridge-js-modules/Alpha/utils.mjs") })
+        #expect(lines.contains { $0.contains("bridge-js-modules/Beta/utils.mjs") })
+    }
+
+    /// A named import is a hard link-time requirement, so a class whose module export is
+    /// never looked up must not produce one. A wrapper-only `@JSClass` has no constructor
+    /// and no static methods, so nothing references the module's export of that name and
+    /// the module need not export it at all; requiring it would fail the whole module load.
+    @Test func wrapperOnlyClassDoesNotRequireANamedExport() throws {
+        let lines = try importLines([
+            skeleton(
+                moduleName: "Alpha",
+                types: [
+                    ImportedTypeSkeleton(
+                        name: "Wrapper",
+                        from: .module("some-pkg"),
+                        methods: [
+                            ImportedFunctionSkeleton(name: "read", parameters: [], returnType: .void)
+                        ]
+                    )
+                ]
+            )
+        ])
+        #expect(lines.count == 1)
+        #expect(lines[0].hasPrefix("import * as "))
+        #expect(!lines[0].contains("Wrapper as "))
+    }
+
+    /// A class with a constructor does have its export looked up, so it keeps a named import.
+    @Test func classWithConstructorUsesANamedImport() throws {
+        let lines = try importLines([
+            skeleton(
+                moduleName: "Alpha",
+                types: [
+                    ImportedTypeSkeleton(
+                        name: "Wrapper",
+                        from: .module("some-pkg"),
+                        constructor: ImportedConstructorSkeleton(parameters: [])
+                    )
+                ]
+            )
+        ])
+        #expect(lines == [#"import { Wrapper as __bjs_import_0_Wrapper } from "some-pkg";"#])
+    }
+
+    /// A class with only static methods also looks its export up.
+    @Test func classWithOnlyStaticMethodsUsesANamedImport() throws {
+        let lines = try importLines([
+            skeleton(
+                moduleName: "Alpha",
+                types: [
+                    ImportedTypeSkeleton(
+                        name: "Wrapper",
+                        from: .module("some-pkg"),
+                        staticMethods: [
+                            ImportedFunctionSkeleton(name: "create", parameters: [], returnType: .void)
+                        ]
+                    )
+                ]
+            )
+        ])
+        #expect(lines == [#"import { Wrapper as __bjs_import_0_Wrapper } from "some-pkg";"#])
+    }
+
+    /// Local references are emitted before bare ones, each group sorted, so that the numbered
+    /// aliases in generated JavaScript are stable across runs.
+    @Test func referencesAreOrderedDeterministically() throws {
+        let lines = try importLines([
+            skeleton(
+                moduleName: "Alpha",
+                functions: [
+                    function("z", jsName: "zeta", from: .module("zzz-package")),
+                    function("a", jsName: "alpha", from: .module("aaa-package")),
+                    function("l", from: .snippet("/local.mjs")),
+                ]
+            )
+        ])
+        #expect(lines.count == 3)
+        #expect(lines[0].contains("/local.mjs"))
+        #expect(lines[1].contains("aaa-package"))
+        #expect(lines[2].contains("zzz-package"))
+    }
+
+    /// A class and a free function on the same specifier share one import line.
+    @Test func classAndFunctionOnSameSpecifierShareOneImport() throws {
+        let lines = try importLines([
+            skeleton(
+                moduleName: "Alpha",
+                functions: [function("a", jsName: "helper", from: .module("pkg"))],
+                types: [
+                    ImportedTypeSkeleton(
+                        name: "Widget",
+                        from: .module("pkg"),
+                        constructor: ImportedConstructorSkeleton(parameters: [])
+                    )
+                ]
+            )
+        ])
+        #expect(lines.count == 1)
+        #expect(lines[0].contains("helper as "))
+        #expect(lines[0].contains("Widget as "))
+    }
+
+    /// One non-identifier export name degrades its own origin to a namespace import without
+    /// affecting any other origin in the same program.
+    @Test func namespaceFallbackIsScopedToOneOrigin() throws {
+        let lines = try importLines([
+            skeleton(
+                moduleName: "Alpha",
+                functions: [
+                    function("a", jsName: "kebab-case", from: .module("weird-package")),
+                    function("b", jsName: "join", from: .module("node:path")),
+                ]
+            )
+        ])
+        let weird = try #require(lines.first { $0.contains("weird-package") })
+        let node = try #require(lines.first { $0.contains("node:path") })
+        #expect(weird.hasPrefix("import * as "))
+        #expect(node.hasPrefix("import { join as "))
+    }
+
+    /// Because a bare specifier is shared across Swift modules, its member names form a union.
+    /// A non-identifier name contributed by one Swift module therefore degrades the shared
+    /// import for the other module too. That is intended — one specifier means one import
+    /// statement — but it is worth pinning so the behavior is not changed by accident.
+    @Test func nonIdentifierNameInOneSwiftModuleDegradesTheSharedImport() throws {
+        let lines = try importLines([
+            skeleton(moduleName: "Alpha", functions: [function("a", jsName: "join", from: .module("node:path"))]),
+            skeleton(moduleName: "Beta", functions: [function("b", jsName: "odd-name", from: .module("node:path"))]),
+        ])
+        #expect(lines.count == 1)
+        #expect(lines[0].hasPrefix("import * as "))
+    }
+
+    /// A reserved word is a legal ECMAScript export name, and `default` is how the default
+    /// export is spelled, so both must survive as named imports.
+    @Test(arguments: ["default", "class", "import"])
+    func reservedWordExportNamesUseNamedImports(memberName: String) throws {
+        let lines = try importLines([
+            skeleton(moduleName: "Alpha", functions: [function("a", jsName: memberName, from: .module("pkg"))])
+        ])
+        #expect(lines.count == 1)
+        #expect(lines[0].hasPrefix("import { \(memberName) as "))
+    }
+
+    /// A specifier is embedded in a JavaScript string literal, so quotes and backslashes in it
+    /// must be escaped rather than terminating the literal.
+    @Test func specifierIsEscapedInTheImportLine() throws {
+        let lines = try importLines([
+            skeleton(moduleName: "Alpha", functions: [function("a", jsName: "x", from: .module("pk\"g\\y"))])
+        ])
+        #expect(lines.count == 1)
+        #expect(lines[0].hasSuffix(#"from "pk\"g\\y";"#))
+    }
+}
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/Alias.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/Alias.swift
new file mode 100644
index 000000000..f4d56653f
--- /dev/null
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/Alias.swift
@@ -0,0 +1,121 @@
+@JS(as: PolygonReference.self) struct Polygon {
+    var vertices: [Double]
+
+    consuming func bridgeToJS() -> PolygonReference {
+        return PolygonReference(underlying: self)
+    }
+
+    static func bridgeFromJS(_ value: consuming PolygonReference) -> Polygon {
+        return value.underlying
+    }
+}
+
+@JS final class PolygonReference {
+    var underlying: Polygon
+
+    @JS init(underlying: Polygon) {
+        self.underlying = underlying
+    }
+
+    @JS func snapshot() -> Polygon
+    @JS func merge(_ other: Polygon) -> Polygon
+    @JS static func origin() -> Polygon
+}
+
+@JS(as: TagReference.self) struct Tag {
+    var name: String
+
+    consuming func bridgeToJS() -> TagReference {
+        return TagReference(underlying: self)
+    }
+
+    static func bridgeFromJS(_ value: consuming TagReference) -> Tag {
+        return value.underlying
+    }
+}
+
+@JS final class TagReference {
+    var underlying: Tag
+
+    @JS init(underlying: Tag) {
+        self.underlying = underlying
+    }
+}
+
+@JS func roundtripPolygon(_ polygon: Polygon) -> Polygon
+
+@JS func optionalPolygon(_ polygon: Polygon?) -> Polygon?
+
+@JS func polygonArray(_ polygons: [Polygon]) -> [Polygon]
+
+@JS func validatePolygon(_ polygon: Polygon) throws(JSException) -> Polygon
+
+@JS func makeTag(_ name: String) -> Tag
+
+@JS(as: String.self) struct Tagged {
+    var raw: String
+
+    consuming func bridgeToJS() -> String {
+        return raw
+    }
+
+    static func bridgeFromJS(_ value: consuming String) -> Tagged {
+        return Tagged(raw: value)
+    }
+}
+
+@JSFunction func acceptTagged(_ tagged: Tagged) throws(JSException) -> Void
+@JSFunction func acceptOptionalTagged(_ tagged: Tagged?) throws(JSException) -> Void
+@JSFunction func roundtripTagged(_ tagged: Tagged) throws(JSException) -> Tagged
+
+@JSClass class Surface {
+    @JSFunction init() throws(JSException)
+    @JSGetter var label: String
+}
+
+@JS(as: Surface.self) struct Canvas {
+    consuming func bridgeToJS() -> Surface {
+        fatalError("test stub")
+    }
+
+    static func bridgeFromJS(_ value: consuming Surface) -> Canvas {
+        return Canvas()
+    }
+}
+
+@JSFunction func produceOptionalCanvas() throws(JSException) -> Canvas?
+
+@JS enum InnerTag {
+    case payload(Int)
+    case empty
+}
+
+@JS(as: InnerTag.self) struct AliasedTag {
+    consuming func bridgeToJS() -> InnerTag {
+        return .empty
+    }
+
+    static func bridgeFromJS(_ value: consuming InnerTag) -> AliasedTag {
+        return AliasedTag()
+    }
+}
+
+@JS func roundtripTags(_ xs: [AliasedTag?]) -> [AliasedTag?]
+
+@JS(as: Int.self) struct UserId {
+    var rawValue: Int
+
+    consuming func bridgeToJS() -> Int {
+        return rawValue
+    }
+
+    static func bridgeFromJS(_ value: consuming Int) -> UserId {
+        return UserId(rawValue: value)
+    }
+}
+
+@JS protocol HasOptionalUserId {
+    var userId: UserId? { get }
+}
+
+@JS func describeUser(_ owner: HasOptionalUserId) -> HasOptionalUserId
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/AliasInClosure.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/AliasInClosure.swift
new file mode 100644
index 000000000..384481c5c
--- /dev/null
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/AliasInClosure.swift
@@ -0,0 +1,22 @@
+@JS(as: PolygonReference.self) struct Polygon {
+    var sides: Int
+
+    consuming func bridgeToJS() -> PolygonReference {
+        return PolygonReference(sides: sides)
+    }
+
+    static func bridgeFromJS(_ value: consuming PolygonReference) -> Polygon {
+        return Polygon(sides: value.sides)
+    }
+}
+
+@JS final class PolygonReference {
+    var sides: Int
+
+    @JS init(sides: Int) {
+        self.sides = sides
+    }
+}
+
+@JS func makePolygonFactory() -> () -> Polygon
+@JS func makePolygonInspector() -> (Polygon) -> Int
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/Async.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/Async.swift
index 214331b32..742d96ed2 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/Async.swift
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/Async.swift
@@ -17,3 +17,70 @@
 @JS func asyncRoundTripJSObject(_ v: JSObject) async -> JSObject {
     return v
 }
+
+@JS struct AsyncPoint {
+    var x: Int
+    var y: Int
+}
+
+@JS func asyncRoundTripStruct(_ v: AsyncPoint) async -> AsyncPoint {
+    return v
+}
+
+@JS func asyncRoundTripStructThrows(_ v: AsyncPoint) async throws(JSException) -> AsyncPoint {
+    return v
+}
+
+@JS func asyncThrowsZeroArg() async throws(JSException) -> String {
+    return "ok"
+}
+
+@JS func asyncCombineStructs(_ a: AsyncPoint, _ b: AsyncPoint) async -> AsyncPoint {
+    return AsyncPoint(x: a.x + b.x, y: a.y + b.y)
+}
+
+@JS enum AsyncDirection {
+    case north
+    case south
+}
+
+@JS func asyncRoundTripEnum(_ v: AsyncDirection) async -> AsyncDirection {
+    return v
+}
+
+@JS enum AsyncTheme: String {
+    case light
+    case dark
+}
+
+@JS func asyncRoundTripRawEnum(_ v: AsyncTheme) async -> AsyncTheme {
+    return v
+}
+
+@JS func asyncRoundTripOptionalEnum(_ v: AsyncDirection?) async -> AsyncDirection? {
+    return v
+}
+
+@JS func asyncRoundTripOptionalRawEnum(_ v: AsyncTheme?) async -> AsyncTheme? {
+    return v
+}
+
+@JS func asyncRoundTripOptionalStruct(_ v: AsyncPoint?) async -> AsyncPoint? {
+    return v
+}
+
+@JS func asyncRoundTripStructArray(_ v: [AsyncPoint]) async -> [AsyncPoint] {
+    return v
+}
+
+@JS func asyncRoundTripEnumArray(_ v: [AsyncDirection]) async -> [AsyncDirection] {
+    return v
+}
+
+@JS func asyncRoundTripStructDictionary(_ v: [String: AsyncPoint]) async -> [String: AsyncPoint] {
+    return v
+}
+
+@JS func asyncRoundTripEnumDictionary(_ v: [String: AsyncDirection]) async -> [String: AsyncDirection] {
+    return v
+}
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/AsyncAssociatedValueEnum.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/AsyncAssociatedValueEnum.swift
new file mode 100644
index 000000000..662e01fce
--- /dev/null
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/AsyncAssociatedValueEnum.swift
@@ -0,0 +1,13 @@
+@JS enum AsyncPayloadResult {
+    case success(String)
+    case failure(Int)
+    case idle
+}
+
+@JS func asyncRoundTripAssociatedValueEnum(_ value: AsyncPayloadResult) async -> AsyncPayloadResult {
+    return value
+}
+
+@JS func asyncRoundTripOptionalAssociatedValueEnum(_ value: AsyncPayloadResult?) async -> AsyncPayloadResult? {
+    return value
+}
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/ClassWithNestedTypes.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/ClassWithNestedTypes.swift
new file mode 100644
index 000000000..7971283d2
--- /dev/null
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/ClassWithNestedTypes.swift
@@ -0,0 +1,34 @@
+@JS class Account {
+    @JS enum Role: String {
+        case admin
+        case guest
+    }
+
+    @JS struct Credentials {
+        var token: String
+
+        @JS init(token: String) {
+            self.token = token
+        }
+
+        @JS static var maxLength: Int { 64 }
+
+        @JS static func empty() -> Credentials {
+            Credentials(token: "")
+        }
+    }
+
+    @JS var name: String
+
+    @JS var role: Role { .admin }
+
+    @JS static var defaultRole: Role { .guest }
+
+    @JS init(name: String) {
+        self.name = name
+    }
+
+    @JS func describe() -> String {
+        name
+    }
+}
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/DocComments.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/DocComments.swift
new file mode 100644
index 000000000..8cdc72d4d
--- /dev/null
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/DocComments.swift
@@ -0,0 +1,91 @@
+/// Returns a greeting for a user.
+/// - Parameters:
+///   - name: The user's name.
+///   - greeting: The greeting word to use.
+/// - Returns: The composed greeting message.
+@JS func greet(name: String, greeting: String = "Hello") -> String {
+    return "\(greeting), \(name)!"
+}
+
+/// Adds two numbers together.
+/// - Parameter a: The first addend.
+/// - Parameter b: The second addend.
+/// - Returns: The sum of the inputs.
+@JS func add(a: Int, b: Int) -> Int { a + b }
+
+///
+/// Has blank doc lines around the summary; boundaries should be trimmed.
+///
+@JS func trimmed() {}
+
+/**
+ * Says hello to the world.
+ *
+ * Demonstrates that block doc comments are supported too.
+ */
+@JS func hello() {}
+
+/// Parses an integer from text.
+/// - Parameter text: The text to parse.
+/// - Returns: The parsed integer.
+/// - Throws: A `JSException` when the text is not a valid integer.
+@JS func parseInt(text: String) throws(JSException) -> Int { 0 }
+
+/// A greeter that keeps the target name.
+@JS class Greeter {
+    /// The configured name.
+    @JS var name: String
+
+    /// Create a greeter.
+    /// - Parameter name: The name to greet.
+    @JS init(name: String) {
+        self.name = name
+    }
+
+    /// Returns a greeting for the configured name.
+    /// - Returns: The greeting message.
+    @JS func greet() -> String {
+        return "Hello, " + self.name + "!"
+    }
+}
+
+/// A 2D point in space.
+@JS struct Point {
+    /// The horizontal position.
+    let x: Double
+    /// The vertical position.
+    let y: Double
+}
+
+/// A primary color channel.
+@JS enum Color {
+    case red
+    case green
+    case blue
+
+    /// The default channel.
+    @JS static var fallback: String { "red" }
+
+    /// Returns the canonical name for a channel label.
+    /// - Parameter label: The raw label.
+    /// - Returns: The canonical channel name.
+    @JS static func canonical(label: String) -> String { label }
+}
+
+/// Receives lifecycle callbacks.
+@JS protocol Listener {
+    /// The listener's display name.
+    var name: String { get }
+
+    /// Called when an event fires.
+    /// - Parameter id: The event identifier.
+    func onEvent(id: Int)
+}
+
+/// Doubles a value, in a namespace.
+/// - Parameter value: The value to double.
+/// - Returns: Twice the input.
+@JS(namespace: "MathUtils") func double(value: Int) -> Int { value * 2 }
+
+/// Returns the JSDoc terminator */ embedded mid-sentence.
+@JS func terminator() -> String { "*/" }
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/EnumAlias.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/EnumAlias.swift
new file mode 100644
index 000000000..7da395c2a
--- /dev/null
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/EnumAlias.swift
@@ -0,0 +1,29 @@
+@JS(as: ColorBox.self) enum Color {
+    case red, green, blue
+
+    consuming func bridgeToJS() -> ColorBox {
+        switch self {
+        case .red: return ColorBox(name: "red")
+        case .green: return ColorBox(name: "green")
+        case .blue: return ColorBox(name: "blue")
+        }
+    }
+
+    static func bridgeFromJS(_ value: consuming ColorBox) -> Color {
+        switch value.name {
+        case "green": return .green
+        case "blue": return .blue
+        default: return .red
+        }
+    }
+}
+
+@JS final class ColorBox {
+    var name: String
+
+    @JS init(name: String) {
+        self.name = name
+    }
+}
+
+@JS func roundtripColor(_ color: Color) -> Color
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/EnumAssociatedValueImport.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/EnumAssociatedValueImport.swift
new file mode 100644
index 000000000..aa404b72c
--- /dev/null
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/EnumAssociatedValueImport.swift
@@ -0,0 +1,14 @@
+@JS enum PayloadSignal {
+    case start(String)
+    case stop(Int)
+    case idle
+}
+
+// Associated-value enums bridge as their `Int32` case ID plus stack payload in imported
+// function parameters and return values.
+@JSClass struct PayloadSignalControls {
+    @JSFunction func send(_ signal: PayloadSignal) throws(JSException)
+    @JSFunction func current() throws(JSException) -> PayloadSignal
+    @JSFunction static func roundTrip(_ signal: PayloadSignal) throws(JSException) -> PayloadSignal
+    @JSFunction func roundTripOptional(_ signal: PayloadSignal?) throws(JSException) -> PayloadSignal?
+}
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/EnumCaseImport.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/EnumCaseImport.swift
new file mode 100644
index 000000000..a6477be95
--- /dev/null
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/EnumCaseImport.swift
@@ -0,0 +1,12 @@
+@JS enum Signal {
+    case start
+    case stop
+}
+
+// Case enums (no raw value) bridge as their `Int32` tag as imported-function
+// parameters and return values.
+@JSClass struct SignalControls {
+    @JSFunction func send(_ signal: Signal) throws(JSException)
+    @JSFunction func current() throws(JSException) -> Signal
+    @JSFunction static func roundTrip(_ signal: Signal) throws(JSException) -> Signal
+}
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/ExtensionNestedTypes.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/ExtensionNestedTypes.swift
new file mode 100644
index 000000000..b3ef8ddaf
--- /dev/null
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/ExtensionNestedTypes.swift
@@ -0,0 +1,68 @@
+@JS class Library {
+    @JS var name: String
+
+    @JS init(name: String) {
+        self.name = name
+    }
+
+    @JS func describe() -> String {
+        name
+    }
+}
+
+extension Library {
+    typealias Title = String
+
+    @JS enum Genre: String {
+        case fiction
+        case reference
+    }
+
+    @JS struct Shelf {
+        var label: String
+
+        @JS init(label: String) {
+            self.label = label
+        }
+
+        @JS static var capacity: Int { 32 }
+    }
+
+    @JS func rename(_ title: Title) -> Title {
+        title
+    }
+
+    @JS func shelf(label: String) -> Shelf {
+        Shelf(label: label)
+    }
+}
+
+extension Library.Shelf {
+    @JS struct Divider {
+        var slot: Int
+
+        @JS init(slot: Int) {
+            self.slot = slot
+        }
+    }
+
+    @JS func describeShelf() -> String {
+        "Shelf: " + label
+    }
+}
+
+@JS enum Message {
+    case update(Update)
+    case delete
+}
+
+extension Message {
+    @JS enum Update {
+        case flip
+        case rotate
+    }
+}
+
+@JS func roundTripMessage(_ message: Message) -> Message {
+    message
+}
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/ExtensionOrderIndependence.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/ExtensionOrderIndependence.swift
new file mode 100644
index 000000000..143a60233
--- /dev/null
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/ExtensionOrderIndependence.swift
@@ -0,0 +1,19 @@
+@JS class Depot {
+    @JS init() {}
+}
+
+extension Depot.Crate {
+    @JS func describeCrate() -> String {
+        "Crate: " + label
+    }
+}
+
+extension Depot {
+    @JS struct Crate {
+        var label: String
+
+        @JS init(label: String) {
+            self.label = label
+        }
+    }
+}
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/ExtensionScopeParity.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/ExtensionScopeParity.swift
new file mode 100644
index 000000000..43a71c484
--- /dev/null
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/ExtensionScopeParity.swift
@@ -0,0 +1,25 @@
+@JS(namespace: "app") enum Toolbox {
+    @JS class Mallet {
+        @JS init() {}
+    }
+}
+
+extension Toolbox {
+    @JS class Hammer {
+        @JS init() {}
+    }
+}
+
+@JS enum Signal: String {
+    case ready
+}
+
+extension Signal {
+    @JS struct Meta {
+        var note: String
+
+        @JS init(note: String) {
+            self.note = note
+        }
+    }
+}
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/GenericImports.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/GenericImports.swift
new file mode 100644
index 000000000..5fd3d0226
--- /dev/null
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/GenericImports.swift
@@ -0,0 +1,74 @@
+@JS
+struct GenericPoint {
+    var x: Int
+    var y: Int
+}
+
+@JS enum GenericColor {
+    case red
+    case green
+}
+
+@JS enum GenericMode: String {
+    case light
+    case dark
+}
+
+@JS enum GenericTagged {
+    case number(value: Int)
+    case text(value: String)
+}
+
+@JS final class GenericImportBox {
+    @JS var value: Int
+    @JS init(value: Int) {
+        self.value = value
+    }
+    @JS func get() -> Int {
+        value
+    }
+}
+
+@JSFunction func genericRoundTrip<T: BridgedSwiftGenericBridgeable>(_ value: T) throws(JSException) -> T
+
+@JSFunction func genericParse<T: BridgedSwiftGenericBridgeable>(_ json: String) throws(JSException) -> T
+
+@JSFunction func importGenericCombine<T: BridgedSwiftGenericBridgeable, U: BridgedSwiftGenericBridgeable>(
+    _ a: T,
+    _ b: U
+) throws(JSException) -> U
+
+@JSFunction func importGenericCaseDistinct<T: BridgedSwiftGenericBridgeable, t: BridgedSwiftGenericBridgeable>(
+    _ a: T,
+    _ b: t
+) throws(JSException) -> T
+
+@JSFunction func importGenericArray<T: BridgedSwiftGenericBridgeable>(_ values: [T]) throws(JSException) -> [T]
+
+@JSFunction func importGenericOptional<T: BridgedSwiftGenericBridgeable>(_ value: T?) throws(JSException) -> T?
+
+@JSFunction func importGenericDictionary<T: BridgedSwiftGenericBridgeable>(
+    _ values: [String: T]
+) throws(JSException) -> [String: T]
+
+// A generic parameter alongside another parameter that pushes onto the shared
+// stacks: both are lowered in reverse declaration order.
+@JSFunction func importGenericAfterOptionalArray<T: BridgedSwiftGenericBridgeable>(
+    _ values: [Int]?,
+    _ value: T
+) throws(JSException) -> T
+
+@JSClass struct GenericPairFactory {
+    @JSFunction init<T: BridgedSwiftGenericBridgeable, U: BridgedSwiftGenericBridgeable>(
+        _ tag: String,
+        _ first: T,
+        _ second: U
+    ) throws(JSException)
+}
+
+@JSClass struct GenericConsumer {
+    @JSFunction init<T: BridgedSwiftGenericBridgeable>(_ value: T) throws(JSException)
+    @JSFunction func accept<T: BridgedSwiftGenericBridgeable>(_ value: T) throws(JSException)
+    @JSFunction func identity<T: BridgedSwiftGenericBridgeable>(_ value: T) throws(JSException) -> T
+    @JSFunction static func box<T: BridgedSwiftGenericBridgeable>(_ value: T) throws(JSException) -> T
+}
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/ImportArray.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/ImportArray.swift
index cd9142a26..a603e9c78 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/ImportArray.swift
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/ImportArray.swift
@@ -1,2 +1,11 @@
 @JSFunction func roundtrip(_ items: [Int]) throws(JSException) -> [Int]
 @JSFunction func logStrings(_ items: [String]) throws(JSException)
+
+// An optional container lowers to an `isSome` parameter *and* a stack payload,
+// so it has to be ordered with the other stack-lowered parameters.
+@JSFunction func optionalArrayThenArray(_ a: [Int]?, _ b: [Int]) throws(JSException) -> Int
+@JSFunction func borrowedStringAroundStackParams(
+    _ s: String,
+    _ a: [Int]?,
+    _ b: [Int]
+) throws(JSException) -> Int
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/JSImportBareModule.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/JSImportBareModule.swift
new file mode 100644
index 000000000..968b700e4
--- /dev/null
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/JSImportBareModule.swift
@@ -0,0 +1,22 @@
+@JSFunction(jsName: "basename", from: .module("node:path"))
+func nodeBasename(_ path: String) throws(JSException) -> String
+
+@JSFunction(jsName: "dirname", from: .module("node:path"))
+func nodeDirname(_ path: String) throws(JSException) -> String
+
+@JSGetter(jsName: "version", from: .module("some-package"))
+var packageVersion: String
+
+@JSFunction(jsName: .default, from: .module("default-export-package"))
+func callDefaultExport(_ value: Int) throws(JSException) -> Int
+
+@JSGetter(jsName: .default, from: .snippet("/Modules/DefaultExport.mjs"))
+var localDefaultExport: JSObject
+
+@JSClass(jsName: "File", from: .module("@scope/package"))
+struct ScopedFile {
+    @JSFunction init(_ value: Int) throws(JSException)
+    @JSFunction static func create(_ value: Int) throws(JSException) -> ScopedFile
+    @JSFunction func read() throws(JSException) -> Int
+    @JSGetter var size: Int
+}
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/JSImportBareModuleFallback.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/JSImportBareModuleFallback.swift
new file mode 100644
index 000000000..78671e33e
--- /dev/null
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/JSImportBareModuleFallback.swift
@@ -0,0 +1,12 @@
+// `weird-package` needs a member name that is not a valid JavaScript identifier, so
+// the whole origin falls back to a namespace import. `node:path` in the same file
+// keeps using named imports, proving the fallback is per-origin.
+
+@JSFunction(jsName: "kebab-case-function", from: .module("weird-package"))
+func kebabCaseFunction() throws(JSException) -> Int
+
+@JSGetter(jsName: "dashed-property", from: .module("weird-package"))
+var dashedProperty: String
+
+@JSFunction(jsName: "join", from: .module("node:path"))
+func joinPaths(_ lhs: String, _ rhs: String) throws(JSException) -> String
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/JSImportModule.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/JSImportModule.swift
new file mode 100644
index 000000000..091ac7911
--- /dev/null
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/JSImportModule.swift
@@ -0,0 +1,17 @@
+@JSFunction(from: .snippet("/Modules/JSImportModule.mjs"))
+func moduleAdd(_ lhs: Int, _ rhs: Int) throws(JSException) -> Int
+
+@JSFunction(jsName: "renamedFunction", from: .snippet("/Modules/JSImportModule.mjs"))
+func moduleRenamed() throws(JSException) -> String
+
+@JSGetter(jsName: "version", from: .snippet("/Modules/JSImportModule.mjs"))
+var moduleVersion: String
+
+@JSClass(from: .snippet("/Modules/ModuleCounter.mjs"))
+struct ModuleCounter {
+    @JSFunction init(_ value: Int) throws(JSException)
+    @JSFunction static func create(_ value: Int) throws(JSException) -> ModuleCounter
+    @JSFunction func increment() throws(JSException) -> Int
+    @JSGetter var value: Int
+    @JSSetter func setValue(_ value: Int) throws(JSException)
+}
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/JSNameOverride.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/JSNameOverride.swift
new file mode 100644
index 000000000..fc5777a15
--- /dev/null
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/JSNameOverride.swift
@@ -0,0 +1,40 @@
+@JS("makeGreeting") func renderGreeting(name: String) -> String
+
+@JS("greetName") func greet(_ name: String) -> String
+
+@JS("greetCount") func greet(_ count: Int) -> String
+
+@JS("namespacedRenamed", namespace: "Utils.Text") func namespacedFunction() -> Int
+
+@JS class RenamedMembers {
+    @JS("label") var title: String
+    @JS("total") let count: Int
+    @JS("sharedTotal") nonisolated(unsafe) static var sharedCount: Int = 0
+    @JS("readOnlyLimit") static let limit: Int = 10
+
+    @JS init(title: String, count: Int)
+    @JS("makeGreeting") func greet() -> String
+    @JS("makeDefault") static func createDefault() -> RenamedMembers
+}
+
+@JS struct RenamedVector {
+    var dx: Double
+    var dy: Double
+
+    @JS("originVector") static let origin: RenamedVector = RenamedVector(dx: 0, dy: 0)
+    @JS("magnitude") func length() -> Double
+    @JS("fromPolar") static func polar(radius: Double, angle: Double) -> RenamedVector
+}
+
+@JS enum RenamedEnumMembers {
+    case active
+    case inactive
+
+    @JS("describeCase") static func describe() -> String
+    @JS("currentDefault") nonisolated(unsafe) static var defaultValue: String = "active"
+}
+
+@JS enum RenamedNamespaceMembers {
+    @JS("plus") static func add(_ a: Int, _ b: Int) -> Int
+    @JS("theAnswer") nonisolated(unsafe) static var answer: Int = 42
+}
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/Modules/JSImportModule.mjs b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/Modules/JSImportModule.mjs
new file mode 100644
index 000000000..3107e222f
--- /dev/null
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/Modules/JSImportModule.mjs
@@ -0,0 +1,9 @@
+export function moduleAdd(lhs, rhs) {
+    return lhs + rhs;
+}
+
+export function renamedFunction() {
+    return "renamed";
+}
+
+export const version = "1.0";
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/Modules/ModuleCounter.mjs b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/Modules/ModuleCounter.mjs
new file mode 100644
index 000000000..5a33b7ffa
--- /dev/null
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/Modules/ModuleCounter.mjs
@@ -0,0 +1,17 @@
+export class ModuleCounter {
+    constructor(value) {
+        this.value = value;
+    }
+
+    static create(value) {
+        return new ModuleCounter(value);
+    }
+
+    increment() {
+        return ++this.value;
+    }
+
+    setValue(value) {
+        this.value = value;
+    }
+}
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/Multifile/CrossFileExtensionOrderMember.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/Multifile/CrossFileExtensionOrderMember.swift
new file mode 100644
index 000000000..277e9d40f
--- /dev/null
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/Multifile/CrossFileExtensionOrderMember.swift
@@ -0,0 +1,5 @@
+extension Archive.Record {
+    @JS func describeRecord() -> String {
+        "Record: " + label
+    }
+}
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/Multifile/CrossFileExtensionOrderType.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/Multifile/CrossFileExtensionOrderType.swift
new file mode 100644
index 000000000..641e25559
--- /dev/null
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/Multifile/CrossFileExtensionOrderType.swift
@@ -0,0 +1,13 @@
+@JS class Archive {
+    @JS init() {}
+}
+
+extension Archive {
+    @JS struct Record {
+        var label: String
+
+        @JS init(label: String) {
+            self.label = label
+        }
+    }
+}
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/Multifile/CrossFileNestedTypeClass.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/Multifile/CrossFileNestedTypeClass.swift
new file mode 100644
index 000000000..7fa16b59f
--- /dev/null
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/Multifile/CrossFileNestedTypeClass.swift
@@ -0,0 +1,11 @@
+@JS class Workspace {
+    let name: String
+
+    @JS init(name: String) {
+        self.name = name
+    }
+
+    @JS func describe() -> String {
+        name
+    }
+}
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/Multifile/CrossFileNestedTypeExtension.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/Multifile/CrossFileNestedTypeExtension.swift
new file mode 100644
index 000000000..1e99eae1e
--- /dev/null
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/Multifile/CrossFileNestedTypeExtension.swift
@@ -0,0 +1,6 @@
+extension Workspace {
+    @JS enum Kind: String {
+        case personal
+        case shared
+    }
+}
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/NamespacedClassSignature.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/NamespacedClassSignature.swift
new file mode 100644
index 000000000..67841f250
--- /dev/null
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/NamespacedClassSignature.swift
@@ -0,0 +1,13 @@
+@JS enum Workshop {
+    @JS class Bench {
+        @JS init() {}
+    }
+}
+
+@JS func makeBench() -> Workshop.Bench {
+    Workshop.Bench()
+}
+
+@JS func refitBench(_ bench: Workshop.Bench, _ transform: (Workshop.Bench) -> Workshop.Bench) -> Workshop.Bench {
+    transform(bench)
+}
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/Namespaces.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/Namespaces.swift
index 7cd63c698..7ad3037b9 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/Namespaces.swift
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/Namespaces.swift
@@ -1,7 +1,10 @@
 @JS func plainFunction() -> String { "plain" }
 
+/// A namespaced free function.
+/// - Returns: A fixed namespaced string.
 @JS(namespace: "MyModule.Utils") func namespacedFunction() -> String { "namespaced" }
 
+/// A greeter living in a namespace.
 @JS(namespace: "__Swift.Foundation") class Greeter {
     var name: String
 
@@ -9,6 +12,8 @@
         self.name = name
     }
 
+    /// Produces a greeting for the configured name.
+    /// - Returns: The greeting message.
     @JS func greet() -> String {
         return "Hello, " + self.name + "!"
     }
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/NestedTypeNameCollision.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/NestedTypeNameCollision.swift
new file mode 100644
index 000000000..231e8d7b6
--- /dev/null
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/NestedTypeNameCollision.swift
@@ -0,0 +1,25 @@
+@JS enum Catalog {
+    @JS struct Entry {
+        var title: String
+
+        @JS init(title: String) {
+            self.title = title
+        }
+    }
+}
+
+@JS struct Entry {
+    var identifier: Int
+
+    @JS init(identifier: Int) {
+        self.identifier = identifier
+    }
+}
+
+@JS func takeEntry(_ entry: Entry) -> Entry {
+    entry
+}
+
+@JS func takeCatalogEntry(_ entry: Catalog.Entry) -> Catalog.Entry {
+    entry
+}
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/Optionals.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/Optionals.swift
index 5df48d9c0..ea37f5740 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/Optionals.swift
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/Optionals.swift
@@ -30,6 +30,13 @@ class OptionalPropertyHolder {
 
 @JS func testOptionalPropertyRoundtrip(_ holder: OptionalPropertyHolder?) -> OptionalPropertyHolder?
 
+// Exported functions taking an optional jsObject use the direct (isSome, objId)
+// parameter ABI; the return value travels through the stack ABI.
+@JS func roundTripExportedOptionalJSObject(value: JSObject?) -> JSObject?
+
+// Exported function taking/returning an optional imported @JSClass (issue #751).
+@JS func roundTripExportedOptionalJSClass(value: WithOptionalJSClass?) -> WithOptionalJSClass?
+
 @JS
 func roundTripString(name: String?) -> String? {
     return name
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/RelativeQualifiedTypes.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/RelativeQualifiedTypes.swift
new file mode 100644
index 000000000..b1eae64dd
--- /dev/null
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/RelativeQualifiedTypes.swift
@@ -0,0 +1,37 @@
+@JS class Library {
+    @JS struct Shelf {
+        @JS struct Divider {
+            var slot: Int
+
+            @JS init(slot: Int) {
+                self.slot = slot
+            }
+        }
+    }
+
+    @JS init() {}
+}
+
+extension Library {
+    @JS func divider(_ value: Shelf.Divider) -> Shelf.Divider {
+        value
+    }
+}
+
+@JS class Outer {
+    @JS struct Inner {
+        @JS struct Outer {
+            @JS struct Inner {
+                @JS init() {}
+            }
+        }
+
+        @JS init() {}
+    }
+
+    @JS init() {}
+}
+
+extension Outer.Inner {
+    @JS func marker() -> Int { 1 }
+}
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/StructWithNestedTypes.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/StructWithNestedTypes.swift
new file mode 100644
index 000000000..d8e5973c1
--- /dev/null
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/StructWithNestedTypes.swift
@@ -0,0 +1,52 @@
+@JS struct Shape {
+    @JS enum Kind: String {
+        case circle
+        case square
+    }
+
+    var label: String
+
+    @JS init(label: String) {
+        self.label = label
+    }
+}
+
+@JS struct Widget {
+    @JS enum Variant: String {
+        case button
+        case slider
+    }
+
+    @JS struct Layout {
+        @JS enum Alignment: String {
+            case leading
+            case trailing
+        }
+
+        var padding: Int
+    }
+
+    @JS struct Bounds {
+        var width: Int
+        var height: Int
+
+        @JS init(width: Int, height: Int) {
+            self.width = width
+            self.height = height
+        }
+
+        @JS static var dimensions: Int {
+            2
+        }
+
+        @JS static func zero() -> Bounds {
+            Bounds(width: 0, height: 0)
+        }
+    }
+
+    var name: String
+
+    @JS init(name: String) {
+        self.name = name
+    }
+}
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/SwiftClosure.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/SwiftClosure.swift
index 6872d7989..cdd756d51 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/SwiftClosure.swift
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/SwiftClosure.swift
@@ -38,6 +38,17 @@ import JavaScriptKit
 @JS func roundtripPerson(_ personClosure: (Person) -> Person) -> (Person) -> Person
 @JS func roundtripOptionalPerson(_ personClosure: (Person?) -> Person?) -> (Person?) -> Person?
 
+@JS func makeThrowingParser() -> JSTypedClosure<(String) throws(JSException) -> Int>
+@JS func validateWith(_ validate: (String) throws(JSException) -> Bool)
+
+@JS func makeFetcher() -> JSTypedClosure<(String) async throws(JSException) -> String>
+
+@JS func makeAsyncEcho() -> JSTypedClosure<(String) async -> String>
+
+@JS func makeAnimalLoader() -> JSTypedClosure<(String) async -> Animal>
+
+@JS func makeResultLoader() -> JSTypedClosure<(Bool) async throws(JSException) -> APIResult>
+
 @JS func roundtripDirection(_ callback: (Direction) -> Direction) -> (Direction) -> Direction
 @JS func roundtripTheme(_ callback: (Theme) -> Theme) -> (Theme) -> Theme
 @JS func roundtripHttpStatus(_ callback: (HttpStatus) -> HttpStatus) -> (HttpStatus) -> HttpStatus
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/SwiftClosureImports.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/SwiftClosureImports.swift
index d9f92fffb..88be5420e 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/SwiftClosureImports.swift
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/SwiftClosureImports.swift
@@ -1,3 +1,7 @@
 @JSFunction func applyInt(_ value: Int, _ transform: (Int) -> Int) throws(JSException) -> Int
 
 @JSFunction func makeAdder(_ base: Int) throws(JSException) -> (Int) -> Int
+
+@JS func runValidator(_ cb: (String) throws(JSException) -> Bool)
+
+@JS func loadEach(_ fetch: (String) async throws(JSException) -> String)
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/SwiftStruct.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/SwiftStruct.swift
index 63bb0ff8d..4d2a84763 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/SwiftStruct.swift
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/SwiftStruct.swift
@@ -74,6 +74,10 @@ extension Vector2D {
     @JS func scaled(by factor: Double) -> Vector2D {
         return Vector2D(dx: dx * factor, dy: dy * factor)
     }
+
+    @JS func describe() -> String {
+        return "Vector2D(\(dx), \(dy))"
+    }
 }
 
 extension DataPoint {
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/SwiftStructImports.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/SwiftStructImports.swift
index b00fd768a..a1eed686a 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/SwiftStructImports.swift
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/SwiftStructImports.swift
@@ -5,3 +5,5 @@ struct Point {
 }
 
 @JSFunction func translate(_ point: Point, dx: Int, dy: Int) throws(JSException) -> Point
+
+@JSFunction func roundTripOptional(_ point: Point?) throws(JSException) -> Point?
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Alias.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Alias.json
new file mode 100644
index 000000000..b47afb905
--- /dev/null
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Alias.json
@@ -0,0 +1,721 @@
+{
+  "exported" : {
+    "aliases" : [
+      {
+        "swiftCallName" : "Polygon",
+        "underlying" : {
+          "swiftHeapObject" : {
+            "_0" : "PolygonReference"
+          }
+        }
+      },
+      {
+        "swiftCallName" : "Tag",
+        "underlying" : {
+          "swiftHeapObject" : {
+            "_0" : "TagReference"
+          }
+        }
+      },
+      {
+        "swiftCallName" : "Tagged",
+        "underlying" : {
+          "string" : {
+
+          }
+        }
+      },
+      {
+        "swiftCallName" : "Canvas",
+        "underlying" : {
+          "jsObject" : {
+            "_0" : "Surface"
+          }
+        }
+      },
+      {
+        "swiftCallName" : "AliasedTag",
+        "underlying" : {
+          "associatedValueEnum" : {
+            "_0" : "InnerTag"
+          }
+        }
+      },
+      {
+        "swiftCallName" : "UserId",
+        "underlying" : {
+          "integer" : {
+            "_0" : {
+              "isSigned" : true,
+              "width" : "word"
+            }
+          }
+        }
+      }
+    ],
+    "classes" : [
+      {
+        "constructor" : {
+          "abiName" : "bjs_PolygonReference_init",
+          "effects" : {
+            "isAsync" : false,
+            "isStatic" : false,
+            "isThrows" : false
+          },
+          "parameters" : [
+            {
+              "label" : "underlying",
+              "name" : "underlying",
+              "type" : {
+                "alias" : {
+                  "name" : "Polygon",
+                  "underlying" : {
+                    "swiftHeapObject" : {
+                      "_0" : "PolygonReference"
+                    }
+                  }
+                }
+              }
+            }
+          ]
+        },
+        "isFinal" : true,
+        "methods" : [
+          {
+            "abiName" : "bjs_PolygonReference_snapshot",
+            "effects" : {
+              "isAsync" : false,
+              "isStatic" : false,
+              "isThrows" : false
+            },
+            "name" : "snapshot",
+            "parameters" : [
+
+            ],
+            "returnType" : {
+              "alias" : {
+                "name" : "Polygon",
+                "underlying" : {
+                  "swiftHeapObject" : {
+                    "_0" : "PolygonReference"
+                  }
+                }
+              }
+            }
+          },
+          {
+            "abiName" : "bjs_PolygonReference_merge",
+            "effects" : {
+              "isAsync" : false,
+              "isStatic" : false,
+              "isThrows" : false
+            },
+            "name" : "merge",
+            "parameters" : [
+              {
+                "label" : "_",
+                "name" : "other",
+                "type" : {
+                  "alias" : {
+                    "name" : "Polygon",
+                    "underlying" : {
+                      "swiftHeapObject" : {
+                        "_0" : "PolygonReference"
+                      }
+                    }
+                  }
+                }
+              }
+            ],
+            "returnType" : {
+              "alias" : {
+                "name" : "Polygon",
+                "underlying" : {
+                  "swiftHeapObject" : {
+                    "_0" : "PolygonReference"
+                  }
+                }
+              }
+            }
+          },
+          {
+            "abiName" : "bjs_PolygonReference_static_origin",
+            "effects" : {
+              "isAsync" : false,
+              "isStatic" : true,
+              "isThrows" : false
+            },
+            "name" : "origin",
+            "parameters" : [
+
+            ],
+            "returnType" : {
+              "alias" : {
+                "name" : "Polygon",
+                "underlying" : {
+                  "swiftHeapObject" : {
+                    "_0" : "PolygonReference"
+                  }
+                }
+              }
+            },
+            "staticContext" : {
+              "className" : {
+                "_0" : "PolygonReference"
+              }
+            }
+          }
+        ],
+        "name" : "PolygonReference",
+        "properties" : [
+
+        ],
+        "swiftCallName" : "PolygonReference"
+      },
+      {
+        "constructor" : {
+          "abiName" : "bjs_TagReference_init",
+          "effects" : {
+            "isAsync" : false,
+            "isStatic" : false,
+            "isThrows" : false
+          },
+          "parameters" : [
+            {
+              "label" : "underlying",
+              "name" : "underlying",
+              "type" : {
+                "alias" : {
+                  "name" : "Tag",
+                  "underlying" : {
+                    "swiftHeapObject" : {
+                      "_0" : "TagReference"
+                    }
+                  }
+                }
+              }
+            }
+          ]
+        },
+        "isFinal" : true,
+        "methods" : [
+
+        ],
+        "name" : "TagReference",
+        "properties" : [
+
+        ],
+        "swiftCallName" : "TagReference"
+      }
+    ],
+    "enums" : [
+      {
+        "cases" : [
+          {
+            "associatedValues" : [
+              {
+                "type" : {
+                  "integer" : {
+                    "_0" : {
+                      "isSigned" : true,
+                      "width" : "word"
+                    }
+                  }
+                }
+              }
+            ],
+            "name" : "payload"
+          },
+          {
+            "associatedValues" : [
+
+            ],
+            "name" : "empty"
+          }
+        ],
+        "emitStyle" : "const",
+        "name" : "InnerTag",
+        "staticMethods" : [
+
+        ],
+        "staticProperties" : [
+
+        ],
+        "swiftCallName" : "InnerTag",
+        "tsFullPath" : "InnerTag"
+      }
+    ],
+    "exposeToGlobal" : false,
+    "functions" : [
+      {
+        "abiName" : "bjs_roundtripPolygon",
+        "effects" : {
+          "isAsync" : false,
+          "isStatic" : false,
+          "isThrows" : false
+        },
+        "name" : "roundtripPolygon",
+        "parameters" : [
+          {
+            "label" : "_",
+            "name" : "polygon",
+            "type" : {
+              "alias" : {
+                "name" : "Polygon",
+                "underlying" : {
+                  "swiftHeapObject" : {
+                    "_0" : "PolygonReference"
+                  }
+                }
+              }
+            }
+          }
+        ],
+        "returnType" : {
+          "alias" : {
+            "name" : "Polygon",
+            "underlying" : {
+              "swiftHeapObject" : {
+                "_0" : "PolygonReference"
+              }
+            }
+          }
+        }
+      },
+      {
+        "abiName" : "bjs_optionalPolygon",
+        "effects" : {
+          "isAsync" : false,
+          "isStatic" : false,
+          "isThrows" : false
+        },
+        "name" : "optionalPolygon",
+        "parameters" : [
+          {
+            "label" : "_",
+            "name" : "polygon",
+            "type" : {
+              "nullable" : {
+                "_0" : {
+                  "alias" : {
+                    "name" : "Polygon",
+                    "underlying" : {
+                      "swiftHeapObject" : {
+                        "_0" : "PolygonReference"
+                      }
+                    }
+                  }
+                },
+                "_1" : "null"
+              }
+            }
+          }
+        ],
+        "returnType" : {
+          "nullable" : {
+            "_0" : {
+              "alias" : {
+                "name" : "Polygon",
+                "underlying" : {
+                  "swiftHeapObject" : {
+                    "_0" : "PolygonReference"
+                  }
+                }
+              }
+            },
+            "_1" : "null"
+          }
+        }
+      },
+      {
+        "abiName" : "bjs_polygonArray",
+        "effects" : {
+          "isAsync" : false,
+          "isStatic" : false,
+          "isThrows" : false
+        },
+        "name" : "polygonArray",
+        "parameters" : [
+          {
+            "label" : "_",
+            "name" : "polygons",
+            "type" : {
+              "array" : {
+                "_0" : {
+                  "alias" : {
+                    "name" : "Polygon",
+                    "underlying" : {
+                      "swiftHeapObject" : {
+                        "_0" : "PolygonReference"
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          }
+        ],
+        "returnType" : {
+          "array" : {
+            "_0" : {
+              "alias" : {
+                "name" : "Polygon",
+                "underlying" : {
+                  "swiftHeapObject" : {
+                    "_0" : "PolygonReference"
+                  }
+                }
+              }
+            }
+          }
+        }
+      },
+      {
+        "abiName" : "bjs_validatePolygon",
+        "effects" : {
+          "isAsync" : false,
+          "isStatic" : false,
+          "isThrows" : true
+        },
+        "name" : "validatePolygon",
+        "parameters" : [
+          {
+            "label" : "_",
+            "name" : "polygon",
+            "type" : {
+              "alias" : {
+                "name" : "Polygon",
+                "underlying" : {
+                  "swiftHeapObject" : {
+                    "_0" : "PolygonReference"
+                  }
+                }
+              }
+            }
+          }
+        ],
+        "returnType" : {
+          "alias" : {
+            "name" : "Polygon",
+            "underlying" : {
+              "swiftHeapObject" : {
+                "_0" : "PolygonReference"
+              }
+            }
+          }
+        }
+      },
+      {
+        "abiName" : "bjs_makeTag",
+        "effects" : {
+          "isAsync" : false,
+          "isStatic" : false,
+          "isThrows" : false
+        },
+        "name" : "makeTag",
+        "parameters" : [
+          {
+            "label" : "_",
+            "name" : "name",
+            "type" : {
+              "string" : {
+
+              }
+            }
+          }
+        ],
+        "returnType" : {
+          "alias" : {
+            "name" : "Tag",
+            "underlying" : {
+              "swiftHeapObject" : {
+                "_0" : "TagReference"
+              }
+            }
+          }
+        }
+      },
+      {
+        "abiName" : "bjs_roundtripTags",
+        "effects" : {
+          "isAsync" : false,
+          "isStatic" : false,
+          "isThrows" : false
+        },
+        "name" : "roundtripTags",
+        "parameters" : [
+          {
+            "label" : "_",
+            "name" : "xs",
+            "type" : {
+              "array" : {
+                "_0" : {
+                  "nullable" : {
+                    "_0" : {
+                      "alias" : {
+                        "name" : "AliasedTag",
+                        "underlying" : {
+                          "associatedValueEnum" : {
+                            "_0" : "InnerTag"
+                          }
+                        }
+                      }
+                    },
+                    "_1" : "null"
+                  }
+                }
+              }
+            }
+          }
+        ],
+        "returnType" : {
+          "array" : {
+            "_0" : {
+              "nullable" : {
+                "_0" : {
+                  "alias" : {
+                    "name" : "AliasedTag",
+                    "underlying" : {
+                      "associatedValueEnum" : {
+                        "_0" : "InnerTag"
+                      }
+                    }
+                  }
+                },
+                "_1" : "null"
+              }
+            }
+          }
+        }
+      },
+      {
+        "abiName" : "bjs_describeUser",
+        "effects" : {
+          "isAsync" : false,
+          "isStatic" : false,
+          "isThrows" : false
+        },
+        "name" : "describeUser",
+        "parameters" : [
+          {
+            "label" : "_",
+            "name" : "owner",
+            "type" : {
+              "swiftProtocol" : {
+                "_0" : "HasOptionalUserId"
+              }
+            }
+          }
+        ],
+        "returnType" : {
+          "swiftProtocol" : {
+            "_0" : "HasOptionalUserId"
+          }
+        }
+      }
+    ],
+    "protocols" : [
+      {
+        "methods" : [
+
+        ],
+        "name" : "HasOptionalUserId",
+        "properties" : [
+          {
+            "isReadonly" : true,
+            "name" : "userId",
+            "type" : {
+              "nullable" : {
+                "_0" : {
+                  "alias" : {
+                    "name" : "UserId",
+                    "underlying" : {
+                      "integer" : {
+                        "_0" : {
+                          "isSigned" : true,
+                          "width" : "word"
+                        }
+                      }
+                    }
+                  }
+                },
+                "_1" : "null"
+              }
+            }
+          }
+        ]
+      }
+    ],
+    "structs" : [
+
+    ]
+  },
+  "imported" : {
+    "children" : [
+      {
+        "functions" : [
+          {
+            "accessLevel" : "internal",
+            "effects" : {
+              "isAsync" : false,
+              "isStatic" : false,
+              "isThrows" : true
+            },
+            "name" : "acceptTagged",
+            "parameters" : [
+              {
+                "name" : "tagged",
+                "type" : {
+                  "alias" : {
+                    "name" : "Tagged",
+                    "underlying" : {
+                      "string" : {
+
+                      }
+                    }
+                  }
+                }
+              }
+            ],
+            "returnType" : {
+              "void" : {
+
+              }
+            }
+          },
+          {
+            "accessLevel" : "internal",
+            "effects" : {
+              "isAsync" : false,
+              "isStatic" : false,
+              "isThrows" : true
+            },
+            "name" : "acceptOptionalTagged",
+            "parameters" : [
+              {
+                "name" : "tagged",
+                "type" : {
+                  "nullable" : {
+                    "_0" : {
+                      "alias" : {
+                        "name" : "Tagged",
+                        "underlying" : {
+                          "string" : {
+
+                          }
+                        }
+                      }
+                    },
+                    "_1" : "null"
+                  }
+                }
+              }
+            ],
+            "returnType" : {
+              "void" : {
+
+              }
+            }
+          },
+          {
+            "accessLevel" : "internal",
+            "effects" : {
+              "isAsync" : false,
+              "isStatic" : false,
+              "isThrows" : true
+            },
+            "name" : "roundtripTagged",
+            "parameters" : [
+              {
+                "name" : "tagged",
+                "type" : {
+                  "alias" : {
+                    "name" : "Tagged",
+                    "underlying" : {
+                      "string" : {
+
+                      }
+                    }
+                  }
+                }
+              }
+            ],
+            "returnType" : {
+              "alias" : {
+                "name" : "Tagged",
+                "underlying" : {
+                  "string" : {
+
+                  }
+                }
+              }
+            }
+          },
+          {
+            "accessLevel" : "internal",
+            "effects" : {
+              "isAsync" : false,
+              "isStatic" : false,
+              "isThrows" : true
+            },
+            "name" : "produceOptionalCanvas",
+            "parameters" : [
+
+            ],
+            "returnType" : {
+              "nullable" : {
+                "_0" : {
+                  "alias" : {
+                    "name" : "Canvas",
+                    "underlying" : {
+                      "jsObject" : {
+                        "_0" : "Surface"
+                      }
+                    }
+                  }
+                },
+                "_1" : "null"
+              }
+            }
+          }
+        ],
+        "types" : [
+          {
+            "accessLevel" : "internal",
+            "constructor" : {
+              "accessLevel" : "internal",
+              "parameters" : [
+
+              ]
+            },
+            "getters" : [
+              {
+                "accessLevel" : "internal",
+                "name" : "label",
+                "type" : {
+                  "string" : {
+
+                  }
+                }
+              }
+            ],
+            "methods" : [
+
+            ],
+            "name" : "Surface",
+            "setters" : [
+
+            ],
+            "staticMethods" : [
+
+            ]
+          }
+        ]
+      }
+    ]
+  },
+  "moduleName" : "TestModule",
+  "usedExternalModules" : [
+
+  ]
+}
\ No newline at end of file
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Alias.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Alias.swift
new file mode 100644
index 000000000..4483de428
--- /dev/null
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Alias.swift
@@ -0,0 +1,426 @@
+struct AnyHasOptionalUserId: HasOptionalUserId, _BridgedSwiftProtocolWrapper {
+    let jsObject: JSObject
+
+    var userId: Optional<UserId> {
+        get {
+            let jsObjectValue = jsObject.bridgeJSLowerParameter()
+            bjs_HasOptionalUserId_userId_get(jsObjectValue)
+            return Optional<UserId>.bridgeJSLiftReturnFromSideChannel()
+        }
+    }
+
+    static func bridgeJSLiftParameter(_ value: Int32) -> Self {
+        return AnyHasOptionalUserId(jsObject: JSObject(id: UInt32(bitPattern: value)))
+    }
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "TestModule", name: "bjs_HasOptionalUserId_userId_get")
+fileprivate func bjs_HasOptionalUserId_userId_get_extern(_ jsObject: Int32) -> Void
+#else
+fileprivate func bjs_HasOptionalUserId_userId_get_extern(_ jsObject: Int32) -> Void {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func bjs_HasOptionalUserId_userId_get(_ jsObject: Int32) -> Void {
+    return bjs_HasOptionalUserId_userId_get_extern(jsObject)
+}
+
+extension InnerTag: _BridgedSwiftAssociatedValueEnum {
+    @_spi(BridgeJS) @_transparent public static func bridgeJSStackPopPayload(_ caseId: Int32) -> InnerTag {
+        switch caseId {
+        case 0:
+            return .payload(Int.bridgeJSStackPop())
+        case 1:
+            return .empty
+        default:
+            fatalError("Unknown InnerTag case ID: \(caseId)")
+        }
+    }
+
+    @_spi(BridgeJS) @_transparent public consuming func bridgeJSStackPushPayload() -> Int32 {
+        switch self {
+        case .payload(let param0):
+            param0.bridgeJSStackPush()
+            return Int32(0)
+        case .empty:
+            return Int32(1)
+        }
+    }
+}
+
+@_expose(wasm, "bjs_roundtripPolygon")
+@_cdecl("bjs_roundtripPolygon")
+public func _bjs_roundtripPolygon(_ polygon: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer {
+    #if arch(wasm32)
+    let ret = roundtripPolygon(_: Polygon.bridgeJSLiftParameter(polygon))
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_optionalPolygon")
+@_cdecl("bjs_optionalPolygon")
+public func _bjs_optionalPolygon(_ polygonIsSome: Int32, _ polygonValue: UnsafeMutableRawPointer) -> Void {
+    #if arch(wasm32)
+    let ret = optionalPolygon(_: Optional<Polygon>.bridgeJSLiftParameter(polygonIsSome, polygonValue))
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_polygonArray")
+@_cdecl("bjs_polygonArray")
+public func _bjs_polygonArray() -> Void {
+    #if arch(wasm32)
+    let ret = polygonArray(_: [Polygon].bridgeJSStackPop())
+    ret.bridgeJSStackPush()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_validatePolygon")
+@_cdecl("bjs_validatePolygon")
+public func _bjs_validatePolygon(_ polygon: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer {
+    #if arch(wasm32)
+    do {
+        let ret = try validatePolygon(_: Polygon.bridgeJSLiftParameter(polygon))
+        return ret.bridgeJSLowerReturn()
+    } catch let error {
+        if let error = error.thrownValue.object {
+            withExtendedLifetime(error) {
+                _swift_js_throw(Int32(bitPattern: $0.id))
+            }
+        } else {
+            let jsError = JSError(message: error.description)
+            withExtendedLifetime(jsError.jsObject) {
+                _swift_js_throw(Int32(bitPattern: $0.id))
+            }
+        }
+        return UnsafeMutableRawPointer(bitPattern: -1).unsafelyUnwrapped
+    }
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_makeTag")
+@_cdecl("bjs_makeTag")
+public func _bjs_makeTag(_ nameBytes: Int32, _ nameLength: Int32) -> UnsafeMutableRawPointer {
+    #if arch(wasm32)
+    let ret = makeTag(_: String.bridgeJSLiftParameter(nameBytes, nameLength))
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_roundtripTags")
+@_cdecl("bjs_roundtripTags")
+public func _bjs_roundtripTags() -> Void {
+    #if arch(wasm32)
+    let ret = roundtripTags(_: [Optional<AliasedTag>].bridgeJSStackPop())
+    ret.bridgeJSStackPush()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_describeUser")
+@_cdecl("bjs_describeUser")
+public func _bjs_describeUser(_ owner: Int32) -> Int32 {
+    #if arch(wasm32)
+    let ret = describeUser(_: AnyHasOptionalUserId.bridgeJSLiftParameter(owner)) as! _BridgedSwiftProtocolExportable
+    return ret.bridgeJSLowerAsProtocolReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_PolygonReference_init")
+@_cdecl("bjs_PolygonReference_init")
+public func _bjs_PolygonReference_init(_ underlying: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer {
+    #if arch(wasm32)
+    let ret = PolygonReference(underlying: Polygon.bridgeJSLiftParameter(underlying))
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_PolygonReference_snapshot")
+@_cdecl("bjs_PolygonReference_snapshot")
+public func _bjs_PolygonReference_snapshot(_ _self: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer {
+    #if arch(wasm32)
+    let ret = PolygonReference.bridgeJSLiftParameter(_self).snapshot()
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_PolygonReference_merge")
+@_cdecl("bjs_PolygonReference_merge")
+public func _bjs_PolygonReference_merge(_ _self: UnsafeMutableRawPointer, _ other: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer {
+    #if arch(wasm32)
+    let ret = PolygonReference.bridgeJSLiftParameter(_self).merge(_: Polygon.bridgeJSLiftParameter(other))
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_PolygonReference_static_origin")
+@_cdecl("bjs_PolygonReference_static_origin")
+public func _bjs_PolygonReference_static_origin() -> UnsafeMutableRawPointer {
+    #if arch(wasm32)
+    let ret = PolygonReference.origin()
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_PolygonReference_deinit")
+@_cdecl("bjs_PolygonReference_deinit")
+public func _bjs_PolygonReference_deinit(_ pointer: UnsafeMutableRawPointer) -> Void {
+    #if arch(wasm32)
+    Unmanaged<PolygonReference>.fromOpaque(pointer).release()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+extension PolygonReference: ConvertibleToJSValue, _BridgedSwiftHeapObject, _BridgedSwiftProtocolExportable {
+    var jsValue: JSValue {
+        return .object(JSObject(id: UInt32(bitPattern: _bjs_PolygonReference_wrap(Unmanaged.passRetained(self).toOpaque()))))
+    }
+    consuming func bridgeJSLowerAsProtocolReturn() -> Int32 {
+        _bjs_PolygonReference_wrap(Unmanaged.passRetained(self).toOpaque())
+    }
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "TestModule", name: "bjs_PolygonReference_wrap")
+fileprivate func _bjs_PolygonReference_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32
+#else
+fileprivate func _bjs_PolygonReference_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func _bjs_PolygonReference_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 {
+    return _bjs_PolygonReference_wrap_extern(pointer)
+}
+
+@_expose(wasm, "bjs_TagReference_init")
+@_cdecl("bjs_TagReference_init")
+public func _bjs_TagReference_init(_ underlying: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer {
+    #if arch(wasm32)
+    let ret = TagReference(underlying: Tag.bridgeJSLiftParameter(underlying))
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_TagReference_deinit")
+@_cdecl("bjs_TagReference_deinit")
+public func _bjs_TagReference_deinit(_ pointer: UnsafeMutableRawPointer) -> Void {
+    #if arch(wasm32)
+    Unmanaged<TagReference>.fromOpaque(pointer).release()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+extension TagReference: ConvertibleToJSValue, _BridgedSwiftHeapObject, _BridgedSwiftProtocolExportable {
+    var jsValue: JSValue {
+        return .object(JSObject(id: UInt32(bitPattern: _bjs_TagReference_wrap(Unmanaged.passRetained(self).toOpaque()))))
+    }
+    consuming func bridgeJSLowerAsProtocolReturn() -> Int32 {
+        _bjs_TagReference_wrap(Unmanaged.passRetained(self).toOpaque())
+    }
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "TestModule", name: "bjs_TagReference_wrap")
+fileprivate func _bjs_TagReference_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32
+#else
+fileprivate func _bjs_TagReference_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func _bjs_TagReference_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 {
+    return _bjs_TagReference_wrap_extern(pointer)
+}
+
+extension PolygonReference: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = PolygonReference.bridgeJSMakeTypeHandle()
+}
+
+extension TagReference: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = TagReference.bridgeJSMakeTypeHandle()
+}
+
+extension InnerTag: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = InnerTag.bridgeJSMakeTypeHandle()
+}
+
+extension Polygon: _BridgedSwiftAlias, _BridgedSwiftStackType {}
+
+extension Tag: _BridgedSwiftAlias, _BridgedSwiftStackType {}
+
+extension Tagged: _BridgedSwiftAlias, _BridgedSwiftStackType {}
+
+extension Canvas: _BridgedSwiftAlias, _BridgedSwiftStackType {}
+
+extension AliasedTag: _BridgedSwiftAlias, _BridgedSwiftAssociatedValueEnum {}
+
+extension UserId: _BridgedSwiftAlias, _BridgedSwiftStackType {}
+
+#if arch(wasm32)
+@_extern(wasm, module: "TestModule", name: "bjs_acceptTagged")
+fileprivate func bjs_acceptTagged_extern(_ taggedBytes: Int32, _ taggedLength: Int32) -> Void
+#else
+fileprivate func bjs_acceptTagged_extern(_ taggedBytes: Int32, _ taggedLength: Int32) -> Void {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func bjs_acceptTagged(_ taggedBytes: Int32, _ taggedLength: Int32) -> Void {
+    return bjs_acceptTagged_extern(taggedBytes, taggedLength)
+}
+
+func _$acceptTagged(_ tagged: Tagged) throws(JSException) -> Void {
+    tagged.bridgeJSWithLoweredParameter { (taggedBytes, taggedLength) in
+        bjs_acceptTagged(taggedBytes, taggedLength)
+    }
+    if let error = _swift_js_take_exception() {
+        throw error
+    }
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "TestModule", name: "bjs_acceptOptionalTagged")
+fileprivate func bjs_acceptOptionalTagged_extern(_ taggedIsSome: Int32, _ taggedBytes: Int32, _ taggedLength: Int32) -> Void
+#else
+fileprivate func bjs_acceptOptionalTagged_extern(_ taggedIsSome: Int32, _ taggedBytes: Int32, _ taggedLength: Int32) -> Void {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func bjs_acceptOptionalTagged(_ taggedIsSome: Int32, _ taggedBytes: Int32, _ taggedLength: Int32) -> Void {
+    return bjs_acceptOptionalTagged_extern(taggedIsSome, taggedBytes, taggedLength)
+}
+
+func _$acceptOptionalTagged(_ tagged: Optional<Tagged>) throws(JSException) -> Void {
+    tagged.bridgeJSWithLoweredParameter { (taggedIsSome, taggedBytes, taggedLength) in
+        bjs_acceptOptionalTagged(taggedIsSome, taggedBytes, taggedLength)
+    }
+    if let error = _swift_js_take_exception() {
+        throw error
+    }
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "TestModule", name: "bjs_roundtripTagged")
+fileprivate func bjs_roundtripTagged_extern(_ taggedBytes: Int32, _ taggedLength: Int32) -> Int32
+#else
+fileprivate func bjs_roundtripTagged_extern(_ taggedBytes: Int32, _ taggedLength: Int32) -> Int32 {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func bjs_roundtripTagged(_ taggedBytes: Int32, _ taggedLength: Int32) -> Int32 {
+    return bjs_roundtripTagged_extern(taggedBytes, taggedLength)
+}
+
+func _$roundtripTagged(_ tagged: Tagged) throws(JSException) -> Tagged {
+    let ret0 = tagged.bridgeJSWithLoweredParameter { (taggedBytes, taggedLength) in
+        let ret = bjs_roundtripTagged(taggedBytes, taggedLength)
+        return ret
+    }
+    let ret = ret0
+    if let error = _swift_js_take_exception() {
+        throw error
+    }
+    return Tagged.bridgeJSLiftReturn(ret)
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "TestModule", name: "bjs_produceOptionalCanvas")
+fileprivate func bjs_produceOptionalCanvas_extern() -> Void
+#else
+fileprivate func bjs_produceOptionalCanvas_extern() -> Void {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func bjs_produceOptionalCanvas() -> Void {
+    return bjs_produceOptionalCanvas_extern()
+}
+
+func _$produceOptionalCanvas() throws(JSException) -> Optional<Canvas> {
+    bjs_produceOptionalCanvas()
+    if let error = _swift_js_take_exception() {
+        throw error
+    }
+    return Optional<Canvas>.bridgeJSLiftReturn()
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "TestModule", name: "bjs_Surface_init")
+fileprivate func bjs_Surface_init_extern() -> Int32
+#else
+fileprivate func bjs_Surface_init_extern() -> Int32 {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func bjs_Surface_init() -> Int32 {
+    return bjs_Surface_init_extern()
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "TestModule", name: "bjs_Surface_label_get")
+fileprivate func bjs_Surface_label_get_extern(_ self: Int32) -> Int32
+#else
+fileprivate func bjs_Surface_label_get_extern(_ self: Int32) -> Int32 {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func bjs_Surface_label_get(_ self: Int32) -> Int32 {
+    return bjs_Surface_label_get_extern(self)
+}
+
+func _$Surface_init() throws(JSException) -> JSObject {
+    let ret = bjs_Surface_init()
+    if let error = _swift_js_take_exception() {
+        throw error
+    }
+    return JSObject.bridgeJSLiftReturn(ret)
+}
+
+func _$Surface_label_get(_ self: JSObject) throws(JSException) -> String {
+    let selfValue = self.bridgeJSLowerParameter()
+    let ret = bjs_Surface_label_get(selfValue)
+    if let error = _swift_js_take_exception() {
+        throw error
+    }
+    return String.bridgeJSLiftReturn(ret)
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "bjs_TestModule_register_type_handles")
+fileprivate func _bjs_TestModule_register_type_handles_extern(_ base: UnsafePointer<Int32>?, _ count: Int32)
+
+@_expose(wasm, "bjs_TestModule_register_type_handles")
+public func _bjs_TestModule_register_type_handles() {
+    let typeIds: [Int32] = [
+        PolygonReference.bridgeJSTypeID,
+        TagReference.bridgeJSTypeID,
+        InnerTag.bridgeJSTypeID,
+    ]
+    typeIds.withUnsafeBufferPointer { buffer in
+        _bjs_TestModule_register_type_handles_extern(buffer.baseAddress, Int32(buffer.count))
+    }
+}
+#endif
\ No newline at end of file
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/AliasInClosure.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/AliasInClosure.json
new file mode 100644
index 000000000..c9107133d
--- /dev/null
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/AliasInClosure.json
@@ -0,0 +1,146 @@
+{
+  "exported" : {
+    "aliases" : [
+      {
+        "swiftCallName" : "Polygon",
+        "underlying" : {
+          "swiftHeapObject" : {
+            "_0" : "PolygonReference"
+          }
+        }
+      }
+    ],
+    "classes" : [
+      {
+        "constructor" : {
+          "abiName" : "bjs_PolygonReference_init",
+          "effects" : {
+            "isAsync" : false,
+            "isStatic" : false,
+            "isThrows" : false
+          },
+          "parameters" : [
+            {
+              "label" : "sides",
+              "name" : "sides",
+              "type" : {
+                "integer" : {
+                  "_0" : {
+                    "isSigned" : true,
+                    "width" : "word"
+                  }
+                }
+              }
+            }
+          ]
+        },
+        "isFinal" : true,
+        "methods" : [
+
+        ],
+        "name" : "PolygonReference",
+        "properties" : [
+
+        ],
+        "swiftCallName" : "PolygonReference"
+      }
+    ],
+    "enums" : [
+
+    ],
+    "exposeToGlobal" : false,
+    "functions" : [
+      {
+        "abiName" : "bjs_makePolygonFactory",
+        "effects" : {
+          "isAsync" : false,
+          "isStatic" : false,
+          "isThrows" : false
+        },
+        "name" : "makePolygonFactory",
+        "parameters" : [
+
+        ],
+        "returnType" : {
+          "closure" : {
+            "_0" : {
+              "isAsync" : false,
+              "isThrows" : false,
+              "mangleName" : "10TestModuley_Al7Polygon",
+              "moduleName" : "TestModule",
+              "parameters" : [
+
+              ],
+              "returnType" : {
+                "alias" : {
+                  "name" : "Polygon",
+                  "underlying" : {
+                    "swiftHeapObject" : {
+                      "_0" : "PolygonReference"
+                    }
+                  }
+                }
+              },
+              "sendingParameters" : false
+            },
+            "useJSTypedClosure" : false
+          }
+        }
+      },
+      {
+        "abiName" : "bjs_makePolygonInspector",
+        "effects" : {
+          "isAsync" : false,
+          "isStatic" : false,
+          "isThrows" : false
+        },
+        "name" : "makePolygonInspector",
+        "parameters" : [
+
+        ],
+        "returnType" : {
+          "closure" : {
+            "_0" : {
+              "isAsync" : false,
+              "isThrows" : false,
+              "mangleName" : "10TestModuleAl7Polygon_Si",
+              "moduleName" : "TestModule",
+              "parameters" : [
+                {
+                  "alias" : {
+                    "name" : "Polygon",
+                    "underlying" : {
+                      "swiftHeapObject" : {
+                        "_0" : "PolygonReference"
+                      }
+                    }
+                  }
+                }
+              ],
+              "returnType" : {
+                "integer" : {
+                  "_0" : {
+                    "isSigned" : true,
+                    "width" : "word"
+                  }
+                }
+              },
+              "sendingParameters" : false
+            },
+            "useJSTypedClosure" : false
+          }
+        }
+      }
+    ],
+    "protocols" : [
+
+    ],
+    "structs" : [
+
+    ]
+  },
+  "moduleName" : "TestModule",
+  "usedExternalModules" : [
+
+  ]
+}
\ No newline at end of file
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/AliasInClosure.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/AliasInClosure.swift
new file mode 100644
index 000000000..0a208bf70
--- /dev/null
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/AliasInClosure.swift
@@ -0,0 +1,209 @@
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "invoke_js_callback_TestModule_10TestModuleAl7Polygon_Si")
+fileprivate func invoke_js_callback_TestModule_10TestModuleAl7Polygon_Si_extern(_ callback: Int32, _ param0: UnsafeMutableRawPointer) -> Int32
+#else
+fileprivate func invoke_js_callback_TestModule_10TestModuleAl7Polygon_Si_extern(_ callback: Int32, _ param0: UnsafeMutableRawPointer) -> Int32 {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func invoke_js_callback_TestModule_10TestModuleAl7Polygon_Si(_ callback: Int32, _ param0: UnsafeMutableRawPointer) -> Int32 {
+    return invoke_js_callback_TestModule_10TestModuleAl7Polygon_Si_extern(callback, param0)
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "make_swift_closure_TestModule_10TestModuleAl7Polygon_Si")
+fileprivate func make_swift_closure_TestModule_10TestModuleAl7Polygon_Si_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer<UInt8>, _ line: UInt32) -> Int32
+#else
+fileprivate func make_swift_closure_TestModule_10TestModuleAl7Polygon_Si_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer<UInt8>, _ line: UInt32) -> Int32 {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func make_swift_closure_TestModule_10TestModuleAl7Polygon_Si(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer<UInt8>, _ line: UInt32) -> Int32 {
+    return make_swift_closure_TestModule_10TestModuleAl7Polygon_Si_extern(boxPtr, file, line)
+}
+
+private enum _BJS_Closure_10TestModuleAl7Polygon_Si {
+    static func bridgeJSLift(_ callbackId: Int32) -> (Polygon) -> Int {
+        let callback = JSObject.bridgeJSLiftParameter(callbackId)
+        return { [callback] param0 in
+            #if arch(wasm32)
+            let param0Pointer = param0.bridgeJSLowerParameter()
+            let callbackValue = callback.bridgeJSLowerParameter()
+            let ret = invoke_js_callback_TestModule_10TestModuleAl7Polygon_Si(callbackValue, param0Pointer)
+            return Int.bridgeJSLiftReturn(ret)
+            #else
+            fatalError("Only available on WebAssembly")
+            #endif
+        }
+    }
+}
+
+extension JSTypedClosure where Signature == (Polygon) -> Int {
+    init(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping (Polygon) -> Int) {
+        self.init(
+            makeClosure: make_swift_closure_TestModule_10TestModuleAl7Polygon_Si,
+            body: body,
+            fileID: fileID,
+            line: line
+        )
+    }
+}
+
+@_expose(wasm, "invoke_swift_closure_TestModule_10TestModuleAl7Polygon_Si")
+@_cdecl("invoke_swift_closure_TestModule_10TestModuleAl7Polygon_Si")
+public func _invoke_swift_closure_TestModule_10TestModuleAl7Polygon_Si(_ boxPtr: UnsafeMutableRawPointer, _ param0: UnsafeMutableRawPointer) -> Int32 {
+    #if arch(wasm32)
+    let closure = Unmanaged<_BridgeJSTypedClosureBox<(Polygon) -> Int>>.fromOpaque(boxPtr).takeUnretainedValue().closure
+    let result = closure(Polygon.bridgeJSLiftParameter(param0))
+    return result.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "invoke_js_callback_TestModule_10TestModuley_Al7Polygon")
+fileprivate func invoke_js_callback_TestModule_10TestModuley_Al7Polygon_extern(_ callback: Int32) -> UnsafeMutableRawPointer
+#else
+fileprivate func invoke_js_callback_TestModule_10TestModuley_Al7Polygon_extern(_ callback: Int32) -> UnsafeMutableRawPointer {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func invoke_js_callback_TestModule_10TestModuley_Al7Polygon(_ callback: Int32) -> UnsafeMutableRawPointer {
+    return invoke_js_callback_TestModule_10TestModuley_Al7Polygon_extern(callback)
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "make_swift_closure_TestModule_10TestModuley_Al7Polygon")
+fileprivate func make_swift_closure_TestModule_10TestModuley_Al7Polygon_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer<UInt8>, _ line: UInt32) -> Int32
+#else
+fileprivate func make_swift_closure_TestModule_10TestModuley_Al7Polygon_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer<UInt8>, _ line: UInt32) -> Int32 {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func make_swift_closure_TestModule_10TestModuley_Al7Polygon(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer<UInt8>, _ line: UInt32) -> Int32 {
+    return make_swift_closure_TestModule_10TestModuley_Al7Polygon_extern(boxPtr, file, line)
+}
+
+private enum _BJS_Closure_10TestModuley_Al7Polygon {
+    static func bridgeJSLift(_ callbackId: Int32) -> () -> Polygon {
+        let callback = JSObject.bridgeJSLiftParameter(callbackId)
+        return { [callback] in
+            #if arch(wasm32)
+            let callbackValue = callback.bridgeJSLowerParameter()
+            let ret = invoke_js_callback_TestModule_10TestModuley_Al7Polygon(callbackValue)
+            return Polygon.bridgeJSLiftReturn(ret)
+            #else
+            fatalError("Only available on WebAssembly")
+            #endif
+        }
+    }
+}
+
+extension JSTypedClosure where Signature == () -> Polygon {
+    init(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping () -> Polygon) {
+        self.init(
+            makeClosure: make_swift_closure_TestModule_10TestModuley_Al7Polygon,
+            body: body,
+            fileID: fileID,
+            line: line
+        )
+    }
+}
+
+@_expose(wasm, "invoke_swift_closure_TestModule_10TestModuley_Al7Polygon")
+@_cdecl("invoke_swift_closure_TestModule_10TestModuley_Al7Polygon")
+public func _invoke_swift_closure_TestModule_10TestModuley_Al7Polygon(_ boxPtr: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer {
+    #if arch(wasm32)
+    let closure = Unmanaged<_BridgeJSTypedClosureBox<() -> Polygon>>.fromOpaque(boxPtr).takeUnretainedValue().closure
+    let result = closure()
+    return result.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_makePolygonFactory")
+@_cdecl("bjs_makePolygonFactory")
+public func _bjs_makePolygonFactory() -> Int32 {
+    #if arch(wasm32)
+    let ret = makePolygonFactory()
+    return JSTypedClosure(ret).bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_makePolygonInspector")
+@_cdecl("bjs_makePolygonInspector")
+public func _bjs_makePolygonInspector() -> Int32 {
+    #if arch(wasm32)
+    let ret = makePolygonInspector()
+    return JSTypedClosure(ret).bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_PolygonReference_init")
+@_cdecl("bjs_PolygonReference_init")
+public func _bjs_PolygonReference_init(_ sides: Int32) -> UnsafeMutableRawPointer {
+    #if arch(wasm32)
+    let ret = PolygonReference(sides: Int.bridgeJSLiftParameter(sides))
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_PolygonReference_deinit")
+@_cdecl("bjs_PolygonReference_deinit")
+public func _bjs_PolygonReference_deinit(_ pointer: UnsafeMutableRawPointer) -> Void {
+    #if arch(wasm32)
+    Unmanaged<PolygonReference>.fromOpaque(pointer).release()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+extension PolygonReference: ConvertibleToJSValue, _BridgedSwiftHeapObject, _BridgedSwiftProtocolExportable {
+    var jsValue: JSValue {
+        return .object(JSObject(id: UInt32(bitPattern: _bjs_PolygonReference_wrap(Unmanaged.passRetained(self).toOpaque()))))
+    }
+    consuming func bridgeJSLowerAsProtocolReturn() -> Int32 {
+        _bjs_PolygonReference_wrap(Unmanaged.passRetained(self).toOpaque())
+    }
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "TestModule", name: "bjs_PolygonReference_wrap")
+fileprivate func _bjs_PolygonReference_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32
+#else
+fileprivate func _bjs_PolygonReference_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func _bjs_PolygonReference_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 {
+    return _bjs_PolygonReference_wrap_extern(pointer)
+}
+
+extension PolygonReference: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = PolygonReference.bridgeJSMakeTypeHandle()
+}
+
+extension Polygon: _BridgedSwiftAlias, _BridgedSwiftStackType {}
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "bjs_TestModule_register_type_handles")
+fileprivate func _bjs_TestModule_register_type_handles_extern(_ base: UnsafePointer<Int32>?, _ count: Int32)
+
+@_expose(wasm, "bjs_TestModule_register_type_handles")
+public func _bjs_TestModule_register_type_handles() {
+    let typeIds: [Int32] = [
+        PolygonReference.bridgeJSTypeID,
+    ]
+    typeIds.withUnsafeBufferPointer { buffer in
+        _bjs_TestModule_register_type_handles_extern(buffer.baseAddress, Int32(buffer.count))
+    }
+}
+#endif
\ No newline at end of file
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ArrayTypes.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ArrayTypes.json
index d4ac7a15f..0fac3bf21 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ArrayTypes.json
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ArrayTypes.json
@@ -1,5 +1,8 @@
 {
   "exported" : {
+    "aliases" : [
+
+    ],
     "classes" : [
       {
         "methods" : [
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ArrayTypes.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ArrayTypes.swift
index a058d13a7..94b8eb208 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ArrayTypes.swift
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ArrayTypes.swift
@@ -501,6 +501,18 @@ fileprivate func _bjs_MultiArrayContainer_wrap_extern(_ pointer: UnsafeMutableRa
     return _bjs_MultiArrayContainer_wrap_extern(pointer)
 }
 
+extension Point: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = Point.bridgeJSMakeTypeHandle()
+}
+
+extension Direction: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = Direction.bridgeJSMakeTypeHandle()
+}
+
+extension Status: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = Status.bridgeJSMakeTypeHandle()
+}
+
 #if arch(wasm32)
 @_extern(wasm, module: "TestModule", name: "bjs_checkArray")
 fileprivate func bjs_checkArray_extern(_ a: Int32) -> Void
@@ -534,8 +546,8 @@ fileprivate func bjs_checkArrayWithLength_extern(_ a: Int32, _ b: Float64) -> Vo
 }
 
 func _$checkArrayWithLength(_ a: JSObject, _ b: Double) throws(JSException) -> Void {
-    let aValue = a.bridgeJSLowerParameter()
     let bValue = b.bridgeJSLowerParameter()
+    let aValue = a.bridgeJSLowerParameter()
     bjs_checkArrayWithLength(aValue, bValue)
     if let error = _swift_js_take_exception() {
         throw error
@@ -643,4 +655,21 @@ func _$importProcessBooleans(_ values: [Bool]) throws(JSException) -> [Bool] {
         throw error
     }
     return [Bool].bridgeJSLiftReturn()
-}
\ No newline at end of file
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "bjs_TestModule_register_type_handles")
+fileprivate func _bjs_TestModule_register_type_handles_extern(_ base: UnsafePointer<Int32>?, _ count: Int32)
+
+@_expose(wasm, "bjs_TestModule_register_type_handles")
+public func _bjs_TestModule_register_type_handles() {
+    let typeIds: [Int32] = [
+        Point.bridgeJSTypeID,
+        Direction.bridgeJSTypeID,
+        Status.bridgeJSTypeID,
+    ]
+    typeIds.withUnsafeBufferPointer { buffer in
+        _bjs_TestModule_register_type_handles_extern(buffer.baseAddress, Int32(buffer.count))
+    }
+}
+#endif
\ No newline at end of file
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Async.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Async.json
index 27ba89aca..41cbc5017 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Async.json
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Async.json
@@ -1,10 +1,65 @@
 {
   "exported" : {
+    "aliases" : [
+
+    ],
     "classes" : [
 
     ],
     "enums" : [
+      {
+        "cases" : [
+          {
+            "associatedValues" : [
+
+            ],
+            "name" : "north"
+          },
+          {
+            "associatedValues" : [
+
+            ],
+            "name" : "south"
+          }
+        ],
+        "emitStyle" : "const",
+        "name" : "AsyncDirection",
+        "staticMethods" : [
+
+        ],
+        "staticProperties" : [
+
+        ],
+        "swiftCallName" : "AsyncDirection",
+        "tsFullPath" : "AsyncDirection"
+      },
+      {
+        "cases" : [
+          {
+            "associatedValues" : [
+
+            ],
+            "name" : "light"
+          },
+          {
+            "associatedValues" : [
+
+            ],
+            "name" : "dark"
+          }
+        ],
+        "emitStyle" : "const",
+        "name" : "AsyncTheme",
+        "rawType" : "String",
+        "staticMethods" : [
 
+        ],
+        "staticProperties" : [
+
+        ],
+        "swiftCallName" : "AsyncTheme",
+        "tsFullPath" : "AsyncTheme"
+      }
     ],
     "exposeToGlobal" : false,
     "functions" : [
@@ -180,13 +235,439 @@
 
           }
         }
+      },
+      {
+        "abiName" : "bjs_asyncRoundTripStruct",
+        "effects" : {
+          "isAsync" : true,
+          "isStatic" : false,
+          "isThrows" : false
+        },
+        "name" : "asyncRoundTripStruct",
+        "parameters" : [
+          {
+            "label" : "_",
+            "name" : "v",
+            "type" : {
+              "swiftStruct" : {
+                "_0" : "AsyncPoint"
+              }
+            }
+          }
+        ],
+        "returnType" : {
+          "swiftStruct" : {
+            "_0" : "AsyncPoint"
+          }
+        }
+      },
+      {
+        "abiName" : "bjs_asyncRoundTripStructThrows",
+        "effects" : {
+          "isAsync" : true,
+          "isStatic" : false,
+          "isThrows" : true
+        },
+        "name" : "asyncRoundTripStructThrows",
+        "parameters" : [
+          {
+            "label" : "_",
+            "name" : "v",
+            "type" : {
+              "swiftStruct" : {
+                "_0" : "AsyncPoint"
+              }
+            }
+          }
+        ],
+        "returnType" : {
+          "swiftStruct" : {
+            "_0" : "AsyncPoint"
+          }
+        }
+      },
+      {
+        "abiName" : "bjs_asyncThrowsZeroArg",
+        "effects" : {
+          "isAsync" : true,
+          "isStatic" : false,
+          "isThrows" : true
+        },
+        "name" : "asyncThrowsZeroArg",
+        "parameters" : [
+
+        ],
+        "returnType" : {
+          "string" : {
+
+          }
+        }
+      },
+      {
+        "abiName" : "bjs_asyncCombineStructs",
+        "effects" : {
+          "isAsync" : true,
+          "isStatic" : false,
+          "isThrows" : false
+        },
+        "name" : "asyncCombineStructs",
+        "parameters" : [
+          {
+            "label" : "_",
+            "name" : "a",
+            "type" : {
+              "swiftStruct" : {
+                "_0" : "AsyncPoint"
+              }
+            }
+          },
+          {
+            "label" : "_",
+            "name" : "b",
+            "type" : {
+              "swiftStruct" : {
+                "_0" : "AsyncPoint"
+              }
+            }
+          }
+        ],
+        "returnType" : {
+          "swiftStruct" : {
+            "_0" : "AsyncPoint"
+          }
+        }
+      },
+      {
+        "abiName" : "bjs_asyncRoundTripEnum",
+        "effects" : {
+          "isAsync" : true,
+          "isStatic" : false,
+          "isThrows" : false
+        },
+        "name" : "asyncRoundTripEnum",
+        "parameters" : [
+          {
+            "label" : "_",
+            "name" : "v",
+            "type" : {
+              "caseEnum" : {
+                "_0" : "AsyncDirection"
+              }
+            }
+          }
+        ],
+        "returnType" : {
+          "caseEnum" : {
+            "_0" : "AsyncDirection"
+          }
+        }
+      },
+      {
+        "abiName" : "bjs_asyncRoundTripRawEnum",
+        "effects" : {
+          "isAsync" : true,
+          "isStatic" : false,
+          "isThrows" : false
+        },
+        "name" : "asyncRoundTripRawEnum",
+        "parameters" : [
+          {
+            "label" : "_",
+            "name" : "v",
+            "type" : {
+              "rawValueEnum" : {
+                "_0" : "AsyncTheme",
+                "_1" : "String"
+              }
+            }
+          }
+        ],
+        "returnType" : {
+          "rawValueEnum" : {
+            "_0" : "AsyncTheme",
+            "_1" : "String"
+          }
+        }
+      },
+      {
+        "abiName" : "bjs_asyncRoundTripOptionalEnum",
+        "effects" : {
+          "isAsync" : true,
+          "isStatic" : false,
+          "isThrows" : false
+        },
+        "name" : "asyncRoundTripOptionalEnum",
+        "parameters" : [
+          {
+            "label" : "_",
+            "name" : "v",
+            "type" : {
+              "nullable" : {
+                "_0" : {
+                  "caseEnum" : {
+                    "_0" : "AsyncDirection"
+                  }
+                },
+                "_1" : "null"
+              }
+            }
+          }
+        ],
+        "returnType" : {
+          "nullable" : {
+            "_0" : {
+              "caseEnum" : {
+                "_0" : "AsyncDirection"
+              }
+            },
+            "_1" : "null"
+          }
+        }
+      },
+      {
+        "abiName" : "bjs_asyncRoundTripOptionalRawEnum",
+        "effects" : {
+          "isAsync" : true,
+          "isStatic" : false,
+          "isThrows" : false
+        },
+        "name" : "asyncRoundTripOptionalRawEnum",
+        "parameters" : [
+          {
+            "label" : "_",
+            "name" : "v",
+            "type" : {
+              "nullable" : {
+                "_0" : {
+                  "rawValueEnum" : {
+                    "_0" : "AsyncTheme",
+                    "_1" : "String"
+                  }
+                },
+                "_1" : "null"
+              }
+            }
+          }
+        ],
+        "returnType" : {
+          "nullable" : {
+            "_0" : {
+              "rawValueEnum" : {
+                "_0" : "AsyncTheme",
+                "_1" : "String"
+              }
+            },
+            "_1" : "null"
+          }
+        }
+      },
+      {
+        "abiName" : "bjs_asyncRoundTripOptionalStruct",
+        "effects" : {
+          "isAsync" : true,
+          "isStatic" : false,
+          "isThrows" : false
+        },
+        "name" : "asyncRoundTripOptionalStruct",
+        "parameters" : [
+          {
+            "label" : "_",
+            "name" : "v",
+            "type" : {
+              "nullable" : {
+                "_0" : {
+                  "swiftStruct" : {
+                    "_0" : "AsyncPoint"
+                  }
+                },
+                "_1" : "null"
+              }
+            }
+          }
+        ],
+        "returnType" : {
+          "nullable" : {
+            "_0" : {
+              "swiftStruct" : {
+                "_0" : "AsyncPoint"
+              }
+            },
+            "_1" : "null"
+          }
+        }
+      },
+      {
+        "abiName" : "bjs_asyncRoundTripStructArray",
+        "effects" : {
+          "isAsync" : true,
+          "isStatic" : false,
+          "isThrows" : false
+        },
+        "name" : "asyncRoundTripStructArray",
+        "parameters" : [
+          {
+            "label" : "_",
+            "name" : "v",
+            "type" : {
+              "array" : {
+                "_0" : {
+                  "swiftStruct" : {
+                    "_0" : "AsyncPoint"
+                  }
+                }
+              }
+            }
+          }
+        ],
+        "returnType" : {
+          "array" : {
+            "_0" : {
+              "swiftStruct" : {
+                "_0" : "AsyncPoint"
+              }
+            }
+          }
+        }
+      },
+      {
+        "abiName" : "bjs_asyncRoundTripEnumArray",
+        "effects" : {
+          "isAsync" : true,
+          "isStatic" : false,
+          "isThrows" : false
+        },
+        "name" : "asyncRoundTripEnumArray",
+        "parameters" : [
+          {
+            "label" : "_",
+            "name" : "v",
+            "type" : {
+              "array" : {
+                "_0" : {
+                  "caseEnum" : {
+                    "_0" : "AsyncDirection"
+                  }
+                }
+              }
+            }
+          }
+        ],
+        "returnType" : {
+          "array" : {
+            "_0" : {
+              "caseEnum" : {
+                "_0" : "AsyncDirection"
+              }
+            }
+          }
+        }
+      },
+      {
+        "abiName" : "bjs_asyncRoundTripStructDictionary",
+        "effects" : {
+          "isAsync" : true,
+          "isStatic" : false,
+          "isThrows" : false
+        },
+        "name" : "asyncRoundTripStructDictionary",
+        "parameters" : [
+          {
+            "label" : "_",
+            "name" : "v",
+            "type" : {
+              "dictionary" : {
+                "_0" : {
+                  "swiftStruct" : {
+                    "_0" : "AsyncPoint"
+                  }
+                }
+              }
+            }
+          }
+        ],
+        "returnType" : {
+          "dictionary" : {
+            "_0" : {
+              "swiftStruct" : {
+                "_0" : "AsyncPoint"
+              }
+            }
+          }
+        }
+      },
+      {
+        "abiName" : "bjs_asyncRoundTripEnumDictionary",
+        "effects" : {
+          "isAsync" : true,
+          "isStatic" : false,
+          "isThrows" : false
+        },
+        "name" : "asyncRoundTripEnumDictionary",
+        "parameters" : [
+          {
+            "label" : "_",
+            "name" : "v",
+            "type" : {
+              "dictionary" : {
+                "_0" : {
+                  "caseEnum" : {
+                    "_0" : "AsyncDirection"
+                  }
+                }
+              }
+            }
+          }
+        ],
+        "returnType" : {
+          "dictionary" : {
+            "_0" : {
+              "caseEnum" : {
+                "_0" : "AsyncDirection"
+              }
+            }
+          }
+        }
       }
     ],
     "protocols" : [
 
     ],
     "structs" : [
+      {
+        "methods" : [
 
+        ],
+        "name" : "AsyncPoint",
+        "properties" : [
+          {
+            "isReadonly" : true,
+            "isStatic" : false,
+            "name" : "x",
+            "type" : {
+              "integer" : {
+                "_0" : {
+                  "isSigned" : true,
+                  "width" : "word"
+                }
+              }
+            }
+          },
+          {
+            "isReadonly" : true,
+            "isStatic" : false,
+            "name" : "y",
+            "type" : {
+              "integer" : {
+                "_0" : {
+                  "isSigned" : true,
+                  "width" : "word"
+                }
+              }
+            }
+          }
+        ],
+        "swiftCallName" : "AsyncPoint"
+      }
     ]
   },
   "moduleName" : "TestModule",
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Async.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Async.swift
index f5230f213..35618554c 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Async.swift
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Async.swift
@@ -1,11 +1,96 @@
+extension AsyncDirection: _BridgedSwiftCaseEnum {
+    @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameter() -> Int32 {
+        return bridgeJSRawValue
+    }
+    @_spi(BridgeJS) @_transparent public static func bridgeJSLiftReturn(_ value: Int32) -> AsyncDirection {
+        return bridgeJSLiftParameter(value)
+    }
+    @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter(_ value: Int32) -> AsyncDirection {
+        return AsyncDirection(bridgeJSRawValue: value)!
+    }
+    @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() -> Int32 {
+        return bridgeJSLowerParameter()
+    }
+
+    @_spi(BridgeJS) @usableFromInline init?(bridgeJSRawValue: Int32) {
+        switch bridgeJSRawValue {
+        case 0:
+            self = .north
+        case 1:
+            self = .south
+        default:
+            return nil
+        }
+    }
+
+    @_spi(BridgeJS) @usableFromInline var bridgeJSRawValue: Int32 {
+        switch self {
+        case .north:
+            return 0
+        case .south:
+            return 1
+        }
+    }
+}
+
+extension AsyncTheme: _BridgedSwiftEnumNoPayload, _BridgedSwiftRawValueEnum {
+}
+
+extension AsyncPoint: _BridgedSwiftStruct {
+    @_spi(BridgeJS) @_transparent public static func bridgeJSStackPop() -> AsyncPoint {
+        let y = Int.bridgeJSStackPop()
+        let x = Int.bridgeJSStackPop()
+        return AsyncPoint(x: x, y: y)
+    }
+
+    @_spi(BridgeJS) @_transparent public consuming func bridgeJSStackPush() {
+        self.x.bridgeJSStackPush()
+        self.y.bridgeJSStackPush()
+    }
+
+    init(unsafelyCopying jsObject: JSObject) {
+        _bjs_struct_lower_AsyncPoint(jsObject.bridgeJSLowerParameter())
+        self = Self.bridgeJSStackPop()
+    }
+
+    func toJSObject() -> JSObject {
+        let __bjs_self = self
+        __bjs_self.bridgeJSStackPush()
+        return JSObject(id: UInt32(bitPattern: _bjs_struct_lift_AsyncPoint()))
+    }
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "swift_js_struct_lower_AsyncPoint")
+fileprivate func _bjs_struct_lower_AsyncPoint_extern(_ objectId: Int32) -> Void
+#else
+fileprivate func _bjs_struct_lower_AsyncPoint_extern(_ objectId: Int32) -> Void {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func _bjs_struct_lower_AsyncPoint(_ objectId: Int32) -> Void {
+    return _bjs_struct_lower_AsyncPoint_extern(objectId)
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "swift_js_struct_lift_AsyncPoint")
+fileprivate func _bjs_struct_lift_AsyncPoint_extern() -> Int32
+#else
+fileprivate func _bjs_struct_lift_AsyncPoint_extern() -> Int32 {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func _bjs_struct_lift_AsyncPoint() -> Int32 {
+    return _bjs_struct_lift_AsyncPoint_extern()
+}
+
 @_expose(wasm, "bjs_asyncReturnVoid")
 @_cdecl("bjs_asyncReturnVoid")
 public func _bjs_asyncReturnVoid() -> Int32 {
     #if arch(wasm32)
-    let ret = JSPromise.async {
+    return _bjs_makePromise(resolve: Promise_resolve_y, reject: Promise_reject) {
         await asyncReturnVoid()
-    }.jsObject
-    return ret.bridgeJSLowerReturn()
+    }
     #else
     fatalError("Only available on WebAssembly")
     #endif
@@ -15,10 +100,9 @@ public func _bjs_asyncReturnVoid() -> Int32 {
 @_cdecl("bjs_asyncRoundTripInt")
 public func _bjs_asyncRoundTripInt(_ v: Int32) -> Int32 {
     #if arch(wasm32)
-    let ret = JSPromise.async {
-        return await asyncRoundTripInt(_: Int.bridgeJSLiftParameter(v)).jsValue
-    }.jsObject
-    return ret.bridgeJSLowerReturn()
+    return _bjs_makePromise(resolve: Promise_resolve_Si, reject: Promise_reject) {
+        return await asyncRoundTripInt(_: Int.bridgeJSLiftParameter(v))
+    }
     #else
     fatalError("Only available on WebAssembly")
     #endif
@@ -28,10 +112,9 @@ public func _bjs_asyncRoundTripInt(_ v: Int32) -> Int32 {
 @_cdecl("bjs_asyncRoundTripString")
 public func _bjs_asyncRoundTripString(_ vBytes: Int32, _ vLength: Int32) -> Int32 {
     #if arch(wasm32)
-    let ret = JSPromise.async {
-        return await asyncRoundTripString(_: String.bridgeJSLiftParameter(vBytes, vLength)).jsValue
-    }.jsObject
-    return ret.bridgeJSLowerReturn()
+    return _bjs_makePromise(resolve: Promise_resolve_SS, reject: Promise_reject) {
+        return await asyncRoundTripString(_: String.bridgeJSLiftParameter(vBytes, vLength))
+    }
     #else
     fatalError("Only available on WebAssembly")
     #endif
@@ -41,10 +124,9 @@ public func _bjs_asyncRoundTripString(_ vBytes: Int32, _ vLength: Int32) -> Int3
 @_cdecl("bjs_asyncRoundTripBool")
 public func _bjs_asyncRoundTripBool(_ v: Int32) -> Int32 {
     #if arch(wasm32)
-    let ret = JSPromise.async {
-        return await asyncRoundTripBool(_: Bool.bridgeJSLiftParameter(v)).jsValue
-    }.jsObject
-    return ret.bridgeJSLowerReturn()
+    return _bjs_makePromise(resolve: Promise_resolve_Sb, reject: Promise_reject) {
+        return await asyncRoundTripBool(_: Bool.bridgeJSLiftParameter(v))
+    }
     #else
     fatalError("Only available on WebAssembly")
     #endif
@@ -54,10 +136,9 @@ public func _bjs_asyncRoundTripBool(_ v: Int32) -> Int32 {
 @_cdecl("bjs_asyncRoundTripFloat")
 public func _bjs_asyncRoundTripFloat(_ v: Float32) -> Int32 {
     #if arch(wasm32)
-    let ret = JSPromise.async {
-        return await asyncRoundTripFloat(_: Float.bridgeJSLiftParameter(v)).jsValue
-    }.jsObject
-    return ret.bridgeJSLowerReturn()
+    return _bjs_makePromise(resolve: Promise_resolve_Sf, reject: Promise_reject) {
+        return await asyncRoundTripFloat(_: Float.bridgeJSLiftParameter(v))
+    }
     #else
     fatalError("Only available on WebAssembly")
     #endif
@@ -67,10 +148,9 @@ public func _bjs_asyncRoundTripFloat(_ v: Float32) -> Int32 {
 @_cdecl("bjs_asyncRoundTripDouble")
 public func _bjs_asyncRoundTripDouble(_ v: Float64) -> Int32 {
     #if arch(wasm32)
-    let ret = JSPromise.async {
-        return await asyncRoundTripDouble(_: Double.bridgeJSLiftParameter(v)).jsValue
-    }.jsObject
-    return ret.bridgeJSLowerReturn()
+    return _bjs_makePromise(resolve: Promise_resolve_Sd, reject: Promise_reject) {
+        return await asyncRoundTripDouble(_: Double.bridgeJSLiftParameter(v))
+    }
     #else
     fatalError("Only available on WebAssembly")
     #endif
@@ -80,11 +160,586 @@ public func _bjs_asyncRoundTripDouble(_ v: Float64) -> Int32 {
 @_cdecl("bjs_asyncRoundTripJSObject")
 public func _bjs_asyncRoundTripJSObject(_ v: Int32) -> Int32 {
     #if arch(wasm32)
-    let ret = JSPromise.async {
-        return await asyncRoundTripJSObject(_: JSObject.bridgeJSLiftParameter(v)).jsValue
-    }.jsObject
-    return ret.bridgeJSLowerReturn()
+    return _bjs_makePromise(resolve: Promise_resolve_8JSObjectC, reject: Promise_reject) {
+        return await asyncRoundTripJSObject(_: JSObject.bridgeJSLiftParameter(v))
+    }
     #else
     fatalError("Only available on WebAssembly")
     #endif
-}
\ No newline at end of file
+}
+
+@_expose(wasm, "bjs_asyncRoundTripStruct")
+@_cdecl("bjs_asyncRoundTripStruct")
+public func _bjs_asyncRoundTripStruct() -> Int32 {
+    #if arch(wasm32)
+    let _tmp_v = AsyncPoint.bridgeJSLiftParameter()
+    return _bjs_makePromise(resolve: Promise_resolve_10AsyncPointV, reject: Promise_reject) {
+        return await asyncRoundTripStruct(_: _tmp_v)
+    }
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_asyncRoundTripStructThrows")
+@_cdecl("bjs_asyncRoundTripStructThrows")
+public func _bjs_asyncRoundTripStructThrows() -> Int32 {
+    #if arch(wasm32)
+    let _tmp_v = AsyncPoint.bridgeJSLiftParameter()
+    return _bjs_makePromise(resolve: Promise_resolve_10AsyncPointV, reject: Promise_reject) { () async throws(JSException) -> AsyncPoint in
+        return try await asyncRoundTripStructThrows(_: _tmp_v)
+    }
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_asyncThrowsZeroArg")
+@_cdecl("bjs_asyncThrowsZeroArg")
+public func _bjs_asyncThrowsZeroArg() -> Int32 {
+    #if arch(wasm32)
+    let __bjs_capture = 0
+    return _bjs_makePromise(resolve: Promise_resolve_SS, reject: Promise_reject) { [__bjs_capture] () async throws(JSException) -> String in
+        _ = __bjs_capture
+        return try await asyncThrowsZeroArg()
+    }
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_asyncCombineStructs")
+@_cdecl("bjs_asyncCombineStructs")
+public func _bjs_asyncCombineStructs() -> Int32 {
+    #if arch(wasm32)
+    let _tmp_b = AsyncPoint.bridgeJSLiftParameter()
+    let _tmp_a = AsyncPoint.bridgeJSLiftParameter()
+    return _bjs_makePromise(resolve: Promise_resolve_10AsyncPointV, reject: Promise_reject) {
+        return await asyncCombineStructs(_: _tmp_a, _: _tmp_b)
+    }
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_asyncRoundTripEnum")
+@_cdecl("bjs_asyncRoundTripEnum")
+public func _bjs_asyncRoundTripEnum(_ v: Int32) -> Int32 {
+    #if arch(wasm32)
+    return _bjs_makePromise(resolve: Promise_resolve_14AsyncDirectionO, reject: Promise_reject) {
+        return await asyncRoundTripEnum(_: AsyncDirection.bridgeJSLiftParameter(v))
+    }
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_asyncRoundTripRawEnum")
+@_cdecl("bjs_asyncRoundTripRawEnum")
+public func _bjs_asyncRoundTripRawEnum(_ vBytes: Int32, _ vLength: Int32) -> Int32 {
+    #if arch(wasm32)
+    return _bjs_makePromise(resolve: Promise_resolve_10AsyncThemeO, reject: Promise_reject) {
+        return await asyncRoundTripRawEnum(_: AsyncTheme.bridgeJSLiftParameter(vBytes, vLength))
+    }
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_asyncRoundTripOptionalEnum")
+@_cdecl("bjs_asyncRoundTripOptionalEnum")
+public func _bjs_asyncRoundTripOptionalEnum(_ vIsSome: Int32, _ vValue: Int32) -> Int32 {
+    #if arch(wasm32)
+    return _bjs_makePromise(resolve: Promise_resolve_Sq14AsyncDirectionO, reject: Promise_reject) {
+        return await asyncRoundTripOptionalEnum(_: Optional<AsyncDirection>.bridgeJSLiftParameter(vIsSome, vValue))
+    }
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_asyncRoundTripOptionalRawEnum")
+@_cdecl("bjs_asyncRoundTripOptionalRawEnum")
+public func _bjs_asyncRoundTripOptionalRawEnum(_ vIsSome: Int32, _ vBytes: Int32, _ vLength: Int32) -> Int32 {
+    #if arch(wasm32)
+    return _bjs_makePromise(resolve: Promise_resolve_Sq10AsyncThemeO, reject: Promise_reject) {
+        return await asyncRoundTripOptionalRawEnum(_: Optional<AsyncTheme>.bridgeJSLiftParameter(vIsSome, vBytes, vLength))
+    }
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_asyncRoundTripOptionalStruct")
+@_cdecl("bjs_asyncRoundTripOptionalStruct")
+public func _bjs_asyncRoundTripOptionalStruct() -> Int32 {
+    #if arch(wasm32)
+    let _tmp_v = Optional<AsyncPoint>.bridgeJSLiftParameter()
+    return _bjs_makePromise(resolve: Promise_resolve_Sq10AsyncPointV, reject: Promise_reject) {
+        return await asyncRoundTripOptionalStruct(_: _tmp_v)
+    }
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_asyncRoundTripStructArray")
+@_cdecl("bjs_asyncRoundTripStructArray")
+public func _bjs_asyncRoundTripStructArray() -> Int32 {
+    #if arch(wasm32)
+    let _tmp_v = [AsyncPoint].bridgeJSStackPop()
+    return _bjs_makePromise(resolve: Promise_resolve_Sa10AsyncPointV, reject: Promise_reject) {
+        return await asyncRoundTripStructArray(_: _tmp_v)
+    }
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_asyncRoundTripEnumArray")
+@_cdecl("bjs_asyncRoundTripEnumArray")
+public func _bjs_asyncRoundTripEnumArray() -> Int32 {
+    #if arch(wasm32)
+    let _tmp_v = [AsyncDirection].bridgeJSStackPop()
+    return _bjs_makePromise(resolve: Promise_resolve_Sa14AsyncDirectionO, reject: Promise_reject) {
+        return await asyncRoundTripEnumArray(_: _tmp_v)
+    }
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_asyncRoundTripStructDictionary")
+@_cdecl("bjs_asyncRoundTripStructDictionary")
+public func _bjs_asyncRoundTripStructDictionary() -> Int32 {
+    #if arch(wasm32)
+    let _tmp_v = [String: AsyncPoint].bridgeJSLiftParameter()
+    return _bjs_makePromise(resolve: Promise_resolve_SD10AsyncPointV, reject: Promise_reject) {
+        return await asyncRoundTripStructDictionary(_: _tmp_v)
+    }
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_asyncRoundTripEnumDictionary")
+@_cdecl("bjs_asyncRoundTripEnumDictionary")
+public func _bjs_asyncRoundTripEnumDictionary() -> Int32 {
+    #if arch(wasm32)
+    let _tmp_v = [String: AsyncDirection].bridgeJSLiftParameter()
+    return _bjs_makePromise(resolve: Promise_resolve_SD14AsyncDirectionO, reject: Promise_reject) {
+        return await asyncRoundTripEnumDictionary(_: _tmp_v)
+    }
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+extension AsyncPoint: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = AsyncPoint.bridgeJSMakeTypeHandle()
+}
+
+extension AsyncDirection: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = AsyncDirection.bridgeJSMakeTypeHandle()
+}
+
+extension AsyncTheme: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = AsyncTheme.bridgeJSMakeTypeHandle()
+}
+
+@JSFunction func Promise_reject(_ promise: JSObject, _ value: JSValue) throws(JSException)
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "promise_reject_TestModule")
+fileprivate func promise_reject_TestModule_extern(_ promise: Int32, _ valueKind: Int32, _ valuePayload1: Int32, _ valuePayload2: Float64) -> Void
+#else
+fileprivate func promise_reject_TestModule_extern(_ promise: Int32, _ valueKind: Int32, _ valuePayload1: Int32, _ valuePayload2: Float64) -> Void {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func promise_reject_TestModule(_ promise: Int32, _ valueKind: Int32, _ valuePayload1: Int32, _ valuePayload2: Float64) -> Void {
+    return promise_reject_TestModule_extern(promise, valueKind, valuePayload1, valuePayload2)
+}
+
+func _$Promise_reject(_ promise: JSObject, _ value: JSValue) throws(JSException) -> Void {
+    let (valueKind, valuePayload1, valuePayload2) = value.bridgeJSLowerParameter()
+    let promiseValue = promise.bridgeJSLowerParameter()
+    promise_reject_TestModule(promiseValue, valueKind, valuePayload1, valuePayload2)
+    if let error = _swift_js_take_exception() { throw error }
+}
+
+@JSFunction func Promise_resolve_y(_ promise: JSObject) throws(JSException)
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "promise_resolve_TestModule_y")
+fileprivate func promise_resolve_TestModule_y_extern(_ promise: Int32) -> Void
+#else
+fileprivate func promise_resolve_TestModule_y_extern(_ promise: Int32) -> Void {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func promise_resolve_TestModule_y(_ promise: Int32) -> Void {
+    return promise_resolve_TestModule_y_extern(promise)
+}
+
+func _$Promise_resolve_y(_ promise: JSObject) throws(JSException) -> Void {
+    let promiseValue = promise.bridgeJSLowerParameter()
+    promise_resolve_TestModule_y(promiseValue)
+    if let error = _swift_js_take_exception() { throw error }
+}
+
+@JSFunction func Promise_resolve_Si(_ promise: JSObject, _ value: Int) throws(JSException)
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "promise_resolve_TestModule_Si")
+fileprivate func promise_resolve_TestModule_Si_extern(_ promise: Int32, _ value: Int32) -> Void
+#else
+fileprivate func promise_resolve_TestModule_Si_extern(_ promise: Int32, _ value: Int32) -> Void {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func promise_resolve_TestModule_Si(_ promise: Int32, _ value: Int32) -> Void {
+    return promise_resolve_TestModule_Si_extern(promise, value)
+}
+
+func _$Promise_resolve_Si(_ promise: JSObject, _ value: Int) throws(JSException) -> Void {
+    let valueValue = value.bridgeJSLowerParameter()
+    let promiseValue = promise.bridgeJSLowerParameter()
+    promise_resolve_TestModule_Si(promiseValue, valueValue)
+    if let error = _swift_js_take_exception() { throw error }
+}
+
+@JSFunction func Promise_resolve_SS(_ promise: JSObject, _ value: String) throws(JSException)
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "promise_resolve_TestModule_SS")
+fileprivate func promise_resolve_TestModule_SS_extern(_ promise: Int32, _ valueBytes: Int32, _ valueLength: Int32) -> Void
+#else
+fileprivate func promise_resolve_TestModule_SS_extern(_ promise: Int32, _ valueBytes: Int32, _ valueLength: Int32) -> Void {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func promise_resolve_TestModule_SS(_ promise: Int32, _ valueBytes: Int32, _ valueLength: Int32) -> Void {
+    return promise_resolve_TestModule_SS_extern(promise, valueBytes, valueLength)
+}
+
+func _$Promise_resolve_SS(_ promise: JSObject, _ value: String) throws(JSException) -> Void {
+    value.bridgeJSWithLoweredParameter { (valueBytes, valueLength) in
+        let promiseValue = promise.bridgeJSLowerParameter()
+        promise_resolve_TestModule_SS(promiseValue, valueBytes, valueLength)
+    }
+    if let error = _swift_js_take_exception() { throw error }
+}
+
+@JSFunction func Promise_resolve_Sb(_ promise: JSObject, _ value: Bool) throws(JSException)
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "promise_resolve_TestModule_Sb")
+fileprivate func promise_resolve_TestModule_Sb_extern(_ promise: Int32, _ value: Int32) -> Void
+#else
+fileprivate func promise_resolve_TestModule_Sb_extern(_ promise: Int32, _ value: Int32) -> Void {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func promise_resolve_TestModule_Sb(_ promise: Int32, _ value: Int32) -> Void {
+    return promise_resolve_TestModule_Sb_extern(promise, value)
+}
+
+func _$Promise_resolve_Sb(_ promise: JSObject, _ value: Bool) throws(JSException) -> Void {
+    let valueValue = value.bridgeJSLowerParameter()
+    let promiseValue = promise.bridgeJSLowerParameter()
+    promise_resolve_TestModule_Sb(promiseValue, valueValue)
+    if let error = _swift_js_take_exception() { throw error }
+}
+
+@JSFunction func Promise_resolve_Sf(_ promise: JSObject, _ value: Float) throws(JSException)
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "promise_resolve_TestModule_Sf")
+fileprivate func promise_resolve_TestModule_Sf_extern(_ promise: Int32, _ value: Float32) -> Void
+#else
+fileprivate func promise_resolve_TestModule_Sf_extern(_ promise: Int32, _ value: Float32) -> Void {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func promise_resolve_TestModule_Sf(_ promise: Int32, _ value: Float32) -> Void {
+    return promise_resolve_TestModule_Sf_extern(promise, value)
+}
+
+func _$Promise_resolve_Sf(_ promise: JSObject, _ value: Float) throws(JSException) -> Void {
+    let valueValue = value.bridgeJSLowerParameter()
+    let promiseValue = promise.bridgeJSLowerParameter()
+    promise_resolve_TestModule_Sf(promiseValue, valueValue)
+    if let error = _swift_js_take_exception() { throw error }
+}
+
+@JSFunction func Promise_resolve_Sd(_ promise: JSObject, _ value: Double) throws(JSException)
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "promise_resolve_TestModule_Sd")
+fileprivate func promise_resolve_TestModule_Sd_extern(_ promise: Int32, _ value: Float64) -> Void
+#else
+fileprivate func promise_resolve_TestModule_Sd_extern(_ promise: Int32, _ value: Float64) -> Void {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func promise_resolve_TestModule_Sd(_ promise: Int32, _ value: Float64) -> Void {
+    return promise_resolve_TestModule_Sd_extern(promise, value)
+}
+
+func _$Promise_resolve_Sd(_ promise: JSObject, _ value: Double) throws(JSException) -> Void {
+    let valueValue = value.bridgeJSLowerParameter()
+    let promiseValue = promise.bridgeJSLowerParameter()
+    promise_resolve_TestModule_Sd(promiseValue, valueValue)
+    if let error = _swift_js_take_exception() { throw error }
+}
+
+@JSFunction func Promise_resolve_8JSObjectC(_ promise: JSObject, _ value: JSObject) throws(JSException)
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "promise_resolve_TestModule_8JSObjectC")
+fileprivate func promise_resolve_TestModule_8JSObjectC_extern(_ promise: Int32, _ value: Int32) -> Void
+#else
+fileprivate func promise_resolve_TestModule_8JSObjectC_extern(_ promise: Int32, _ value: Int32) -> Void {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func promise_resolve_TestModule_8JSObjectC(_ promise: Int32, _ value: Int32) -> Void {
+    return promise_resolve_TestModule_8JSObjectC_extern(promise, value)
+}
+
+func _$Promise_resolve_8JSObjectC(_ promise: JSObject, _ value: JSObject) throws(JSException) -> Void {
+    let valueValue = value.bridgeJSLowerParameter()
+    let promiseValue = promise.bridgeJSLowerParameter()
+    promise_resolve_TestModule_8JSObjectC(promiseValue, valueValue)
+    if let error = _swift_js_take_exception() { throw error }
+}
+
+@JSFunction func Promise_resolve_10AsyncPointV(_ promise: JSObject, _ value: AsyncPoint) throws(JSException)
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "promise_resolve_TestModule_10AsyncPointV")
+fileprivate func promise_resolve_TestModule_10AsyncPointV_extern(_ promise: Int32) -> Void
+#else
+fileprivate func promise_resolve_TestModule_10AsyncPointV_extern(_ promise: Int32) -> Void {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func promise_resolve_TestModule_10AsyncPointV(_ promise: Int32) -> Void {
+    return promise_resolve_TestModule_10AsyncPointV_extern(promise)
+}
+
+func _$Promise_resolve_10AsyncPointV(_ promise: JSObject, _ value: AsyncPoint) throws(JSException) -> Void {
+    let _ = value.bridgeJSLowerParameter()
+    let promiseValue = promise.bridgeJSLowerParameter()
+    promise_resolve_TestModule_10AsyncPointV(promiseValue)
+    if let error = _swift_js_take_exception() { throw error }
+}
+
+@JSFunction func Promise_resolve_14AsyncDirectionO(_ promise: JSObject, _ value: AsyncDirection) throws(JSException)
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "promise_resolve_TestModule_14AsyncDirectionO")
+fileprivate func promise_resolve_TestModule_14AsyncDirectionO_extern(_ promise: Int32, _ value: Int32) -> Void
+#else
+fileprivate func promise_resolve_TestModule_14AsyncDirectionO_extern(_ promise: Int32, _ value: Int32) -> Void {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func promise_resolve_TestModule_14AsyncDirectionO(_ promise: Int32, _ value: Int32) -> Void {
+    return promise_resolve_TestModule_14AsyncDirectionO_extern(promise, value)
+}
+
+func _$Promise_resolve_14AsyncDirectionO(_ promise: JSObject, _ value: AsyncDirection) throws(JSException) -> Void {
+    let valueValue = value.bridgeJSLowerParameter()
+    let promiseValue = promise.bridgeJSLowerParameter()
+    promise_resolve_TestModule_14AsyncDirectionO(promiseValue, valueValue)
+    if let error = _swift_js_take_exception() { throw error }
+}
+
+@JSFunction func Promise_resolve_10AsyncThemeO(_ promise: JSObject, _ value: AsyncTheme) throws(JSException)
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "promise_resolve_TestModule_10AsyncThemeO")
+fileprivate func promise_resolve_TestModule_10AsyncThemeO_extern(_ promise: Int32, _ valueBytes: Int32, _ valueLength: Int32) -> Void
+#else
+fileprivate func promise_resolve_TestModule_10AsyncThemeO_extern(_ promise: Int32, _ valueBytes: Int32, _ valueLength: Int32) -> Void {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func promise_resolve_TestModule_10AsyncThemeO(_ promise: Int32, _ valueBytes: Int32, _ valueLength: Int32) -> Void {
+    return promise_resolve_TestModule_10AsyncThemeO_extern(promise, valueBytes, valueLength)
+}
+
+func _$Promise_resolve_10AsyncThemeO(_ promise: JSObject, _ value: AsyncTheme) throws(JSException) -> Void {
+    value.bridgeJSWithLoweredParameter { (valueBytes, valueLength) in
+        let promiseValue = promise.bridgeJSLowerParameter()
+        promise_resolve_TestModule_10AsyncThemeO(promiseValue, valueBytes, valueLength)
+    }
+    if let error = _swift_js_take_exception() { throw error }
+}
+
+@JSFunction func Promise_resolve_Sq14AsyncDirectionO(_ promise: JSObject, _ value: Optional<AsyncDirection>) throws(JSException)
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "promise_resolve_TestModule_Sq14AsyncDirectionO")
+fileprivate func promise_resolve_TestModule_Sq14AsyncDirectionO_extern(_ promise: Int32, _ valueIsSome: Int32, _ valueValue: Int32) -> Void
+#else
+fileprivate func promise_resolve_TestModule_Sq14AsyncDirectionO_extern(_ promise: Int32, _ valueIsSome: Int32, _ valueValue: Int32) -> Void {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func promise_resolve_TestModule_Sq14AsyncDirectionO(_ promise: Int32, _ valueIsSome: Int32, _ valueValue: Int32) -> Void {
+    return promise_resolve_TestModule_Sq14AsyncDirectionO_extern(promise, valueIsSome, valueValue)
+}
+
+func _$Promise_resolve_Sq14AsyncDirectionO(_ promise: JSObject, _ value: Optional<AsyncDirection>) throws(JSException) -> Void {
+    let (valueIsSome, valueValue) = value.bridgeJSLowerParameter()
+    let promiseValue = promise.bridgeJSLowerParameter()
+    promise_resolve_TestModule_Sq14AsyncDirectionO(promiseValue, valueIsSome, valueValue)
+    if let error = _swift_js_take_exception() { throw error }
+}
+
+@JSFunction func Promise_resolve_Sq10AsyncThemeO(_ promise: JSObject, _ value: Optional<AsyncTheme>) throws(JSException)
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "promise_resolve_TestModule_Sq10AsyncThemeO")
+fileprivate func promise_resolve_TestModule_Sq10AsyncThemeO_extern(_ promise: Int32, _ valueIsSome: Int32, _ valueBytes: Int32, _ valueLength: Int32) -> Void
+#else
+fileprivate func promise_resolve_TestModule_Sq10AsyncThemeO_extern(_ promise: Int32, _ valueIsSome: Int32, _ valueBytes: Int32, _ valueLength: Int32) -> Void {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func promise_resolve_TestModule_Sq10AsyncThemeO(_ promise: Int32, _ valueIsSome: Int32, _ valueBytes: Int32, _ valueLength: Int32) -> Void {
+    return promise_resolve_TestModule_Sq10AsyncThemeO_extern(promise, valueIsSome, valueBytes, valueLength)
+}
+
+func _$Promise_resolve_Sq10AsyncThemeO(_ promise: JSObject, _ value: Optional<AsyncTheme>) throws(JSException) -> Void {
+    value.bridgeJSWithLoweredParameter { (valueIsSome, valueBytes, valueLength) in
+        let promiseValue = promise.bridgeJSLowerParameter()
+        promise_resolve_TestModule_Sq10AsyncThemeO(promiseValue, valueIsSome, valueBytes, valueLength)
+    }
+    if let error = _swift_js_take_exception() { throw error }
+}
+
+@JSFunction func Promise_resolve_Sq10AsyncPointV(_ promise: JSObject, _ value: Optional<AsyncPoint>) throws(JSException)
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "promise_resolve_TestModule_Sq10AsyncPointV")
+fileprivate func promise_resolve_TestModule_Sq10AsyncPointV_extern(_ promise: Int32) -> Void
+#else
+fileprivate func promise_resolve_TestModule_Sq10AsyncPointV_extern(_ promise: Int32) -> Void {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func promise_resolve_TestModule_Sq10AsyncPointV(_ promise: Int32) -> Void {
+    return promise_resolve_TestModule_Sq10AsyncPointV_extern(promise)
+}
+
+func _$Promise_resolve_Sq10AsyncPointV(_ promise: JSObject, _ value: Optional<AsyncPoint>) throws(JSException) -> Void {
+    let _ = value.bridgeJSLowerParameter()
+    let promiseValue = promise.bridgeJSLowerParameter()
+    promise_resolve_TestModule_Sq10AsyncPointV(promiseValue)
+    if let error = _swift_js_take_exception() { throw error }
+}
+
+@JSFunction func Promise_resolve_Sa10AsyncPointV(_ promise: JSObject, _ value: [AsyncPoint]) throws(JSException)
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "promise_resolve_TestModule_Sa10AsyncPointV")
+fileprivate func promise_resolve_TestModule_Sa10AsyncPointV_extern(_ promise: Int32) -> Void
+#else
+fileprivate func promise_resolve_TestModule_Sa10AsyncPointV_extern(_ promise: Int32) -> Void {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func promise_resolve_TestModule_Sa10AsyncPointV(_ promise: Int32) -> Void {
+    return promise_resolve_TestModule_Sa10AsyncPointV_extern(promise)
+}
+
+func _$Promise_resolve_Sa10AsyncPointV(_ promise: JSObject, _ value: [AsyncPoint]) throws(JSException) -> Void {
+    let _ = value.bridgeJSLowerParameter()
+    let promiseValue = promise.bridgeJSLowerParameter()
+    promise_resolve_TestModule_Sa10AsyncPointV(promiseValue)
+    if let error = _swift_js_take_exception() { throw error }
+}
+
+@JSFunction func Promise_resolve_Sa14AsyncDirectionO(_ promise: JSObject, _ value: [AsyncDirection]) throws(JSException)
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "promise_resolve_TestModule_Sa14AsyncDirectionO")
+fileprivate func promise_resolve_TestModule_Sa14AsyncDirectionO_extern(_ promise: Int32) -> Void
+#else
+fileprivate func promise_resolve_TestModule_Sa14AsyncDirectionO_extern(_ promise: Int32) -> Void {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func promise_resolve_TestModule_Sa14AsyncDirectionO(_ promise: Int32) -> Void {
+    return promise_resolve_TestModule_Sa14AsyncDirectionO_extern(promise)
+}
+
+func _$Promise_resolve_Sa14AsyncDirectionO(_ promise: JSObject, _ value: [AsyncDirection]) throws(JSException) -> Void {
+    let _ = value.bridgeJSLowerParameter()
+    let promiseValue = promise.bridgeJSLowerParameter()
+    promise_resolve_TestModule_Sa14AsyncDirectionO(promiseValue)
+    if let error = _swift_js_take_exception() { throw error }
+}
+
+@JSFunction func Promise_resolve_SD10AsyncPointV(_ promise: JSObject, _ value: [String: AsyncPoint]) throws(JSException)
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "promise_resolve_TestModule_SD10AsyncPointV")
+fileprivate func promise_resolve_TestModule_SD10AsyncPointV_extern(_ promise: Int32) -> Void
+#else
+fileprivate func promise_resolve_TestModule_SD10AsyncPointV_extern(_ promise: Int32) -> Void {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func promise_resolve_TestModule_SD10AsyncPointV(_ promise: Int32) -> Void {
+    return promise_resolve_TestModule_SD10AsyncPointV_extern(promise)
+}
+
+func _$Promise_resolve_SD10AsyncPointV(_ promise: JSObject, _ value: [String: AsyncPoint]) throws(JSException) -> Void {
+    let _ = value.bridgeJSLowerParameter()
+    let promiseValue = promise.bridgeJSLowerParameter()
+    promise_resolve_TestModule_SD10AsyncPointV(promiseValue)
+    if let error = _swift_js_take_exception() { throw error }
+}
+
+@JSFunction func Promise_resolve_SD14AsyncDirectionO(_ promise: JSObject, _ value: [String: AsyncDirection]) throws(JSException)
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "promise_resolve_TestModule_SD14AsyncDirectionO")
+fileprivate func promise_resolve_TestModule_SD14AsyncDirectionO_extern(_ promise: Int32) -> Void
+#else
+fileprivate func promise_resolve_TestModule_SD14AsyncDirectionO_extern(_ promise: Int32) -> Void {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func promise_resolve_TestModule_SD14AsyncDirectionO(_ promise: Int32) -> Void {
+    return promise_resolve_TestModule_SD14AsyncDirectionO_extern(promise)
+}
+
+func _$Promise_resolve_SD14AsyncDirectionO(_ promise: JSObject, _ value: [String: AsyncDirection]) throws(JSException) -> Void {
+    let _ = value.bridgeJSLowerParameter()
+    let promiseValue = promise.bridgeJSLowerParameter()
+    promise_resolve_TestModule_SD14AsyncDirectionO(promiseValue)
+    if let error = _swift_js_take_exception() { throw error }
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "bjs_TestModule_register_type_handles")
+fileprivate func _bjs_TestModule_register_type_handles_extern(_ base: UnsafePointer<Int32>?, _ count: Int32)
+
+@_expose(wasm, "bjs_TestModule_register_type_handles")
+public func _bjs_TestModule_register_type_handles() {
+    let typeIds: [Int32] = [
+        AsyncPoint.bridgeJSTypeID,
+        AsyncDirection.bridgeJSTypeID,
+        AsyncTheme.bridgeJSTypeID,
+    ]
+    typeIds.withUnsafeBufferPointer { buffer in
+        _bjs_TestModule_register_type_handles_extern(buffer.baseAddress, Int32(buffer.count))
+    }
+}
+#endif
\ No newline at end of file
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/AsyncAssociatedValueEnum.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/AsyncAssociatedValueEnum.json
new file mode 100644
index 000000000..b69bf4012
--- /dev/null
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/AsyncAssociatedValueEnum.json
@@ -0,0 +1,132 @@
+{
+  "exported" : {
+    "aliases" : [
+
+    ],
+    "classes" : [
+
+    ],
+    "enums" : [
+      {
+        "cases" : [
+          {
+            "associatedValues" : [
+              {
+                "type" : {
+                  "string" : {
+
+                  }
+                }
+              }
+            ],
+            "name" : "success"
+          },
+          {
+            "associatedValues" : [
+              {
+                "type" : {
+                  "integer" : {
+                    "_0" : {
+                      "isSigned" : true,
+                      "width" : "word"
+                    }
+                  }
+                }
+              }
+            ],
+            "name" : "failure"
+          },
+          {
+            "associatedValues" : [
+
+            ],
+            "name" : "idle"
+          }
+        ],
+        "emitStyle" : "const",
+        "name" : "AsyncPayloadResult",
+        "staticMethods" : [
+
+        ],
+        "staticProperties" : [
+
+        ],
+        "swiftCallName" : "AsyncPayloadResult",
+        "tsFullPath" : "AsyncPayloadResult"
+      }
+    ],
+    "exposeToGlobal" : false,
+    "functions" : [
+      {
+        "abiName" : "bjs_asyncRoundTripAssociatedValueEnum",
+        "effects" : {
+          "isAsync" : true,
+          "isStatic" : false,
+          "isThrows" : false
+        },
+        "name" : "asyncRoundTripAssociatedValueEnum",
+        "parameters" : [
+          {
+            "label" : "_",
+            "name" : "value",
+            "type" : {
+              "associatedValueEnum" : {
+                "_0" : "AsyncPayloadResult"
+              }
+            }
+          }
+        ],
+        "returnType" : {
+          "associatedValueEnum" : {
+            "_0" : "AsyncPayloadResult"
+          }
+        }
+      },
+      {
+        "abiName" : "bjs_asyncRoundTripOptionalAssociatedValueEnum",
+        "effects" : {
+          "isAsync" : true,
+          "isStatic" : false,
+          "isThrows" : false
+        },
+        "name" : "asyncRoundTripOptionalAssociatedValueEnum",
+        "parameters" : [
+          {
+            "label" : "_",
+            "name" : "value",
+            "type" : {
+              "nullable" : {
+                "_0" : {
+                  "associatedValueEnum" : {
+                    "_0" : "AsyncPayloadResult"
+                  }
+                },
+                "_1" : "null"
+              }
+            }
+          }
+        ],
+        "returnType" : {
+          "nullable" : {
+            "_0" : {
+              "associatedValueEnum" : {
+                "_0" : "AsyncPayloadResult"
+              }
+            },
+            "_1" : "null"
+          }
+        }
+      }
+    ],
+    "protocols" : [
+
+    ],
+    "structs" : [
+
+    ]
+  },
+  "moduleName" : "TestModule",
+  "usedExternalModules" : [
+
+  ]
+}
\ No newline at end of file
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/AsyncAssociatedValueEnum.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/AsyncAssociatedValueEnum.swift
new file mode 100644
index 000000000..6776998bc
--- /dev/null
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/AsyncAssociatedValueEnum.swift
@@ -0,0 +1,135 @@
+extension AsyncPayloadResult: _BridgedSwiftAssociatedValueEnum {
+    @_spi(BridgeJS) @_transparent public static func bridgeJSStackPopPayload(_ caseId: Int32) -> AsyncPayloadResult {
+        switch caseId {
+        case 0:
+            return .success(String.bridgeJSStackPop())
+        case 1:
+            return .failure(Int.bridgeJSStackPop())
+        case 2:
+            return .idle
+        default:
+            fatalError("Unknown AsyncPayloadResult case ID: \(caseId)")
+        }
+    }
+
+    @_spi(BridgeJS) @_transparent public consuming func bridgeJSStackPushPayload() -> Int32 {
+        switch self {
+        case .success(let param0):
+            param0.bridgeJSStackPush()
+            return Int32(0)
+        case .failure(let param0):
+            param0.bridgeJSStackPush()
+            return Int32(1)
+        case .idle:
+            return Int32(2)
+        }
+    }
+}
+
+@_expose(wasm, "bjs_asyncRoundTripAssociatedValueEnum")
+@_cdecl("bjs_asyncRoundTripAssociatedValueEnum")
+public func _bjs_asyncRoundTripAssociatedValueEnum(_ value: Int32) -> Int32 {
+    #if arch(wasm32)
+    let _tmp_value = AsyncPayloadResult.bridgeJSLiftParameter(value)
+    return _bjs_makePromise(resolve: Promise_resolve_18AsyncPayloadResultO, reject: Promise_reject) {
+        return await asyncRoundTripAssociatedValueEnum(_: _tmp_value)
+    }
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_asyncRoundTripOptionalAssociatedValueEnum")
+@_cdecl("bjs_asyncRoundTripOptionalAssociatedValueEnum")
+public func _bjs_asyncRoundTripOptionalAssociatedValueEnum(_ valueIsSome: Int32, _ valueCaseId: Int32) -> Int32 {
+    #if arch(wasm32)
+    let _tmp_value = Optional<AsyncPayloadResult>.bridgeJSLiftParameter(valueIsSome, valueCaseId)
+    return _bjs_makePromise(resolve: Promise_resolve_Sq18AsyncPayloadResultO, reject: Promise_reject) {
+        return await asyncRoundTripOptionalAssociatedValueEnum(_: _tmp_value)
+    }
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+extension AsyncPayloadResult: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = AsyncPayloadResult.bridgeJSMakeTypeHandle()
+}
+
+@JSFunction func Promise_reject(_ promise: JSObject, _ value: JSValue) throws(JSException)
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "promise_reject_TestModule")
+fileprivate func promise_reject_TestModule_extern(_ promise: Int32, _ valueKind: Int32, _ valuePayload1: Int32, _ valuePayload2: Float64) -> Void
+#else
+fileprivate func promise_reject_TestModule_extern(_ promise: Int32, _ valueKind: Int32, _ valuePayload1: Int32, _ valuePayload2: Float64) -> Void {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func promise_reject_TestModule(_ promise: Int32, _ valueKind: Int32, _ valuePayload1: Int32, _ valuePayload2: Float64) -> Void {
+    return promise_reject_TestModule_extern(promise, valueKind, valuePayload1, valuePayload2)
+}
+
+func _$Promise_reject(_ promise: JSObject, _ value: JSValue) throws(JSException) -> Void {
+    let (valueKind, valuePayload1, valuePayload2) = value.bridgeJSLowerParameter()
+    let promiseValue = promise.bridgeJSLowerParameter()
+    promise_reject_TestModule(promiseValue, valueKind, valuePayload1, valuePayload2)
+    if let error = _swift_js_take_exception() { throw error }
+}
+
+@JSFunction func Promise_resolve_18AsyncPayloadResultO(_ promise: JSObject, _ value: AsyncPayloadResult) throws(JSException)
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "promise_resolve_TestModule_18AsyncPayloadResultO")
+fileprivate func promise_resolve_TestModule_18AsyncPayloadResultO_extern(_ promise: Int32, _ value: Int32) -> Void
+#else
+fileprivate func promise_resolve_TestModule_18AsyncPayloadResultO_extern(_ promise: Int32, _ value: Int32) -> Void {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func promise_resolve_TestModule_18AsyncPayloadResultO(_ promise: Int32, _ value: Int32) -> Void {
+    return promise_resolve_TestModule_18AsyncPayloadResultO_extern(promise, value)
+}
+
+func _$Promise_resolve_18AsyncPayloadResultO(_ promise: JSObject, _ value: AsyncPayloadResult) throws(JSException) -> Void {
+    let valueCaseId = value.bridgeJSLowerParameter()
+    let promiseValue = promise.bridgeJSLowerParameter()
+    promise_resolve_TestModule_18AsyncPayloadResultO(promiseValue, valueCaseId)
+    if let error = _swift_js_take_exception() { throw error }
+}
+
+@JSFunction func Promise_resolve_Sq18AsyncPayloadResultO(_ promise: JSObject, _ value: Optional<AsyncPayloadResult>) throws(JSException)
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "promise_resolve_TestModule_Sq18AsyncPayloadResultO")
+fileprivate func promise_resolve_TestModule_Sq18AsyncPayloadResultO_extern(_ promise: Int32, _ valueIsSome: Int32, _ valueCaseId: Int32) -> Void
+#else
+fileprivate func promise_resolve_TestModule_Sq18AsyncPayloadResultO_extern(_ promise: Int32, _ valueIsSome: Int32, _ valueCaseId: Int32) -> Void {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func promise_resolve_TestModule_Sq18AsyncPayloadResultO(_ promise: Int32, _ valueIsSome: Int32, _ valueCaseId: Int32) -> Void {
+    return promise_resolve_TestModule_Sq18AsyncPayloadResultO_extern(promise, valueIsSome, valueCaseId)
+}
+
+func _$Promise_resolve_Sq18AsyncPayloadResultO(_ promise: JSObject, _ value: Optional<AsyncPayloadResult>) throws(JSException) -> Void {
+    let (valueIsSome, valueCaseId) = value.bridgeJSLowerParameter()
+    let promiseValue = promise.bridgeJSLowerParameter()
+    promise_resolve_TestModule_Sq18AsyncPayloadResultO(promiseValue, valueIsSome, valueCaseId)
+    if let error = _swift_js_take_exception() { throw error }
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "bjs_TestModule_register_type_handles")
+fileprivate func _bjs_TestModule_register_type_handles_extern(_ base: UnsafePointer<Int32>?, _ count: Int32)
+
+@_expose(wasm, "bjs_TestModule_register_type_handles")
+public func _bjs_TestModule_register_type_handles() {
+    let typeIds: [Int32] = [
+        AsyncPayloadResult.bridgeJSTypeID,
+    ]
+    typeIds.withUnsafeBufferPointer { buffer in
+        _bjs_TestModule_register_type_handles_extern(buffer.baseAddress, Int32(buffer.count))
+    }
+}
+#endif
\ No newline at end of file
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/AsyncImport.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/AsyncImport.swift
index 7a60bc6b7..9568a4426 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/AsyncImport.swift
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/AsyncImport.swift
@@ -27,8 +27,8 @@ private enum _BJS_Closure_10TestModules7JSValueV_y {
         let callback = JSObject.bridgeJSLiftParameter(callbackId)
         return { [callback] param0 in
             #if arch(wasm32)
-            let callbackValue = callback.bridgeJSLowerParameter()
             let (param0Kind, param0Payload1, param0Payload2) = param0.bridgeJSLowerParameter()
+            let callbackValue = callback.bridgeJSLowerParameter()
             invoke_js_callback_TestModule_10TestModules7JSValueV_y(callbackValue, param0Kind, param0Payload1, param0Payload2)
             #else
             fatalError("Only available on WebAssembly")
@@ -88,8 +88,8 @@ private enum _BJS_Closure_10TestModules8JSObjectC_y {
         let callback = JSObject.bridgeJSLiftParameter(callbackId)
         return { [callback] param0 in
             #if arch(wasm32)
-            let callbackValue = callback.bridgeJSLowerParameter()
             let param0Value = param0.bridgeJSLowerParameter()
+            let callbackValue = callback.bridgeJSLowerParameter()
             invoke_js_callback_TestModule_10TestModules8JSObjectC_y(callbackValue, param0Value)
             #else
             fatalError("Only available on WebAssembly")
@@ -149,8 +149,8 @@ private enum _BJS_Closure_10TestModulesSS_y {
         let callback = JSObject.bridgeJSLiftParameter(callbackId)
         return { [callback] param0 in
             #if arch(wasm32)
-            let callbackValue = callback.bridgeJSLowerParameter()
             param0.bridgeJSWithLoweredParameter { (param0Bytes, param0Length) in
+                let callbackValue = callback.bridgeJSLowerParameter()
                 invoke_js_callback_TestModule_10TestModulesSS_y(callbackValue, param0Bytes, param0Length)
             }
             #else
@@ -211,8 +211,8 @@ private enum _BJS_Closure_10TestModulesSb_y {
         let callback = JSObject.bridgeJSLiftParameter(callbackId)
         return { [callback] param0 in
             #if arch(wasm32)
-            let callbackValue = callback.bridgeJSLowerParameter()
             let param0Value = param0.bridgeJSLowerParameter()
+            let callbackValue = callback.bridgeJSLowerParameter()
             invoke_js_callback_TestModule_10TestModulesSb_y(callbackValue, param0Value)
             #else
             fatalError("Only available on WebAssembly")
@@ -272,8 +272,8 @@ private enum _BJS_Closure_10TestModulesSd_y {
         let callback = JSObject.bridgeJSLiftParameter(callbackId)
         return { [callback] param0 in
             #if arch(wasm32)
-            let callbackValue = callback.bridgeJSLowerParameter()
             let param0Value = param0.bridgeJSLowerParameter()
+            let callbackValue = callback.bridgeJSLowerParameter()
             invoke_js_callback_TestModule_10TestModulesSd_y(callbackValue, param0Value)
             #else
             fatalError("Only available on WebAssembly")
@@ -333,8 +333,8 @@ private enum _BJS_Closure_10TestModulesSi_y {
         let callback = JSObject.bridgeJSLiftParameter(callbackId)
         return { [callback] param0 in
             #if arch(wasm32)
-            let callbackValue = callback.bridgeJSLowerParameter()
             let param0Value = param0.bridgeJSLowerParameter()
+            let callbackValue = callback.bridgeJSLowerParameter()
             invoke_js_callback_TestModule_10TestModulesSi_y(callbackValue, param0Value)
             #else
             fatalError("Only available on WebAssembly")
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/AsyncStaticImport.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/AsyncStaticImport.swift
index ee7dc73e7..40b2a009e 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/AsyncStaticImport.swift
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/AsyncStaticImport.swift
@@ -27,8 +27,8 @@ private enum _BJS_Closure_10TestModules7JSValueV_y {
         let callback = JSObject.bridgeJSLiftParameter(callbackId)
         return { [callback] param0 in
             #if arch(wasm32)
-            let callbackValue = callback.bridgeJSLowerParameter()
             let (param0Kind, param0Payload1, param0Payload2) = param0.bridgeJSLowerParameter()
+            let callbackValue = callback.bridgeJSLowerParameter()
             invoke_js_callback_TestModule_10TestModules7JSValueV_y(callbackValue, param0Kind, param0Payload1, param0Payload2)
             #else
             fatalError("Only available on WebAssembly")
@@ -88,8 +88,8 @@ private enum _BJS_Closure_10TestModulesSd_y {
         let callback = JSObject.bridgeJSLiftParameter(callbackId)
         return { [callback] param0 in
             #if arch(wasm32)
-            let callbackValue = callback.bridgeJSLowerParameter()
             let param0Value = param0.bridgeJSLowerParameter()
+            let callbackValue = callback.bridgeJSLowerParameter()
             invoke_js_callback_TestModule_10TestModulesSd_y(callbackValue, param0Value)
             #else
             fatalError("Only available on WebAssembly")
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ClassWithNestedTypes.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ClassWithNestedTypes.json
new file mode 100644
index 000000000..0aa78c471
--- /dev/null
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ClassWithNestedTypes.json
@@ -0,0 +1,218 @@
+{
+  "exported" : {
+    "aliases" : [
+
+    ],
+    "classes" : [
+      {
+        "constructor" : {
+          "abiName" : "bjs_Account_init",
+          "effects" : {
+            "isAsync" : false,
+            "isStatic" : false,
+            "isThrows" : false
+          },
+          "parameters" : [
+            {
+              "label" : "name",
+              "name" : "name",
+              "type" : {
+                "string" : {
+
+                }
+              }
+            }
+          ]
+        },
+        "methods" : [
+          {
+            "abiName" : "bjs_Account_describe",
+            "effects" : {
+              "isAsync" : false,
+              "isStatic" : false,
+              "isThrows" : false
+            },
+            "name" : "describe",
+            "parameters" : [
+
+            ],
+            "returnType" : {
+              "string" : {
+
+              }
+            }
+          }
+        ],
+        "name" : "Account",
+        "properties" : [
+          {
+            "isReadonly" : false,
+            "isStatic" : false,
+            "name" : "name",
+            "type" : {
+              "string" : {
+
+              }
+            }
+          },
+          {
+            "isReadonly" : true,
+            "isStatic" : false,
+            "name" : "role",
+            "type" : {
+              "rawValueEnum" : {
+                "_0" : "Account.Role",
+                "_1" : "String"
+              }
+            }
+          },
+          {
+            "isReadonly" : true,
+            "isStatic" : true,
+            "name" : "defaultRole",
+            "staticContext" : {
+              "className" : {
+                "_0" : "Account"
+              }
+            },
+            "type" : {
+              "rawValueEnum" : {
+                "_0" : "Account.Role",
+                "_1" : "String"
+              }
+            }
+          }
+        ],
+        "swiftCallName" : "Account"
+      }
+    ],
+    "enums" : [
+      {
+        "cases" : [
+          {
+            "associatedValues" : [
+
+            ],
+            "name" : "admin"
+          },
+          {
+            "associatedValues" : [
+
+            ],
+            "name" : "guest"
+          }
+        ],
+        "emitStyle" : "const",
+        "name" : "Role",
+        "namespace" : [
+          "Account"
+        ],
+        "rawType" : "String",
+        "staticMethods" : [
+
+        ],
+        "staticProperties" : [
+
+        ],
+        "swiftCallName" : "Account.Role",
+        "tsFullPath" : "Account.Role"
+      }
+    ],
+    "exposeToGlobal" : false,
+    "functions" : [
+
+    ],
+    "protocols" : [
+
+    ],
+    "structs" : [
+      {
+        "constructor" : {
+          "abiName" : "bjs_Account_Credentials_init",
+          "effects" : {
+            "isAsync" : false,
+            "isStatic" : false,
+            "isThrows" : false
+          },
+          "parameters" : [
+            {
+              "label" : "token",
+              "name" : "token",
+              "type" : {
+                "string" : {
+
+                }
+              }
+            }
+          ]
+        },
+        "methods" : [
+          {
+            "abiName" : "bjs_Account_Credentials_static_empty",
+            "effects" : {
+              "isAsync" : false,
+              "isStatic" : true,
+              "isThrows" : false
+            },
+            "name" : "empty",
+            "parameters" : [
+
+            ],
+            "returnType" : {
+              "swiftStruct" : {
+                "_0" : "Account.Credentials"
+              }
+            },
+            "staticContext" : {
+              "structName" : {
+                "_0" : "Account_Credentials"
+              }
+            }
+          }
+        ],
+        "name" : "Credentials",
+        "namespace" : [
+          "Account"
+        ],
+        "properties" : [
+          {
+            "isReadonly" : true,
+            "isStatic" : false,
+            "name" : "token",
+            "namespace" : [
+              "Account"
+            ],
+            "type" : {
+              "string" : {
+
+              }
+            }
+          },
+          {
+            "isReadonly" : true,
+            "isStatic" : true,
+            "name" : "maxLength",
+            "staticContext" : {
+              "structName" : {
+                "_0" : "Account_Credentials"
+              }
+            },
+            "type" : {
+              "integer" : {
+                "_0" : {
+                  "isSigned" : true,
+                  "width" : "word"
+                }
+              }
+            }
+          }
+        ],
+        "swiftCallName" : "Account.Credentials"
+      }
+    ]
+  },
+  "moduleName" : "TestModule",
+  "usedExternalModules" : [
+
+  ]
+}
\ No newline at end of file
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ClassWithNestedTypes.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ClassWithNestedTypes.swift
new file mode 100644
index 000000000..c9c291317
--- /dev/null
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ClassWithNestedTypes.swift
@@ -0,0 +1,201 @@
+extension Account.Role: _BridgedSwiftEnumNoPayload, _BridgedSwiftRawValueEnum {
+}
+
+extension Account.Credentials: _BridgedSwiftStruct {
+    @_spi(BridgeJS) @_transparent public static func bridgeJSStackPop() -> Account.Credentials {
+        let token = String.bridgeJSStackPop()
+        return Account.Credentials(token: token)
+    }
+
+    @_spi(BridgeJS) @_transparent public consuming func bridgeJSStackPush() {
+        self.token.bridgeJSStackPush()
+    }
+
+    init(unsafelyCopying jsObject: JSObject) {
+        _bjs_struct_lower_Account_Credentials(jsObject.bridgeJSLowerParameter())
+        self = Self.bridgeJSStackPop()
+    }
+
+    func toJSObject() -> JSObject {
+        let __bjs_self = self
+        __bjs_self.bridgeJSStackPush()
+        return JSObject(id: UInt32(bitPattern: _bjs_struct_lift_Account_Credentials()))
+    }
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "swift_js_struct_lower_Account_Credentials")
+fileprivate func _bjs_struct_lower_Account_Credentials_extern(_ objectId: Int32) -> Void
+#else
+fileprivate func _bjs_struct_lower_Account_Credentials_extern(_ objectId: Int32) -> Void {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func _bjs_struct_lower_Account_Credentials(_ objectId: Int32) -> Void {
+    return _bjs_struct_lower_Account_Credentials_extern(objectId)
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "swift_js_struct_lift_Account_Credentials")
+fileprivate func _bjs_struct_lift_Account_Credentials_extern() -> Int32
+#else
+fileprivate func _bjs_struct_lift_Account_Credentials_extern() -> Int32 {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func _bjs_struct_lift_Account_Credentials() -> Int32 {
+    return _bjs_struct_lift_Account_Credentials_extern()
+}
+
+@_expose(wasm, "bjs_Account_Credentials_init")
+@_cdecl("bjs_Account_Credentials_init")
+public func _bjs_Account_Credentials_init(_ tokenBytes: Int32, _ tokenLength: Int32) -> Void {
+    #if arch(wasm32)
+    let ret = Account.Credentials(token: String.bridgeJSLiftParameter(tokenBytes, tokenLength))
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_Account_Credentials_static_maxLength_get")
+@_cdecl("bjs_Account_Credentials_static_maxLength_get")
+public func _bjs_Account_Credentials_static_maxLength_get() -> Int32 {
+    #if arch(wasm32)
+    let ret = Account.Credentials.maxLength
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_Account_Credentials_static_empty")
+@_cdecl("bjs_Account_Credentials_static_empty")
+public func _bjs_Account_Credentials_static_empty() -> Void {
+    #if arch(wasm32)
+    let ret = Account.Credentials.empty()
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_Account_init")
+@_cdecl("bjs_Account_init")
+public func _bjs_Account_init(_ nameBytes: Int32, _ nameLength: Int32) -> UnsafeMutableRawPointer {
+    #if arch(wasm32)
+    let ret = Account(name: String.bridgeJSLiftParameter(nameBytes, nameLength))
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_Account_describe")
+@_cdecl("bjs_Account_describe")
+public func _bjs_Account_describe(_ _self: UnsafeMutableRawPointer) -> Void {
+    #if arch(wasm32)
+    let ret = Account.bridgeJSLiftParameter(_self).describe()
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_Account_name_get")
+@_cdecl("bjs_Account_name_get")
+public func _bjs_Account_name_get(_ _self: UnsafeMutableRawPointer) -> Void {
+    #if arch(wasm32)
+    let ret = Account.bridgeJSLiftParameter(_self).name
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_Account_name_set")
+@_cdecl("bjs_Account_name_set")
+public func _bjs_Account_name_set(_ _self: UnsafeMutableRawPointer, _ valueBytes: Int32, _ valueLength: Int32) -> Void {
+    #if arch(wasm32)
+    Account.bridgeJSLiftParameter(_self).name = String.bridgeJSLiftParameter(valueBytes, valueLength)
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_Account_role_get")
+@_cdecl("bjs_Account_role_get")
+public func _bjs_Account_role_get(_ _self: UnsafeMutableRawPointer) -> Void {
+    #if arch(wasm32)
+    let ret = Account.bridgeJSLiftParameter(_self).role
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_Account_static_defaultRole_get")
+@_cdecl("bjs_Account_static_defaultRole_get")
+public func _bjs_Account_static_defaultRole_get() -> Void {
+    #if arch(wasm32)
+    let ret = Account.defaultRole
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_Account_deinit")
+@_cdecl("bjs_Account_deinit")
+public func _bjs_Account_deinit(_ pointer: UnsafeMutableRawPointer) -> Void {
+    #if arch(wasm32)
+    Unmanaged<Account>.fromOpaque(pointer).release()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+extension Account: ConvertibleToJSValue, _BridgedSwiftHeapObject, _BridgedSwiftProtocolExportable {
+    var jsValue: JSValue {
+        return .object(JSObject(id: UInt32(bitPattern: _bjs_Account_wrap(Unmanaged.passRetained(self).toOpaque()))))
+    }
+    consuming func bridgeJSLowerAsProtocolReturn() -> Int32 {
+        _bjs_Account_wrap(Unmanaged.passRetained(self).toOpaque())
+    }
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "TestModule", name: "bjs_Account_wrap")
+fileprivate func _bjs_Account_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32
+#else
+fileprivate func _bjs_Account_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func _bjs_Account_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 {
+    return _bjs_Account_wrap_extern(pointer)
+}
+
+extension Account.Credentials: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = Account.Credentials.bridgeJSMakeTypeHandle()
+}
+
+extension Account.Role: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = Account.Role.bridgeJSMakeTypeHandle()
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "bjs_TestModule_register_type_handles")
+fileprivate func _bjs_TestModule_register_type_handles_extern(_ base: UnsafePointer<Int32>?, _ count: Int32)
+
+@_expose(wasm, "bjs_TestModule_register_type_handles")
+public func _bjs_TestModule_register_type_handles() {
+    let typeIds: [Int32] = [
+        Account.Credentials.bridgeJSTypeID,
+        Account.Role.bridgeJSTypeID,
+    ]
+    typeIds.withUnsafeBufferPointer { buffer in
+        _bjs_TestModule_register_type_handles_extern(buffer.baseAddress, Int32(buffer.count))
+    }
+}
+#endif
\ No newline at end of file
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/CrossFileExtension.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/CrossFileExtension.json
index 4c8d575b0..bfa71444c 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/CrossFileExtension.json
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/CrossFileExtension.json
@@ -1,5 +1,8 @@
 {
   "exported" : {
+    "aliases" : [
+
+    ],
     "classes" : [
       {
         "constructor" : {
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/CrossFileExtensionOrderIndependence.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/CrossFileExtensionOrderIndependence.json
new file mode 100644
index 000000000..ef20e9a28
--- /dev/null
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/CrossFileExtensionOrderIndependence.json
@@ -0,0 +1,106 @@
+{
+  "exported" : {
+    "aliases" : [
+
+    ],
+    "classes" : [
+      {
+        "constructor" : {
+          "abiName" : "bjs_Archive_init",
+          "effects" : {
+            "isAsync" : false,
+            "isStatic" : false,
+            "isThrows" : false
+          },
+          "parameters" : [
+
+          ]
+        },
+        "methods" : [
+
+        ],
+        "name" : "Archive",
+        "properties" : [
+
+        ],
+        "swiftCallName" : "Archive"
+      }
+    ],
+    "enums" : [
+
+    ],
+    "exposeToGlobal" : false,
+    "functions" : [
+
+    ],
+    "protocols" : [
+
+    ],
+    "structs" : [
+      {
+        "constructor" : {
+          "abiName" : "bjs_Archive_Record_init",
+          "effects" : {
+            "isAsync" : false,
+            "isStatic" : false,
+            "isThrows" : false
+          },
+          "parameters" : [
+            {
+              "label" : "label",
+              "name" : "label",
+              "type" : {
+                "string" : {
+
+                }
+              }
+            }
+          ]
+        },
+        "methods" : [
+          {
+            "abiName" : "bjs_Archive_Record_describeRecord",
+            "effects" : {
+              "isAsync" : false,
+              "isStatic" : false,
+              "isThrows" : false
+            },
+            "name" : "describeRecord",
+            "parameters" : [
+
+            ],
+            "returnType" : {
+              "string" : {
+
+              }
+            }
+          }
+        ],
+        "name" : "Record",
+        "namespace" : [
+          "Archive"
+        ],
+        "properties" : [
+          {
+            "isReadonly" : true,
+            "isStatic" : false,
+            "name" : "label",
+            "namespace" : [
+              "Archive"
+            ],
+            "type" : {
+              "string" : {
+
+              }
+            }
+          }
+        ],
+        "swiftCallName" : "Archive.Record"
+      }
+    ]
+  },
+  "moduleName" : "TestModule",
+  "usedExternalModules" : [
+
+  ]
+}
\ No newline at end of file
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/CrossFileExtensionOrderIndependence.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/CrossFileExtensionOrderIndependence.swift
new file mode 100644
index 000000000..c8df6b29e
--- /dev/null
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/CrossFileExtensionOrderIndependence.swift
@@ -0,0 +1,128 @@
+extension Archive.Record: _BridgedSwiftStruct {
+    @_spi(BridgeJS) @_transparent public static func bridgeJSStackPop() -> Archive.Record {
+        let label = String.bridgeJSStackPop()
+        return Archive.Record(label: label)
+    }
+
+    @_spi(BridgeJS) @_transparent public consuming func bridgeJSStackPush() {
+        self.label.bridgeJSStackPush()
+    }
+
+    init(unsafelyCopying jsObject: JSObject) {
+        _bjs_struct_lower_Archive_Record(jsObject.bridgeJSLowerParameter())
+        self = Self.bridgeJSStackPop()
+    }
+
+    func toJSObject() -> JSObject {
+        let __bjs_self = self
+        __bjs_self.bridgeJSStackPush()
+        return JSObject(id: UInt32(bitPattern: _bjs_struct_lift_Archive_Record()))
+    }
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "swift_js_struct_lower_Archive_Record")
+fileprivate func _bjs_struct_lower_Archive_Record_extern(_ objectId: Int32) -> Void
+#else
+fileprivate func _bjs_struct_lower_Archive_Record_extern(_ objectId: Int32) -> Void {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func _bjs_struct_lower_Archive_Record(_ objectId: Int32) -> Void {
+    return _bjs_struct_lower_Archive_Record_extern(objectId)
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "swift_js_struct_lift_Archive_Record")
+fileprivate func _bjs_struct_lift_Archive_Record_extern() -> Int32
+#else
+fileprivate func _bjs_struct_lift_Archive_Record_extern() -> Int32 {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func _bjs_struct_lift_Archive_Record() -> Int32 {
+    return _bjs_struct_lift_Archive_Record_extern()
+}
+
+@_expose(wasm, "bjs_Archive_Record_init")
+@_cdecl("bjs_Archive_Record_init")
+public func _bjs_Archive_Record_init(_ labelBytes: Int32, _ labelLength: Int32) -> Void {
+    #if arch(wasm32)
+    let ret = Archive.Record(label: String.bridgeJSLiftParameter(labelBytes, labelLength))
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_Archive_Record_describeRecord")
+@_cdecl("bjs_Archive_Record_describeRecord")
+public func _bjs_Archive_Record_describeRecord() -> Void {
+    #if arch(wasm32)
+    let ret = Archive.Record.bridgeJSLiftParameter().describeRecord()
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_Archive_init")
+@_cdecl("bjs_Archive_init")
+public func _bjs_Archive_init() -> UnsafeMutableRawPointer {
+    #if arch(wasm32)
+    let ret = Archive()
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_Archive_deinit")
+@_cdecl("bjs_Archive_deinit")
+public func _bjs_Archive_deinit(_ pointer: UnsafeMutableRawPointer) -> Void {
+    #if arch(wasm32)
+    Unmanaged<Archive>.fromOpaque(pointer).release()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+extension Archive: ConvertibleToJSValue, _BridgedSwiftHeapObject, _BridgedSwiftProtocolExportable {
+    var jsValue: JSValue {
+        return .object(JSObject(id: UInt32(bitPattern: _bjs_Archive_wrap(Unmanaged.passRetained(self).toOpaque()))))
+    }
+    consuming func bridgeJSLowerAsProtocolReturn() -> Int32 {
+        _bjs_Archive_wrap(Unmanaged.passRetained(self).toOpaque())
+    }
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "TestModule", name: "bjs_Archive_wrap")
+fileprivate func _bjs_Archive_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32
+#else
+fileprivate func _bjs_Archive_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func _bjs_Archive_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 {
+    return _bjs_Archive_wrap_extern(pointer)
+}
+
+extension Archive.Record: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = Archive.Record.bridgeJSMakeTypeHandle()
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "bjs_TestModule_register_type_handles")
+fileprivate func _bjs_TestModule_register_type_handles_extern(_ base: UnsafePointer<Int32>?, _ count: Int32)
+
+@_expose(wasm, "bjs_TestModule_register_type_handles")
+public func _bjs_TestModule_register_type_handles() {
+    let typeIds: [Int32] = [
+        Archive.Record.bridgeJSTypeID,
+    ]
+    typeIds.withUnsafeBufferPointer { buffer in
+        _bjs_TestModule_register_type_handles_extern(buffer.baseAddress, Int32(buffer.count))
+    }
+}
+#endif
\ No newline at end of file
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/CrossFileFunctionTypes.ReverseOrder.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/CrossFileFunctionTypes.ReverseOrder.json
index 6c589de87..053757256 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/CrossFileFunctionTypes.ReverseOrder.json
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/CrossFileFunctionTypes.ReverseOrder.json
@@ -1,5 +1,8 @@
 {
   "exported" : {
+    "aliases" : [
+
+    ],
     "classes" : [
       {
         "constructor" : {
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/CrossFileFunctionTypes.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/CrossFileFunctionTypes.json
index 9bec040f1..41aa858ac 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/CrossFileFunctionTypes.json
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/CrossFileFunctionTypes.json
@@ -1,5 +1,8 @@
 {
   "exported" : {
+    "aliases" : [
+
+    ],
     "classes" : [
       {
         "constructor" : {
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/CrossFileNestedTypeExtension.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/CrossFileNestedTypeExtension.json
new file mode 100644
index 000000000..ad8a71bb7
--- /dev/null
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/CrossFileNestedTypeExtension.json
@@ -0,0 +1,100 @@
+{
+  "exported" : {
+    "aliases" : [
+
+    ],
+    "classes" : [
+      {
+        "constructor" : {
+          "abiName" : "bjs_Workspace_init",
+          "effects" : {
+            "isAsync" : false,
+            "isStatic" : false,
+            "isThrows" : false
+          },
+          "parameters" : [
+            {
+              "label" : "name",
+              "name" : "name",
+              "type" : {
+                "string" : {
+
+                }
+              }
+            }
+          ]
+        },
+        "methods" : [
+          {
+            "abiName" : "bjs_Workspace_describe",
+            "effects" : {
+              "isAsync" : false,
+              "isStatic" : false,
+              "isThrows" : false
+            },
+            "name" : "describe",
+            "parameters" : [
+
+            ],
+            "returnType" : {
+              "string" : {
+
+              }
+            }
+          }
+        ],
+        "name" : "Workspace",
+        "properties" : [
+
+        ],
+        "swiftCallName" : "Workspace"
+      }
+    ],
+    "enums" : [
+      {
+        "cases" : [
+          {
+            "associatedValues" : [
+
+            ],
+            "name" : "personal"
+          },
+          {
+            "associatedValues" : [
+
+            ],
+            "name" : "shared"
+          }
+        ],
+        "emitStyle" : "const",
+        "name" : "Kind",
+        "namespace" : [
+          "Workspace"
+        ],
+        "rawType" : "String",
+        "staticMethods" : [
+
+        ],
+        "staticProperties" : [
+
+        ],
+        "swiftCallName" : "Workspace.Kind",
+        "tsFullPath" : "Workspace.Kind"
+      }
+    ],
+    "exposeToGlobal" : false,
+    "functions" : [
+
+    ],
+    "protocols" : [
+
+    ],
+    "structs" : [
+
+    ]
+  },
+  "moduleName" : "TestModule",
+  "usedExternalModules" : [
+
+  ]
+}
\ No newline at end of file
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/CrossFileNestedTypeExtension.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/CrossFileNestedTypeExtension.swift
new file mode 100644
index 000000000..7601f0f72
--- /dev/null
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/CrossFileNestedTypeExtension.swift
@@ -0,0 +1,74 @@
+extension Workspace.Kind: _BridgedSwiftEnumNoPayload, _BridgedSwiftRawValueEnum {
+}
+
+@_expose(wasm, "bjs_Workspace_init")
+@_cdecl("bjs_Workspace_init")
+public func _bjs_Workspace_init(_ nameBytes: Int32, _ nameLength: Int32) -> UnsafeMutableRawPointer {
+    #if arch(wasm32)
+    let ret = Workspace(name: String.bridgeJSLiftParameter(nameBytes, nameLength))
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_Workspace_describe")
+@_cdecl("bjs_Workspace_describe")
+public func _bjs_Workspace_describe(_ _self: UnsafeMutableRawPointer) -> Void {
+    #if arch(wasm32)
+    let ret = Workspace.bridgeJSLiftParameter(_self).describe()
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_Workspace_deinit")
+@_cdecl("bjs_Workspace_deinit")
+public func _bjs_Workspace_deinit(_ pointer: UnsafeMutableRawPointer) -> Void {
+    #if arch(wasm32)
+    Unmanaged<Workspace>.fromOpaque(pointer).release()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+extension Workspace: ConvertibleToJSValue, _BridgedSwiftHeapObject, _BridgedSwiftProtocolExportable {
+    var jsValue: JSValue {
+        return .object(JSObject(id: UInt32(bitPattern: _bjs_Workspace_wrap(Unmanaged.passRetained(self).toOpaque()))))
+    }
+    consuming func bridgeJSLowerAsProtocolReturn() -> Int32 {
+        _bjs_Workspace_wrap(Unmanaged.passRetained(self).toOpaque())
+    }
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "TestModule", name: "bjs_Workspace_wrap")
+fileprivate func _bjs_Workspace_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32
+#else
+fileprivate func _bjs_Workspace_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func _bjs_Workspace_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 {
+    return _bjs_Workspace_wrap_extern(pointer)
+}
+
+extension Workspace.Kind: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = Workspace.Kind.bridgeJSMakeTypeHandle()
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "bjs_TestModule_register_type_handles")
+fileprivate func _bjs_TestModule_register_type_handles_extern(_ base: UnsafePointer<Int32>?, _ count: Int32)
+
+@_expose(wasm, "bjs_TestModule_register_type_handles")
+public func _bjs_TestModule_register_type_handles() {
+    let typeIds: [Int32] = [
+        Workspace.Kind.bridgeJSTypeID,
+    ]
+    typeIds.withUnsafeBufferPointer { buffer in
+        _bjs_TestModule_register_type_handles_extern(buffer.baseAddress, Int32(buffer.count))
+    }
+}
+#endif
\ No newline at end of file
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/CrossFileTypeResolution.ReverseOrder.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/CrossFileTypeResolution.ReverseOrder.json
index edf8177c1..49d656dcd 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/CrossFileTypeResolution.ReverseOrder.json
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/CrossFileTypeResolution.ReverseOrder.json
@@ -1,5 +1,8 @@
 {
   "exported" : {
+    "aliases" : [
+
+    ],
     "classes" : [
       {
         "methods" : [
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/CrossFileTypeResolution.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/CrossFileTypeResolution.json
index 58bfadab7..377e875bd 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/CrossFileTypeResolution.json
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/CrossFileTypeResolution.json
@@ -1,5 +1,8 @@
 {
   "exported" : {
+    "aliases" : [
+
+    ],
     "classes" : [
       {
         "constructor" : {
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/DefaultParameters.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/DefaultParameters.json
index e7874c072..40e3672b7 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/DefaultParameters.json
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/DefaultParameters.json
@@ -1,5 +1,8 @@
 {
   "exported" : {
+    "aliases" : [
+
+    ],
     "classes" : [
       {
         "constructor" : {
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/DefaultParameters.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/DefaultParameters.swift
index 507827646..e2e74e532 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/DefaultParameters.swift
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/DefaultParameters.swift
@@ -636,4 +636,33 @@ fileprivate func _bjs_ConstructorDefaults_wrap_extern(_ pointer: UnsafeMutableRa
 #endif
 @inline(never) fileprivate func _bjs_ConstructorDefaults_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 {
     return _bjs_ConstructorDefaults_wrap_extern(pointer)
-}
\ No newline at end of file
+}
+
+extension Config: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = Config.bridgeJSMakeTypeHandle()
+}
+
+extension MathOperations: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = MathOperations.bridgeJSMakeTypeHandle()
+}
+
+extension Status: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = Status.bridgeJSMakeTypeHandle()
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "bjs_TestModule_register_type_handles")
+fileprivate func _bjs_TestModule_register_type_handles_extern(_ base: UnsafePointer<Int32>?, _ count: Int32)
+
+@_expose(wasm, "bjs_TestModule_register_type_handles")
+public func _bjs_TestModule_register_type_handles() {
+    let typeIds: [Int32] = [
+        Config.bridgeJSTypeID,
+        MathOperations.bridgeJSTypeID,
+        Status.bridgeJSTypeID,
+    ]
+    typeIds.withUnsafeBufferPointer { buffer in
+        _bjs_TestModule_register_type_handles_extern(buffer.baseAddress, Int32(buffer.count))
+    }
+}
+#endif
\ No newline at end of file
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/DictionaryTypes.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/DictionaryTypes.json
index b1185c644..6830240eb 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/DictionaryTypes.json
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/DictionaryTypes.json
@@ -1,5 +1,8 @@
 {
   "exported" : {
+    "aliases" : [
+
+    ],
     "classes" : [
       {
         "methods" : [
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/DictionaryTypes.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/DictionaryTypes.swift
index 26a4c087e..2990eeabe 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/DictionaryTypes.swift
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/DictionaryTypes.swift
@@ -149,6 +149,10 @@ fileprivate func _bjs_Box_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int
     return _bjs_Box_wrap_extern(pointer)
 }
 
+extension Counters: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = Counters.bridgeJSMakeTypeHandle()
+}
+
 #if arch(wasm32)
 @_extern(wasm, module: "TestModule", name: "bjs_importMirrorDictionary")
 fileprivate func bjs_importMirrorDictionary_extern() -> Void
@@ -168,4 +172,19 @@ func _$importMirrorDictionary(_ values: [String: Double]) throws(JSException) ->
         throw error
     }
     return [String: Double].bridgeJSLiftReturn()
-}
\ No newline at end of file
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "bjs_TestModule_register_type_handles")
+fileprivate func _bjs_TestModule_register_type_handles_extern(_ base: UnsafePointer<Int32>?, _ count: Int32)
+
+@_expose(wasm, "bjs_TestModule_register_type_handles")
+public func _bjs_TestModule_register_type_handles() {
+    let typeIds: [Int32] = [
+        Counters.bridgeJSTypeID,
+    ]
+    typeIds.withUnsafeBufferPointer { buffer in
+        _bjs_TestModule_register_type_handles_extern(buffer.baseAddress, Int32(buffer.count))
+    }
+}
+#endif
\ No newline at end of file
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/DocComments.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/DocComments.json
new file mode 100644
index 000000000..ce4a2190a
--- /dev/null
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/DocComments.json
@@ -0,0 +1,439 @@
+{
+  "exported" : {
+    "aliases" : [
+
+    ],
+    "classes" : [
+      {
+        "constructor" : {
+          "abiName" : "bjs_Greeter_init",
+          "documentation" : "Create a greeter.\n- Parameter name: The name to greet.",
+          "effects" : {
+            "isAsync" : false,
+            "isStatic" : false,
+            "isThrows" : false
+          },
+          "parameters" : [
+            {
+              "label" : "name",
+              "name" : "name",
+              "type" : {
+                "string" : {
+
+                }
+              }
+            }
+          ]
+        },
+        "documentation" : "A greeter that keeps the target name.",
+        "methods" : [
+          {
+            "abiName" : "bjs_Greeter_greet",
+            "documentation" : "Returns a greeting for the configured name.\n- Returns: The greeting message.",
+            "effects" : {
+              "isAsync" : false,
+              "isStatic" : false,
+              "isThrows" : false
+            },
+            "name" : "greet",
+            "parameters" : [
+
+            ],
+            "returnType" : {
+              "string" : {
+
+              }
+            }
+          }
+        ],
+        "name" : "Greeter",
+        "properties" : [
+          {
+            "documentation" : "The configured name.",
+            "isReadonly" : false,
+            "isStatic" : false,
+            "name" : "name",
+            "type" : {
+              "string" : {
+
+              }
+            }
+          }
+        ],
+        "swiftCallName" : "Greeter"
+      }
+    ],
+    "enums" : [
+      {
+        "cases" : [
+          {
+            "associatedValues" : [
+
+            ],
+            "name" : "red"
+          },
+          {
+            "associatedValues" : [
+
+            ],
+            "name" : "green"
+          },
+          {
+            "associatedValues" : [
+
+            ],
+            "name" : "blue"
+          }
+        ],
+        "documentation" : "A primary color channel.",
+        "emitStyle" : "const",
+        "name" : "Color",
+        "staticMethods" : [
+          {
+            "abiName" : "bjs_Color_static_canonical",
+            "documentation" : "Returns the canonical name for a channel label.\n- Parameter label: The raw label.\n- Returns: The canonical channel name.",
+            "effects" : {
+              "isAsync" : false,
+              "isStatic" : true,
+              "isThrows" : false
+            },
+            "name" : "canonical",
+            "parameters" : [
+              {
+                "label" : "label",
+                "name" : "label",
+                "type" : {
+                  "string" : {
+
+                  }
+                }
+              }
+            ],
+            "returnType" : {
+              "string" : {
+
+              }
+            },
+            "staticContext" : {
+              "enumName" : {
+                "_0" : "Color"
+              }
+            }
+          }
+        ],
+        "staticProperties" : [
+          {
+            "documentation" : "The default channel.",
+            "isReadonly" : true,
+            "isStatic" : true,
+            "name" : "fallback",
+            "staticContext" : {
+              "enumName" : {
+                "_0" : "Color"
+              }
+            },
+            "type" : {
+              "string" : {
+
+              }
+            }
+          }
+        ],
+        "swiftCallName" : "Color",
+        "tsFullPath" : "Color"
+      }
+    ],
+    "exposeToGlobal" : false,
+    "functions" : [
+      {
+        "abiName" : "bjs_greet",
+        "documentation" : "Returns a greeting for a user.\n- Parameters:\n  - name: The user's name.\n  - greeting: The greeting word to use.\n- Returns: The composed greeting message.",
+        "effects" : {
+          "isAsync" : false,
+          "isStatic" : false,
+          "isThrows" : false
+        },
+        "name" : "greet",
+        "parameters" : [
+          {
+            "label" : "name",
+            "name" : "name",
+            "type" : {
+              "string" : {
+
+              }
+            }
+          },
+          {
+            "defaultValue" : {
+              "string" : {
+                "_0" : "Hello"
+              }
+            },
+            "label" : "greeting",
+            "name" : "greeting",
+            "type" : {
+              "string" : {
+
+              }
+            }
+          }
+        ],
+        "returnType" : {
+          "string" : {
+
+          }
+        }
+      },
+      {
+        "abiName" : "bjs_add",
+        "documentation" : "Adds two numbers together.\n- Parameter a: The first addend.\n- Parameter b: The second addend.\n- Returns: The sum of the inputs.",
+        "effects" : {
+          "isAsync" : false,
+          "isStatic" : false,
+          "isThrows" : false
+        },
+        "name" : "add",
+        "parameters" : [
+          {
+            "label" : "a",
+            "name" : "a",
+            "type" : {
+              "integer" : {
+                "_0" : {
+                  "isSigned" : true,
+                  "width" : "word"
+                }
+              }
+            }
+          },
+          {
+            "label" : "b",
+            "name" : "b",
+            "type" : {
+              "integer" : {
+                "_0" : {
+                  "isSigned" : true,
+                  "width" : "word"
+                }
+              }
+            }
+          }
+        ],
+        "returnType" : {
+          "integer" : {
+            "_0" : {
+              "isSigned" : true,
+              "width" : "word"
+            }
+          }
+        }
+      },
+      {
+        "abiName" : "bjs_trimmed",
+        "documentation" : "Has blank doc lines around the summary; boundaries should be trimmed.",
+        "effects" : {
+          "isAsync" : false,
+          "isStatic" : false,
+          "isThrows" : false
+        },
+        "name" : "trimmed",
+        "parameters" : [
+
+        ],
+        "returnType" : {
+          "void" : {
+
+          }
+        }
+      },
+      {
+        "abiName" : "bjs_hello",
+        "documentation" : "Says hello to the world.\n\nDemonstrates that block doc comments are supported too.",
+        "effects" : {
+          "isAsync" : false,
+          "isStatic" : false,
+          "isThrows" : false
+        },
+        "name" : "hello",
+        "parameters" : [
+
+        ],
+        "returnType" : {
+          "void" : {
+
+          }
+        }
+      },
+      {
+        "abiName" : "bjs_parseInt",
+        "documentation" : "Parses an integer from text.\n- Parameter text: The text to parse.\n- Returns: The parsed integer.\n- Throws: A `JSException` when the text is not a valid integer.",
+        "effects" : {
+          "isAsync" : false,
+          "isStatic" : false,
+          "isThrows" : true
+        },
+        "name" : "parseInt",
+        "parameters" : [
+          {
+            "label" : "text",
+            "name" : "text",
+            "type" : {
+              "string" : {
+
+              }
+            }
+          }
+        ],
+        "returnType" : {
+          "integer" : {
+            "_0" : {
+              "isSigned" : true,
+              "width" : "word"
+            }
+          }
+        }
+      },
+      {
+        "abiName" : "bjs_MathUtils_double",
+        "documentation" : "Doubles a value, in a namespace.\n- Parameter value: The value to double.\n- Returns: Twice the input.",
+        "effects" : {
+          "isAsync" : false,
+          "isStatic" : false,
+          "isThrows" : false
+        },
+        "name" : "double",
+        "namespace" : [
+          "MathUtils"
+        ],
+        "parameters" : [
+          {
+            "label" : "value",
+            "name" : "value",
+            "type" : {
+              "integer" : {
+                "_0" : {
+                  "isSigned" : true,
+                  "width" : "word"
+                }
+              }
+            }
+          }
+        ],
+        "returnType" : {
+          "integer" : {
+            "_0" : {
+              "isSigned" : true,
+              "width" : "word"
+            }
+          }
+        }
+      },
+      {
+        "abiName" : "bjs_terminator",
+        "documentation" : "Returns the JSDoc terminator *\/ embedded mid-sentence.",
+        "effects" : {
+          "isAsync" : false,
+          "isStatic" : false,
+          "isThrows" : false
+        },
+        "name" : "terminator",
+        "parameters" : [
+
+        ],
+        "returnType" : {
+          "string" : {
+
+          }
+        }
+      }
+    ],
+    "protocols" : [
+      {
+        "documentation" : "Receives lifecycle callbacks.",
+        "methods" : [
+          {
+            "abiName" : "bjs_Listener_onEvent",
+            "documentation" : "Called when an event fires.\n- Parameter id: The event identifier.",
+            "effects" : {
+              "isAsync" : false,
+              "isStatic" : false,
+              "isThrows" : false
+            },
+            "name" : "onEvent",
+            "parameters" : [
+              {
+                "label" : "id",
+                "name" : "id",
+                "type" : {
+                  "integer" : {
+                    "_0" : {
+                      "isSigned" : true,
+                      "width" : "word"
+                    }
+                  }
+                }
+              }
+            ],
+            "returnType" : {
+              "void" : {
+
+              }
+            }
+          }
+        ],
+        "name" : "Listener",
+        "properties" : [
+          {
+            "documentation" : "The listener's display name.",
+            "isReadonly" : true,
+            "name" : "name",
+            "type" : {
+              "string" : {
+
+              }
+            }
+          }
+        ]
+      }
+    ],
+    "structs" : [
+      {
+        "documentation" : "A 2D point in space.",
+        "methods" : [
+
+        ],
+        "name" : "Point",
+        "properties" : [
+          {
+            "documentation" : "The horizontal position.",
+            "isReadonly" : true,
+            "isStatic" : false,
+            "name" : "x",
+            "type" : {
+              "double" : {
+
+              }
+            }
+          },
+          {
+            "documentation" : "The vertical position.",
+            "isReadonly" : true,
+            "isStatic" : false,
+            "name" : "y",
+            "type" : {
+              "double" : {
+
+              }
+            }
+          }
+        ],
+        "swiftCallName" : "Point"
+      }
+    ]
+  },
+  "moduleName" : "TestModule",
+  "usedExternalModules" : [
+
+  ]
+}
\ No newline at end of file
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/DocComments.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/DocComments.swift
new file mode 100644
index 000000000..fab694b18
--- /dev/null
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/DocComments.swift
@@ -0,0 +1,341 @@
+struct AnyListener: Listener, _BridgedSwiftProtocolWrapper {
+    let jsObject: JSObject
+
+    func onEvent(id: Int) -> Void {
+        let idValue = id.bridgeJSLowerParameter()
+        let jsObjectValue = jsObject.bridgeJSLowerParameter()
+        _extern_onEvent(jsObjectValue, idValue)
+    }
+
+    var name: String {
+        get {
+            let jsObjectValue = jsObject.bridgeJSLowerParameter()
+            let ret = bjs_Listener_name_get(jsObjectValue)
+            return String.bridgeJSLiftReturn(ret)
+        }
+    }
+
+    static func bridgeJSLiftParameter(_ value: Int32) -> Self {
+        return AnyListener(jsObject: JSObject(id: UInt32(bitPattern: value)))
+    }
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "TestModule", name: "bjs_Listener_onEvent")
+fileprivate func _extern_onEvent_extern(_ jsObject: Int32, _ id: Int32) -> Void
+#else
+fileprivate func _extern_onEvent_extern(_ jsObject: Int32, _ id: Int32) -> Void {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func _extern_onEvent(_ jsObject: Int32, _ id: Int32) -> Void {
+    return _extern_onEvent_extern(jsObject, id)
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "TestModule", name: "bjs_Listener_name_get")
+fileprivate func bjs_Listener_name_get_extern(_ jsObject: Int32) -> Int32
+#else
+fileprivate func bjs_Listener_name_get_extern(_ jsObject: Int32) -> Int32 {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func bjs_Listener_name_get(_ jsObject: Int32) -> Int32 {
+    return bjs_Listener_name_get_extern(jsObject)
+}
+
+extension Color: _BridgedSwiftCaseEnum {
+    @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameter() -> Int32 {
+        return bridgeJSRawValue
+    }
+    @_spi(BridgeJS) @_transparent public static func bridgeJSLiftReturn(_ value: Int32) -> Color {
+        return bridgeJSLiftParameter(value)
+    }
+    @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter(_ value: Int32) -> Color {
+        return Color(bridgeJSRawValue: value)!
+    }
+    @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() -> Int32 {
+        return bridgeJSLowerParameter()
+    }
+
+    @_spi(BridgeJS) @usableFromInline init?(bridgeJSRawValue: Int32) {
+        switch bridgeJSRawValue {
+        case 0:
+            self = .red
+        case 1:
+            self = .green
+        case 2:
+            self = .blue
+        default:
+            return nil
+        }
+    }
+
+    @_spi(BridgeJS) @usableFromInline var bridgeJSRawValue: Int32 {
+        switch self {
+        case .red:
+            return 0
+        case .green:
+            return 1
+        case .blue:
+            return 2
+        }
+    }
+}
+
+@_expose(wasm, "bjs_Color_static_canonical")
+@_cdecl("bjs_Color_static_canonical")
+public func _bjs_Color_static_canonical(_ labelBytes: Int32, _ labelLength: Int32) -> Void {
+    #if arch(wasm32)
+    let ret = Color.canonical(label: String.bridgeJSLiftParameter(labelBytes, labelLength))
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_Color_static_fallback_get")
+@_cdecl("bjs_Color_static_fallback_get")
+public func _bjs_Color_static_fallback_get() -> Void {
+    #if arch(wasm32)
+    let ret = Color.fallback
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+extension Point: _BridgedSwiftStruct {
+    @_spi(BridgeJS) @_transparent public static func bridgeJSStackPop() -> Point {
+        let y = Double.bridgeJSStackPop()
+        let x = Double.bridgeJSStackPop()
+        return Point(x: x, y: y)
+    }
+
+    @_spi(BridgeJS) @_transparent public consuming func bridgeJSStackPush() {
+        self.x.bridgeJSStackPush()
+        self.y.bridgeJSStackPush()
+    }
+
+    init(unsafelyCopying jsObject: JSObject) {
+        _bjs_struct_lower_Point(jsObject.bridgeJSLowerParameter())
+        self = Self.bridgeJSStackPop()
+    }
+
+    func toJSObject() -> JSObject {
+        let __bjs_self = self
+        __bjs_self.bridgeJSStackPush()
+        return JSObject(id: UInt32(bitPattern: _bjs_struct_lift_Point()))
+    }
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "swift_js_struct_lower_Point")
+fileprivate func _bjs_struct_lower_Point_extern(_ objectId: Int32) -> Void
+#else
+fileprivate func _bjs_struct_lower_Point_extern(_ objectId: Int32) -> Void {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func _bjs_struct_lower_Point(_ objectId: Int32) -> Void {
+    return _bjs_struct_lower_Point_extern(objectId)
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "swift_js_struct_lift_Point")
+fileprivate func _bjs_struct_lift_Point_extern() -> Int32
+#else
+fileprivate func _bjs_struct_lift_Point_extern() -> Int32 {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func _bjs_struct_lift_Point() -> Int32 {
+    return _bjs_struct_lift_Point_extern()
+}
+
+@_expose(wasm, "bjs_greet")
+@_cdecl("bjs_greet")
+public func _bjs_greet(_ nameBytes: Int32, _ nameLength: Int32, _ greetingBytes: Int32, _ greetingLength: Int32) -> Void {
+    #if arch(wasm32)
+    let ret = greet(name: String.bridgeJSLiftParameter(nameBytes, nameLength), greeting: String.bridgeJSLiftParameter(greetingBytes, greetingLength))
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_add")
+@_cdecl("bjs_add")
+public func _bjs_add(_ a: Int32, _ b: Int32) -> Int32 {
+    #if arch(wasm32)
+    let ret = add(a: Int.bridgeJSLiftParameter(a), b: Int.bridgeJSLiftParameter(b))
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_trimmed")
+@_cdecl("bjs_trimmed")
+public func _bjs_trimmed() -> Void {
+    #if arch(wasm32)
+    trimmed()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_hello")
+@_cdecl("bjs_hello")
+public func _bjs_hello() -> Void {
+    #if arch(wasm32)
+    hello()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_parseInt")
+@_cdecl("bjs_parseInt")
+public func _bjs_parseInt(_ textBytes: Int32, _ textLength: Int32) -> Int32 {
+    #if arch(wasm32)
+    do {
+        let ret = try parseInt(text: String.bridgeJSLiftParameter(textBytes, textLength))
+        return ret.bridgeJSLowerReturn()
+    } catch let error {
+        if let error = error.thrownValue.object {
+            withExtendedLifetime(error) {
+                _swift_js_throw(Int32(bitPattern: $0.id))
+            }
+        } else {
+            let jsError = JSError(message: error.description)
+            withExtendedLifetime(jsError.jsObject) {
+                _swift_js_throw(Int32(bitPattern: $0.id))
+            }
+        }
+        return 0
+    }
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_MathUtils_double")
+@_cdecl("bjs_MathUtils_double")
+public func _bjs_MathUtils_double(_ value: Int32) -> Int32 {
+    #if arch(wasm32)
+    let ret = double(value: Int.bridgeJSLiftParameter(value))
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_terminator")
+@_cdecl("bjs_terminator")
+public func _bjs_terminator() -> Void {
+    #if arch(wasm32)
+    let ret = terminator()
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_Greeter_init")
+@_cdecl("bjs_Greeter_init")
+public func _bjs_Greeter_init(_ nameBytes: Int32, _ nameLength: Int32) -> UnsafeMutableRawPointer {
+    #if arch(wasm32)
+    let ret = Greeter(name: String.bridgeJSLiftParameter(nameBytes, nameLength))
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_Greeter_greet")
+@_cdecl("bjs_Greeter_greet")
+public func _bjs_Greeter_greet(_ _self: UnsafeMutableRawPointer) -> Void {
+    #if arch(wasm32)
+    let ret = Greeter.bridgeJSLiftParameter(_self).greet()
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_Greeter_name_get")
+@_cdecl("bjs_Greeter_name_get")
+public func _bjs_Greeter_name_get(_ _self: UnsafeMutableRawPointer) -> Void {
+    #if arch(wasm32)
+    let ret = Greeter.bridgeJSLiftParameter(_self).name
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_Greeter_name_set")
+@_cdecl("bjs_Greeter_name_set")
+public func _bjs_Greeter_name_set(_ _self: UnsafeMutableRawPointer, _ valueBytes: Int32, _ valueLength: Int32) -> Void {
+    #if arch(wasm32)
+    Greeter.bridgeJSLiftParameter(_self).name = String.bridgeJSLiftParameter(valueBytes, valueLength)
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_Greeter_deinit")
+@_cdecl("bjs_Greeter_deinit")
+public func _bjs_Greeter_deinit(_ pointer: UnsafeMutableRawPointer) -> Void {
+    #if arch(wasm32)
+    Unmanaged<Greeter>.fromOpaque(pointer).release()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+extension Greeter: ConvertibleToJSValue, _BridgedSwiftHeapObject, _BridgedSwiftProtocolExportable {
+    var jsValue: JSValue {
+        return .object(JSObject(id: UInt32(bitPattern: _bjs_Greeter_wrap(Unmanaged.passRetained(self).toOpaque()))))
+    }
+    consuming func bridgeJSLowerAsProtocolReturn() -> Int32 {
+        _bjs_Greeter_wrap(Unmanaged.passRetained(self).toOpaque())
+    }
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "TestModule", name: "bjs_Greeter_wrap")
+fileprivate func _bjs_Greeter_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32
+#else
+fileprivate func _bjs_Greeter_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func _bjs_Greeter_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 {
+    return _bjs_Greeter_wrap_extern(pointer)
+}
+
+extension Point: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = Point.bridgeJSMakeTypeHandle()
+}
+
+extension Color: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = Color.bridgeJSMakeTypeHandle()
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "bjs_TestModule_register_type_handles")
+fileprivate func _bjs_TestModule_register_type_handles_extern(_ base: UnsafePointer<Int32>?, _ count: Int32)
+
+@_expose(wasm, "bjs_TestModule_register_type_handles")
+public func _bjs_TestModule_register_type_handles() {
+    let typeIds: [Int32] = [
+        Point.bridgeJSTypeID,
+        Color.bridgeJSTypeID,
+    ]
+    typeIds.withUnsafeBufferPointer { buffer in
+        _bjs_TestModule_register_type_handles_extern(buffer.baseAddress, Int32(buffer.count))
+    }
+}
+#endif
\ No newline at end of file
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumAlias.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumAlias.json
new file mode 100644
index 000000000..c876db410
--- /dev/null
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumAlias.json
@@ -0,0 +1,97 @@
+{
+  "exported" : {
+    "aliases" : [
+      {
+        "swiftCallName" : "Color",
+        "underlying" : {
+          "swiftHeapObject" : {
+            "_0" : "ColorBox"
+          }
+        }
+      }
+    ],
+    "classes" : [
+      {
+        "constructor" : {
+          "abiName" : "bjs_ColorBox_init",
+          "effects" : {
+            "isAsync" : false,
+            "isStatic" : false,
+            "isThrows" : false
+          },
+          "parameters" : [
+            {
+              "label" : "name",
+              "name" : "name",
+              "type" : {
+                "string" : {
+
+                }
+              }
+            }
+          ]
+        },
+        "isFinal" : true,
+        "methods" : [
+
+        ],
+        "name" : "ColorBox",
+        "properties" : [
+
+        ],
+        "swiftCallName" : "ColorBox"
+      }
+    ],
+    "enums" : [
+
+    ],
+    "exposeToGlobal" : false,
+    "functions" : [
+      {
+        "abiName" : "bjs_roundtripColor",
+        "effects" : {
+          "isAsync" : false,
+          "isStatic" : false,
+          "isThrows" : false
+        },
+        "name" : "roundtripColor",
+        "parameters" : [
+          {
+            "label" : "_",
+            "name" : "color",
+            "type" : {
+              "alias" : {
+                "name" : "Color",
+                "underlying" : {
+                  "swiftHeapObject" : {
+                    "_0" : "ColorBox"
+                  }
+                }
+              }
+            }
+          }
+        ],
+        "returnType" : {
+          "alias" : {
+            "name" : "Color",
+            "underlying" : {
+              "swiftHeapObject" : {
+                "_0" : "ColorBox"
+              }
+            }
+          }
+        }
+      }
+    ],
+    "protocols" : [
+
+    ],
+    "structs" : [
+
+    ]
+  },
+  "moduleName" : "TestModule",
+  "usedExternalModules" : [
+
+  ]
+}
\ No newline at end of file
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumAlias.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumAlias.swift
new file mode 100644
index 000000000..5689b143f
--- /dev/null
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumAlias.swift
@@ -0,0 +1,73 @@
+@_expose(wasm, "bjs_roundtripColor")
+@_cdecl("bjs_roundtripColor")
+public func _bjs_roundtripColor(_ color: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer {
+    #if arch(wasm32)
+    let ret = roundtripColor(_: Color.bridgeJSLiftParameter(color))
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_ColorBox_init")
+@_cdecl("bjs_ColorBox_init")
+public func _bjs_ColorBox_init(_ nameBytes: Int32, _ nameLength: Int32) -> UnsafeMutableRawPointer {
+    #if arch(wasm32)
+    let ret = ColorBox(name: String.bridgeJSLiftParameter(nameBytes, nameLength))
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_ColorBox_deinit")
+@_cdecl("bjs_ColorBox_deinit")
+public func _bjs_ColorBox_deinit(_ pointer: UnsafeMutableRawPointer) -> Void {
+    #if arch(wasm32)
+    Unmanaged<ColorBox>.fromOpaque(pointer).release()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+extension ColorBox: ConvertibleToJSValue, _BridgedSwiftHeapObject, _BridgedSwiftProtocolExportable {
+    var jsValue: JSValue {
+        return .object(JSObject(id: UInt32(bitPattern: _bjs_ColorBox_wrap(Unmanaged.passRetained(self).toOpaque()))))
+    }
+    consuming func bridgeJSLowerAsProtocolReturn() -> Int32 {
+        _bjs_ColorBox_wrap(Unmanaged.passRetained(self).toOpaque())
+    }
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "TestModule", name: "bjs_ColorBox_wrap")
+fileprivate func _bjs_ColorBox_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32
+#else
+fileprivate func _bjs_ColorBox_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func _bjs_ColorBox_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 {
+    return _bjs_ColorBox_wrap_extern(pointer)
+}
+
+extension ColorBox: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = ColorBox.bridgeJSMakeTypeHandle()
+}
+
+extension Color: _BridgedSwiftAlias, _BridgedSwiftStackType {}
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "bjs_TestModule_register_type_handles")
+fileprivate func _bjs_TestModule_register_type_handles_extern(_ base: UnsafePointer<Int32>?, _ count: Int32)
+
+@_expose(wasm, "bjs_TestModule_register_type_handles")
+public func _bjs_TestModule_register_type_handles() {
+    let typeIds: [Int32] = [
+        ColorBox.bridgeJSTypeID,
+    ]
+    typeIds.withUnsafeBufferPointer { buffer in
+        _bjs_TestModule_register_type_handles_extern(buffer.baseAddress, Int32(buffer.count))
+    }
+}
+#endif
\ No newline at end of file
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumAssociatedValue.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumAssociatedValue.json
index 873c5c49f..39b9d7211 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumAssociatedValue.json
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumAssociatedValue.json
@@ -1,5 +1,8 @@
 {
   "exported" : {
+    "aliases" : [
+
+    ],
     "classes" : [
       {
         "methods" : [
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumAssociatedValue.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumAssociatedValue.swift
index 6d5549699..4ca3236f8 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumAssociatedValue.swift
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumAssociatedValue.swift
@@ -631,4 +631,73 @@ fileprivate func _bjs_User_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> In
 #endif
 @inline(never) fileprivate func _bjs_User_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 {
     return _bjs_User_wrap_extern(pointer)
-}
\ No newline at end of file
+}
+
+extension Point: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = Point.bridgeJSMakeTypeHandle()
+}
+
+extension APIResult: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = APIResult.bridgeJSMakeTypeHandle()
+}
+
+extension ComplexResult: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = ComplexResult.bridgeJSMakeTypeHandle()
+}
+
+extension Utilities.Result: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = Utilities.Result.bridgeJSMakeTypeHandle()
+}
+
+extension NetworkingResult: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = NetworkingResult.bridgeJSMakeTypeHandle()
+}
+
+extension APIOptionalResult: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = APIOptionalResult.bridgeJSMakeTypeHandle()
+}
+
+extension Precision: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = Precision.bridgeJSMakeTypeHandle()
+}
+
+extension CardinalDirection: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = CardinalDirection.bridgeJSMakeTypeHandle()
+}
+
+extension TypedPayloadResult: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = TypedPayloadResult.bridgeJSMakeTypeHandle()
+}
+
+extension AllTypesResult: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = AllTypesResult.bridgeJSMakeTypeHandle()
+}
+
+extension OptionalAllTypesResult: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = OptionalAllTypesResult.bridgeJSMakeTypeHandle()
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "bjs_TestModule_register_type_handles")
+fileprivate func _bjs_TestModule_register_type_handles_extern(_ base: UnsafePointer<Int32>?, _ count: Int32)
+
+@_expose(wasm, "bjs_TestModule_register_type_handles")
+public func _bjs_TestModule_register_type_handles() {
+    let typeIds: [Int32] = [
+        Point.bridgeJSTypeID,
+        APIResult.bridgeJSTypeID,
+        ComplexResult.bridgeJSTypeID,
+        Utilities.Result.bridgeJSTypeID,
+        NetworkingResult.bridgeJSTypeID,
+        APIOptionalResult.bridgeJSTypeID,
+        Precision.bridgeJSTypeID,
+        CardinalDirection.bridgeJSTypeID,
+        TypedPayloadResult.bridgeJSTypeID,
+        AllTypesResult.bridgeJSTypeID,
+        OptionalAllTypesResult.bridgeJSTypeID,
+    ]
+    typeIds.withUnsafeBufferPointer { buffer in
+        _bjs_TestModule_register_type_handles_extern(buffer.baseAddress, Int32(buffer.count))
+    }
+}
+#endif
\ No newline at end of file
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumAssociatedValueImport.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumAssociatedValueImport.json
new file mode 100644
index 000000000..6ba934220
--- /dev/null
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumAssociatedValueImport.json
@@ -0,0 +1,197 @@
+{
+  "exported" : {
+    "aliases" : [
+
+    ],
+    "classes" : [
+
+    ],
+    "enums" : [
+      {
+        "cases" : [
+          {
+            "associatedValues" : [
+              {
+                "type" : {
+                  "string" : {
+
+                  }
+                }
+              }
+            ],
+            "name" : "start"
+          },
+          {
+            "associatedValues" : [
+              {
+                "type" : {
+                  "integer" : {
+                    "_0" : {
+                      "isSigned" : true,
+                      "width" : "word"
+                    }
+                  }
+                }
+              }
+            ],
+            "name" : "stop"
+          },
+          {
+            "associatedValues" : [
+
+            ],
+            "name" : "idle"
+          }
+        ],
+        "emitStyle" : "const",
+        "name" : "PayloadSignal",
+        "staticMethods" : [
+
+        ],
+        "staticProperties" : [
+
+        ],
+        "swiftCallName" : "PayloadSignal",
+        "tsFullPath" : "PayloadSignal"
+      }
+    ],
+    "exposeToGlobal" : false,
+    "functions" : [
+
+    ],
+    "protocols" : [
+
+    ],
+    "structs" : [
+
+    ]
+  },
+  "imported" : {
+    "children" : [
+      {
+        "functions" : [
+
+        ],
+        "types" : [
+          {
+            "accessLevel" : "internal",
+            "getters" : [
+
+            ],
+            "methods" : [
+              {
+                "accessLevel" : "internal",
+                "effects" : {
+                  "isAsync" : false,
+                  "isStatic" : false,
+                  "isThrows" : true
+                },
+                "name" : "send",
+                "parameters" : [
+                  {
+                    "name" : "signal",
+                    "type" : {
+                      "associatedValueEnum" : {
+                        "_0" : "PayloadSignal"
+                      }
+                    }
+                  }
+                ],
+                "returnType" : {
+                  "void" : {
+
+                  }
+                }
+              },
+              {
+                "accessLevel" : "internal",
+                "effects" : {
+                  "isAsync" : false,
+                  "isStatic" : false,
+                  "isThrows" : true
+                },
+                "name" : "current",
+                "parameters" : [
+
+                ],
+                "returnType" : {
+                  "associatedValueEnum" : {
+                    "_0" : "PayloadSignal"
+                  }
+                }
+              },
+              {
+                "accessLevel" : "internal",
+                "effects" : {
+                  "isAsync" : false,
+                  "isStatic" : false,
+                  "isThrows" : true
+                },
+                "name" : "roundTripOptional",
+                "parameters" : [
+                  {
+                    "name" : "signal",
+                    "type" : {
+                      "nullable" : {
+                        "_0" : {
+                          "associatedValueEnum" : {
+                            "_0" : "PayloadSignal"
+                          }
+                        },
+                        "_1" : "null"
+                      }
+                    }
+                  }
+                ],
+                "returnType" : {
+                  "nullable" : {
+                    "_0" : {
+                      "associatedValueEnum" : {
+                        "_0" : "PayloadSignal"
+                      }
+                    },
+                    "_1" : "null"
+                  }
+                }
+              }
+            ],
+            "name" : "PayloadSignalControls",
+            "setters" : [
+
+            ],
+            "staticMethods" : [
+              {
+                "accessLevel" : "internal",
+                "effects" : {
+                  "isAsync" : false,
+                  "isStatic" : false,
+                  "isThrows" : true
+                },
+                "name" : "roundTrip",
+                "parameters" : [
+                  {
+                    "name" : "signal",
+                    "type" : {
+                      "associatedValueEnum" : {
+                        "_0" : "PayloadSignal"
+                      }
+                    }
+                  }
+                ],
+                "returnType" : {
+                  "associatedValueEnum" : {
+                    "_0" : "PayloadSignal"
+                  }
+                }
+              }
+            ]
+          }
+        ]
+      }
+    ]
+  },
+  "moduleName" : "TestModule",
+  "usedExternalModules" : [
+
+  ]
+}
\ No newline at end of file
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumAssociatedValueImport.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumAssociatedValueImport.swift
new file mode 100644
index 000000000..2c275a7a3
--- /dev/null
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumAssociatedValueImport.swift
@@ -0,0 +1,131 @@
+extension PayloadSignal: _BridgedSwiftAssociatedValueEnum {
+    @_spi(BridgeJS) @_transparent public static func bridgeJSStackPopPayload(_ caseId: Int32) -> PayloadSignal {
+        switch caseId {
+        case 0:
+            return .start(String.bridgeJSStackPop())
+        case 1:
+            return .stop(Int.bridgeJSStackPop())
+        case 2:
+            return .idle
+        default:
+            fatalError("Unknown PayloadSignal case ID: \(caseId)")
+        }
+    }
+
+    @_spi(BridgeJS) @_transparent public consuming func bridgeJSStackPushPayload() -> Int32 {
+        switch self {
+        case .start(let param0):
+            param0.bridgeJSStackPush()
+            return Int32(0)
+        case .stop(let param0):
+            param0.bridgeJSStackPush()
+            return Int32(1)
+        case .idle:
+            return Int32(2)
+        }
+    }
+}
+
+extension PayloadSignal: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = PayloadSignal.bridgeJSMakeTypeHandle()
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "TestModule", name: "bjs_PayloadSignalControls_roundTrip_static")
+fileprivate func bjs_PayloadSignalControls_roundTrip_static_extern(_ signal: Int32) -> Int32
+#else
+fileprivate func bjs_PayloadSignalControls_roundTrip_static_extern(_ signal: Int32) -> Int32 {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func bjs_PayloadSignalControls_roundTrip_static(_ signal: Int32) -> Int32 {
+    return bjs_PayloadSignalControls_roundTrip_static_extern(signal)
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "TestModule", name: "bjs_PayloadSignalControls_send")
+fileprivate func bjs_PayloadSignalControls_send_extern(_ self: Int32, _ signal: Int32) -> Void
+#else
+fileprivate func bjs_PayloadSignalControls_send_extern(_ self: Int32, _ signal: Int32) -> Void {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func bjs_PayloadSignalControls_send(_ self: Int32, _ signal: Int32) -> Void {
+    return bjs_PayloadSignalControls_send_extern(self, signal)
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "TestModule", name: "bjs_PayloadSignalControls_current")
+fileprivate func bjs_PayloadSignalControls_current_extern(_ self: Int32) -> Int32
+#else
+fileprivate func bjs_PayloadSignalControls_current_extern(_ self: Int32) -> Int32 {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func bjs_PayloadSignalControls_current(_ self: Int32) -> Int32 {
+    return bjs_PayloadSignalControls_current_extern(self)
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "TestModule", name: "bjs_PayloadSignalControls_roundTripOptional")
+fileprivate func bjs_PayloadSignalControls_roundTripOptional_extern(_ self: Int32, _ signalIsSome: Int32, _ signalCaseId: Int32) -> Int32
+#else
+fileprivate func bjs_PayloadSignalControls_roundTripOptional_extern(_ self: Int32, _ signalIsSome: Int32, _ signalCaseId: Int32) -> Int32 {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func bjs_PayloadSignalControls_roundTripOptional(_ self: Int32, _ signalIsSome: Int32, _ signalCaseId: Int32) -> Int32 {
+    return bjs_PayloadSignalControls_roundTripOptional_extern(self, signalIsSome, signalCaseId)
+}
+
+func _$PayloadSignalControls_roundTrip(_ signal: PayloadSignal) throws(JSException) -> PayloadSignal {
+    let signalCaseId = signal.bridgeJSLowerParameter()
+    let ret = bjs_PayloadSignalControls_roundTrip_static(signalCaseId)
+    if let error = _swift_js_take_exception() {
+        throw error
+    }
+    return PayloadSignal.bridgeJSLiftReturn(ret)
+}
+
+func _$PayloadSignalControls_send(_ self: JSObject, _ signal: PayloadSignal) throws(JSException) -> Void {
+    let signalCaseId = signal.bridgeJSLowerParameter()
+    let selfValue = self.bridgeJSLowerParameter()
+    bjs_PayloadSignalControls_send(selfValue, signalCaseId)
+    if let error = _swift_js_take_exception() {
+        throw error
+    }
+}
+
+func _$PayloadSignalControls_current(_ self: JSObject) throws(JSException) -> PayloadSignal {
+    let selfValue = self.bridgeJSLowerParameter()
+    let ret = bjs_PayloadSignalControls_current(selfValue)
+    if let error = _swift_js_take_exception() {
+        throw error
+    }
+    return PayloadSignal.bridgeJSLiftReturn(ret)
+}
+
+func _$PayloadSignalControls_roundTripOptional(_ self: JSObject, _ signal: Optional<PayloadSignal>) throws(JSException) -> Optional<PayloadSignal> {
+    let (signalIsSome, signalCaseId) = signal.bridgeJSLowerParameter()
+    let selfValue = self.bridgeJSLowerParameter()
+    let ret = bjs_PayloadSignalControls_roundTripOptional(selfValue, signalIsSome, signalCaseId)
+    if let error = _swift_js_take_exception() {
+        throw error
+    }
+    return Optional<PayloadSignal>.bridgeJSLiftReturn(ret)
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "bjs_TestModule_register_type_handles")
+fileprivate func _bjs_TestModule_register_type_handles_extern(_ base: UnsafePointer<Int32>?, _ count: Int32)
+
+@_expose(wasm, "bjs_TestModule_register_type_handles")
+public func _bjs_TestModule_register_type_handles() {
+    let typeIds: [Int32] = [
+        PayloadSignal.bridgeJSTypeID,
+    ]
+    typeIds.withUnsafeBufferPointer { buffer in
+        _bjs_TestModule_register_type_handles_extern(buffer.baseAddress, Int32(buffer.count))
+    }
+}
+#endif
\ No newline at end of file
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumCase.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumCase.json
index c4095b502..8fbb08f28 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumCase.json
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumCase.json
@@ -1,5 +1,8 @@
 {
   "exported" : {
+    "aliases" : [
+
+    ],
     "classes" : [
 
     ],
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumCase.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumCase.swift
index 66692ee14..dab981312 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumCase.swift
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumCase.swift
@@ -227,4 +227,38 @@ public func _bjs_roundTripOptionalTSDirection(_ inputIsSome: Int32, _ inputValue
     #else
     fatalError("Only available on WebAssembly")
     #endif
-}
\ No newline at end of file
+}
+
+extension Direction: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = Direction.bridgeJSMakeTypeHandle()
+}
+
+extension Status: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = Status.bridgeJSMakeTypeHandle()
+}
+
+extension TSDirection: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = TSDirection.bridgeJSMakeTypeHandle()
+}
+
+extension PublicStatus: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = PublicStatus.bridgeJSMakeTypeHandle()
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "bjs_TestModule_register_type_handles")
+fileprivate func _bjs_TestModule_register_type_handles_extern(_ base: UnsafePointer<Int32>?, _ count: Int32)
+
+@_expose(wasm, "bjs_TestModule_register_type_handles")
+public func _bjs_TestModule_register_type_handles() {
+    let typeIds: [Int32] = [
+        Direction.bridgeJSTypeID,
+        Status.bridgeJSTypeID,
+        TSDirection.bridgeJSTypeID,
+        PublicStatus.bridgeJSTypeID,
+    ]
+    typeIds.withUnsafeBufferPointer { buffer in
+        _bjs_TestModule_register_type_handles_extern(buffer.baseAddress, Int32(buffer.count))
+    }
+}
+#endif
\ No newline at end of file
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumCaseImport.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumCaseImport.json
new file mode 100644
index 000000000..f0d534425
--- /dev/null
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumCaseImport.json
@@ -0,0 +1,142 @@
+{
+  "exported" : {
+    "aliases" : [
+
+    ],
+    "classes" : [
+
+    ],
+    "enums" : [
+      {
+        "cases" : [
+          {
+            "associatedValues" : [
+
+            ],
+            "name" : "start"
+          },
+          {
+            "associatedValues" : [
+
+            ],
+            "name" : "stop"
+          }
+        ],
+        "emitStyle" : "const",
+        "name" : "Signal",
+        "staticMethods" : [
+
+        ],
+        "staticProperties" : [
+
+        ],
+        "swiftCallName" : "Signal",
+        "tsFullPath" : "Signal"
+      }
+    ],
+    "exposeToGlobal" : false,
+    "functions" : [
+
+    ],
+    "protocols" : [
+
+    ],
+    "structs" : [
+
+    ]
+  },
+  "imported" : {
+    "children" : [
+      {
+        "functions" : [
+
+        ],
+        "types" : [
+          {
+            "accessLevel" : "internal",
+            "getters" : [
+
+            ],
+            "methods" : [
+              {
+                "accessLevel" : "internal",
+                "effects" : {
+                  "isAsync" : false,
+                  "isStatic" : false,
+                  "isThrows" : true
+                },
+                "name" : "send",
+                "parameters" : [
+                  {
+                    "name" : "signal",
+                    "type" : {
+                      "caseEnum" : {
+                        "_0" : "Signal"
+                      }
+                    }
+                  }
+                ],
+                "returnType" : {
+                  "void" : {
+
+                  }
+                }
+              },
+              {
+                "accessLevel" : "internal",
+                "effects" : {
+                  "isAsync" : false,
+                  "isStatic" : false,
+                  "isThrows" : true
+                },
+                "name" : "current",
+                "parameters" : [
+
+                ],
+                "returnType" : {
+                  "caseEnum" : {
+                    "_0" : "Signal"
+                  }
+                }
+              }
+            ],
+            "name" : "SignalControls",
+            "setters" : [
+
+            ],
+            "staticMethods" : [
+              {
+                "accessLevel" : "internal",
+                "effects" : {
+                  "isAsync" : false,
+                  "isStatic" : false,
+                  "isThrows" : true
+                },
+                "name" : "roundTrip",
+                "parameters" : [
+                  {
+                    "name" : "signal",
+                    "type" : {
+                      "caseEnum" : {
+                        "_0" : "Signal"
+                      }
+                    }
+                  }
+                ],
+                "returnType" : {
+                  "caseEnum" : {
+                    "_0" : "Signal"
+                  }
+                }
+              }
+            ]
+          }
+        ]
+      }
+    ]
+  },
+  "moduleName" : "TestModule",
+  "usedExternalModules" : [
+
+  ]
+}
\ No newline at end of file
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumCaseImport.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumCaseImport.swift
new file mode 100644
index 000000000..6ed293525
--- /dev/null
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumCaseImport.swift
@@ -0,0 +1,116 @@
+extension Signal: _BridgedSwiftCaseEnum {
+    @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameter() -> Int32 {
+        return bridgeJSRawValue
+    }
+    @_spi(BridgeJS) @_transparent public static func bridgeJSLiftReturn(_ value: Int32) -> Signal {
+        return bridgeJSLiftParameter(value)
+    }
+    @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter(_ value: Int32) -> Signal {
+        return Signal(bridgeJSRawValue: value)!
+    }
+    @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() -> Int32 {
+        return bridgeJSLowerParameter()
+    }
+
+    @_spi(BridgeJS) @usableFromInline init?(bridgeJSRawValue: Int32) {
+        switch bridgeJSRawValue {
+        case 0:
+            self = .start
+        case 1:
+            self = .stop
+        default:
+            return nil
+        }
+    }
+
+    @_spi(BridgeJS) @usableFromInline var bridgeJSRawValue: Int32 {
+        switch self {
+        case .start:
+            return 0
+        case .stop:
+            return 1
+        }
+    }
+}
+
+extension Signal: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = Signal.bridgeJSMakeTypeHandle()
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "TestModule", name: "bjs_SignalControls_roundTrip_static")
+fileprivate func bjs_SignalControls_roundTrip_static_extern(_ signal: Int32) -> Int32
+#else
+fileprivate func bjs_SignalControls_roundTrip_static_extern(_ signal: Int32) -> Int32 {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func bjs_SignalControls_roundTrip_static(_ signal: Int32) -> Int32 {
+    return bjs_SignalControls_roundTrip_static_extern(signal)
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "TestModule", name: "bjs_SignalControls_send")
+fileprivate func bjs_SignalControls_send_extern(_ self: Int32, _ signal: Int32) -> Void
+#else
+fileprivate func bjs_SignalControls_send_extern(_ self: Int32, _ signal: Int32) -> Void {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func bjs_SignalControls_send(_ self: Int32, _ signal: Int32) -> Void {
+    return bjs_SignalControls_send_extern(self, signal)
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "TestModule", name: "bjs_SignalControls_current")
+fileprivate func bjs_SignalControls_current_extern(_ self: Int32) -> Int32
+#else
+fileprivate func bjs_SignalControls_current_extern(_ self: Int32) -> Int32 {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func bjs_SignalControls_current(_ self: Int32) -> Int32 {
+    return bjs_SignalControls_current_extern(self)
+}
+
+func _$SignalControls_roundTrip(_ signal: Signal) throws(JSException) -> Signal {
+    let signalValue = signal.bridgeJSLowerParameter()
+    let ret = bjs_SignalControls_roundTrip_static(signalValue)
+    if let error = _swift_js_take_exception() {
+        throw error
+    }
+    return Signal.bridgeJSLiftReturn(ret)
+}
+
+func _$SignalControls_send(_ self: JSObject, _ signal: Signal) throws(JSException) -> Void {
+    let signalValue = signal.bridgeJSLowerParameter()
+    let selfValue = self.bridgeJSLowerParameter()
+    bjs_SignalControls_send(selfValue, signalValue)
+    if let error = _swift_js_take_exception() {
+        throw error
+    }
+}
+
+func _$SignalControls_current(_ self: JSObject) throws(JSException) -> Signal {
+    let selfValue = self.bridgeJSLowerParameter()
+    let ret = bjs_SignalControls_current(selfValue)
+    if let error = _swift_js_take_exception() {
+        throw error
+    }
+    return Signal.bridgeJSLiftReturn(ret)
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "bjs_TestModule_register_type_handles")
+fileprivate func _bjs_TestModule_register_type_handles_extern(_ base: UnsafePointer<Int32>?, _ count: Int32)
+
+@_expose(wasm, "bjs_TestModule_register_type_handles")
+public func _bjs_TestModule_register_type_handles() {
+    let typeIds: [Int32] = [
+        Signal.bridgeJSTypeID,
+    ]
+    typeIds.withUnsafeBufferPointer { buffer in
+        _bjs_TestModule_register_type_handles_extern(buffer.baseAddress, Int32(buffer.count))
+    }
+}
+#endif
\ No newline at end of file
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumNamespace.Global.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumNamespace.Global.json
index 103a67999..be74590c6 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumNamespace.Global.json
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumNamespace.Global.json
@@ -1,5 +1,8 @@
 {
   "exported" : {
+    "aliases" : [
+
+    ],
     "classes" : [
       {
         "constructor" : {
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumNamespace.Global.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumNamespace.Global.swift
index 5bde4ff93..9d6908bcc 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumNamespace.Global.swift
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumNamespace.Global.swift
@@ -117,7 +117,7 @@ public func _bjs_Services_Graph_GraphOperations_static_validate(_ graphId: Int32
                 _swift_js_throw(Int32(bitPattern: $0.id))
             }
         } else {
-            let jsError = JSError(message: String(describing: error))
+            let jsError = JSError(message: error.description)
             withExtendedLifetime(jsError.jsObject) {
                 _swift_js_throw(Int32(bitPattern: $0.id))
             }
@@ -358,4 +358,38 @@ fileprivate func _bjs_Formatting_Converter_wrap_extern(_ pointer: UnsafeMutableR
 #endif
 @inline(never) fileprivate func _bjs_Formatting_Converter_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 {
     return _bjs_Formatting_Converter_wrap_extern(pointer)
-}
\ No newline at end of file
+}
+
+extension Networking.API.Method: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = Networking.API.Method.bridgeJSMakeTypeHandle()
+}
+
+extension Configuration.LogLevel: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = Configuration.LogLevel.bridgeJSMakeTypeHandle()
+}
+
+extension Configuration.Port: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = Configuration.Port.bridgeJSMakeTypeHandle()
+}
+
+extension Internal.SupportedMethod: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = Internal.SupportedMethod.bridgeJSMakeTypeHandle()
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "bjs_TestModule_register_type_handles")
+fileprivate func _bjs_TestModule_register_type_handles_extern(_ base: UnsafePointer<Int32>?, _ count: Int32)
+
+@_expose(wasm, "bjs_TestModule_register_type_handles")
+public func _bjs_TestModule_register_type_handles() {
+    let typeIds: [Int32] = [
+        Networking.API.Method.bridgeJSTypeID,
+        Configuration.LogLevel.bridgeJSTypeID,
+        Configuration.Port.bridgeJSTypeID,
+        Internal.SupportedMethod.bridgeJSTypeID,
+    ]
+    typeIds.withUnsafeBufferPointer { buffer in
+        _bjs_TestModule_register_type_handles_extern(buffer.baseAddress, Int32(buffer.count))
+    }
+}
+#endif
\ No newline at end of file
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumNamespace.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumNamespace.json
index f9890d36b..175c4fa03 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumNamespace.json
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumNamespace.json
@@ -1,5 +1,8 @@
 {
   "exported" : {
+    "aliases" : [
+
+    ],
     "classes" : [
       {
         "constructor" : {
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumNamespace.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumNamespace.swift
index 5bde4ff93..9d6908bcc 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumNamespace.swift
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumNamespace.swift
@@ -117,7 +117,7 @@ public func _bjs_Services_Graph_GraphOperations_static_validate(_ graphId: Int32
                 _swift_js_throw(Int32(bitPattern: $0.id))
             }
         } else {
-            let jsError = JSError(message: String(describing: error))
+            let jsError = JSError(message: error.description)
             withExtendedLifetime(jsError.jsObject) {
                 _swift_js_throw(Int32(bitPattern: $0.id))
             }
@@ -358,4 +358,38 @@ fileprivate func _bjs_Formatting_Converter_wrap_extern(_ pointer: UnsafeMutableR
 #endif
 @inline(never) fileprivate func _bjs_Formatting_Converter_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 {
     return _bjs_Formatting_Converter_wrap_extern(pointer)
-}
\ No newline at end of file
+}
+
+extension Networking.API.Method: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = Networking.API.Method.bridgeJSMakeTypeHandle()
+}
+
+extension Configuration.LogLevel: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = Configuration.LogLevel.bridgeJSMakeTypeHandle()
+}
+
+extension Configuration.Port: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = Configuration.Port.bridgeJSMakeTypeHandle()
+}
+
+extension Internal.SupportedMethod: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = Internal.SupportedMethod.bridgeJSMakeTypeHandle()
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "bjs_TestModule_register_type_handles")
+fileprivate func _bjs_TestModule_register_type_handles_extern(_ base: UnsafePointer<Int32>?, _ count: Int32)
+
+@_expose(wasm, "bjs_TestModule_register_type_handles")
+public func _bjs_TestModule_register_type_handles() {
+    let typeIds: [Int32] = [
+        Networking.API.Method.bridgeJSTypeID,
+        Configuration.LogLevel.bridgeJSTypeID,
+        Configuration.Port.bridgeJSTypeID,
+        Internal.SupportedMethod.bridgeJSTypeID,
+    ]
+    typeIds.withUnsafeBufferPointer { buffer in
+        _bjs_TestModule_register_type_handles_extern(buffer.baseAddress, Int32(buffer.count))
+    }
+}
+#endif
\ No newline at end of file
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumRawType.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumRawType.json
index 1cf99cd39..2adb178a3 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumRawType.json
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumRawType.json
@@ -1,5 +1,8 @@
 {
   "exported" : {
+    "aliases" : [
+
+    ],
     "classes" : [
 
     ],
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumRawType.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumRawType.swift
index e70a6b0aa..2dbb21422 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumRawType.swift
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumRawType.swift
@@ -451,6 +451,54 @@ public func _bjs_validateSession(_ session: Int64) -> Void {
     #endif
 }
 
+extension Theme: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = Theme.bridgeJSMakeTypeHandle()
+}
+
+extension TSTheme: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = TSTheme.bridgeJSMakeTypeHandle()
+}
+
+extension FeatureFlag: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = FeatureFlag.bridgeJSMakeTypeHandle()
+}
+
+extension HttpStatus: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = HttpStatus.bridgeJSMakeTypeHandle()
+}
+
+extension TSHttpStatus: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = TSHttpStatus.bridgeJSMakeTypeHandle()
+}
+
+extension Priority: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = Priority.bridgeJSMakeTypeHandle()
+}
+
+extension FileSize: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = FileSize.bridgeJSMakeTypeHandle()
+}
+
+extension UserId: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = UserId.bridgeJSMakeTypeHandle()
+}
+
+extension TokenId: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = TokenId.bridgeJSMakeTypeHandle()
+}
+
+extension SessionId: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = SessionId.bridgeJSMakeTypeHandle()
+}
+
+extension Precision: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = Precision.bridgeJSMakeTypeHandle()
+}
+
+extension Ratio: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = Ratio.bridgeJSMakeTypeHandle()
+}
+
 #if arch(wasm32)
 @_extern(wasm, module: "TestModule", name: "bjs_takesFeatureFlag")
 fileprivate func bjs_takesFeatureFlag_extern(_ flagBytes: Int32, _ flagLength: Int32) -> Void
@@ -490,4 +538,30 @@ func _$returnsFeatureFlag() throws(JSException) -> FeatureFlag {
         throw error
     }
     return FeatureFlag.bridgeJSLiftReturn(ret)
-}
\ No newline at end of file
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "bjs_TestModule_register_type_handles")
+fileprivate func _bjs_TestModule_register_type_handles_extern(_ base: UnsafePointer<Int32>?, _ count: Int32)
+
+@_expose(wasm, "bjs_TestModule_register_type_handles")
+public func _bjs_TestModule_register_type_handles() {
+    let typeIds: [Int32] = [
+        Theme.bridgeJSTypeID,
+        TSTheme.bridgeJSTypeID,
+        FeatureFlag.bridgeJSTypeID,
+        HttpStatus.bridgeJSTypeID,
+        TSHttpStatus.bridgeJSTypeID,
+        Priority.bridgeJSTypeID,
+        FileSize.bridgeJSTypeID,
+        UserId.bridgeJSTypeID,
+        TokenId.bridgeJSTypeID,
+        SessionId.bridgeJSTypeID,
+        Precision.bridgeJSTypeID,
+        Ratio.bridgeJSTypeID,
+    ]
+    typeIds.withUnsafeBufferPointer { buffer in
+        _bjs_TestModule_register_type_handles_extern(buffer.baseAddress, Int32(buffer.count))
+    }
+}
+#endif
\ No newline at end of file
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ExtensionNestedTypes.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ExtensionNestedTypes.json
new file mode 100644
index 000000000..e6cf2b271
--- /dev/null
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ExtensionNestedTypes.json
@@ -0,0 +1,370 @@
+{
+  "exported" : {
+    "aliases" : [
+
+    ],
+    "classes" : [
+      {
+        "constructor" : {
+          "abiName" : "bjs_Library_init",
+          "effects" : {
+            "isAsync" : false,
+            "isStatic" : false,
+            "isThrows" : false
+          },
+          "parameters" : [
+            {
+              "label" : "name",
+              "name" : "name",
+              "type" : {
+                "string" : {
+
+                }
+              }
+            }
+          ]
+        },
+        "methods" : [
+          {
+            "abiName" : "bjs_Library_describe",
+            "effects" : {
+              "isAsync" : false,
+              "isStatic" : false,
+              "isThrows" : false
+            },
+            "name" : "describe",
+            "parameters" : [
+
+            ],
+            "returnType" : {
+              "string" : {
+
+              }
+            }
+          },
+          {
+            "abiName" : "bjs_Library_rename",
+            "effects" : {
+              "isAsync" : false,
+              "isStatic" : false,
+              "isThrows" : false
+            },
+            "name" : "rename",
+            "parameters" : [
+              {
+                "label" : "_",
+                "name" : "title",
+                "type" : {
+                  "string" : {
+
+                  }
+                }
+              }
+            ],
+            "returnType" : {
+              "string" : {
+
+              }
+            }
+          },
+          {
+            "abiName" : "bjs_Library_shelf",
+            "effects" : {
+              "isAsync" : false,
+              "isStatic" : false,
+              "isThrows" : false
+            },
+            "name" : "shelf",
+            "parameters" : [
+              {
+                "label" : "label",
+                "name" : "label",
+                "type" : {
+                  "string" : {
+
+                  }
+                }
+              }
+            ],
+            "returnType" : {
+              "swiftStruct" : {
+                "_0" : "Library.Shelf"
+              }
+            }
+          }
+        ],
+        "name" : "Library",
+        "properties" : [
+          {
+            "isReadonly" : false,
+            "isStatic" : false,
+            "name" : "name",
+            "type" : {
+              "string" : {
+
+              }
+            }
+          }
+        ],
+        "swiftCallName" : "Library"
+      }
+    ],
+    "enums" : [
+      {
+        "cases" : [
+          {
+            "associatedValues" : [
+              {
+                "type" : {
+                  "caseEnum" : {
+                    "_0" : "Message.Update"
+                  }
+                }
+              }
+            ],
+            "name" : "update"
+          },
+          {
+            "associatedValues" : [
+
+            ],
+            "name" : "delete"
+          }
+        ],
+        "emitStyle" : "const",
+        "name" : "Message",
+        "staticMethods" : [
+
+        ],
+        "staticProperties" : [
+
+        ],
+        "swiftCallName" : "Message",
+        "tsFullPath" : "Message"
+      },
+      {
+        "cases" : [
+          {
+            "associatedValues" : [
+
+            ],
+            "name" : "fiction"
+          },
+          {
+            "associatedValues" : [
+
+            ],
+            "name" : "reference"
+          }
+        ],
+        "emitStyle" : "const",
+        "name" : "Genre",
+        "namespace" : [
+          "Library"
+        ],
+        "rawType" : "String",
+        "staticMethods" : [
+
+        ],
+        "staticProperties" : [
+
+        ],
+        "swiftCallName" : "Library.Genre",
+        "tsFullPath" : "Library.Genre"
+      },
+      {
+        "cases" : [
+          {
+            "associatedValues" : [
+
+            ],
+            "name" : "flip"
+          },
+          {
+            "associatedValues" : [
+
+            ],
+            "name" : "rotate"
+          }
+        ],
+        "emitStyle" : "const",
+        "name" : "Update",
+        "staticMethods" : [
+
+        ],
+        "staticProperties" : [
+
+        ],
+        "swiftCallName" : "Message.Update",
+        "tsFullPath" : "Update"
+      }
+    ],
+    "exposeToGlobal" : false,
+    "functions" : [
+      {
+        "abiName" : "bjs_roundTripMessage",
+        "effects" : {
+          "isAsync" : false,
+          "isStatic" : false,
+          "isThrows" : false
+        },
+        "name" : "roundTripMessage",
+        "parameters" : [
+          {
+            "label" : "_",
+            "name" : "message",
+            "type" : {
+              "associatedValueEnum" : {
+                "_0" : "Message"
+              }
+            }
+          }
+        ],
+        "returnType" : {
+          "associatedValueEnum" : {
+            "_0" : "Message"
+          }
+        }
+      }
+    ],
+    "protocols" : [
+
+    ],
+    "structs" : [
+      {
+        "constructor" : {
+          "abiName" : "bjs_Library_Shelf_init",
+          "effects" : {
+            "isAsync" : false,
+            "isStatic" : false,
+            "isThrows" : false
+          },
+          "parameters" : [
+            {
+              "label" : "label",
+              "name" : "label",
+              "type" : {
+                "string" : {
+
+                }
+              }
+            }
+          ]
+        },
+        "methods" : [
+          {
+            "abiName" : "bjs_Library_Shelf_describeShelf",
+            "effects" : {
+              "isAsync" : false,
+              "isStatic" : false,
+              "isThrows" : false
+            },
+            "name" : "describeShelf",
+            "parameters" : [
+
+            ],
+            "returnType" : {
+              "string" : {
+
+              }
+            }
+          }
+        ],
+        "name" : "Shelf",
+        "namespace" : [
+          "Library"
+        ],
+        "properties" : [
+          {
+            "isReadonly" : true,
+            "isStatic" : false,
+            "name" : "label",
+            "namespace" : [
+              "Library"
+            ],
+            "type" : {
+              "string" : {
+
+              }
+            }
+          },
+          {
+            "isReadonly" : true,
+            "isStatic" : true,
+            "name" : "capacity",
+            "staticContext" : {
+              "structName" : {
+                "_0" : "Library_Shelf"
+              }
+            },
+            "type" : {
+              "integer" : {
+                "_0" : {
+                  "isSigned" : true,
+                  "width" : "word"
+                }
+              }
+            }
+          }
+        ],
+        "swiftCallName" : "Library.Shelf"
+      },
+      {
+        "constructor" : {
+          "abiName" : "bjs_Library_Shelf_Divider_init",
+          "effects" : {
+            "isAsync" : false,
+            "isStatic" : false,
+            "isThrows" : false
+          },
+          "parameters" : [
+            {
+              "label" : "slot",
+              "name" : "slot",
+              "type" : {
+                "integer" : {
+                  "_0" : {
+                    "isSigned" : true,
+                    "width" : "word"
+                  }
+                }
+              }
+            }
+          ]
+        },
+        "methods" : [
+
+        ],
+        "name" : "Divider",
+        "namespace" : [
+          "Library",
+          "Shelf"
+        ],
+        "properties" : [
+          {
+            "isReadonly" : true,
+            "isStatic" : false,
+            "name" : "slot",
+            "namespace" : [
+              "Library",
+              "Shelf"
+            ],
+            "type" : {
+              "integer" : {
+                "_0" : {
+                  "isSigned" : true,
+                  "width" : "word"
+                }
+              }
+            }
+          }
+        ],
+        "swiftCallName" : "Library.Shelf.Divider"
+      }
+    ]
+  },
+  "moduleName" : "TestModule",
+  "usedExternalModules" : [
+
+  ]
+}
\ No newline at end of file
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ExtensionNestedTypes.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ExtensionNestedTypes.swift
new file mode 100644
index 000000000..d7efa630c
--- /dev/null
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ExtensionNestedTypes.swift
@@ -0,0 +1,342 @@
+extension Message: _BridgedSwiftAssociatedValueEnum {
+    @_spi(BridgeJS) @_transparent public static func bridgeJSStackPopPayload(_ caseId: Int32) -> Message {
+        switch caseId {
+        case 0:
+            return .update(Message.Update.bridgeJSStackPop())
+        case 1:
+            return .delete
+        default:
+            fatalError("Unknown Message case ID: \(caseId)")
+        }
+    }
+
+    @_spi(BridgeJS) @_transparent public consuming func bridgeJSStackPushPayload() -> Int32 {
+        switch self {
+        case .update(let param0):
+            param0.bridgeJSStackPush()
+            return Int32(0)
+        case .delete:
+            return Int32(1)
+        }
+    }
+}
+
+extension Library.Genre: _BridgedSwiftEnumNoPayload, _BridgedSwiftRawValueEnum {
+}
+
+extension Message.Update: _BridgedSwiftCaseEnum {
+    @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameter() -> Int32 {
+        return bridgeJSRawValue
+    }
+    @_spi(BridgeJS) @_transparent public static func bridgeJSLiftReturn(_ value: Int32) -> Message.Update {
+        return bridgeJSLiftParameter(value)
+    }
+    @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter(_ value: Int32) -> Message.Update {
+        return Message.Update(bridgeJSRawValue: value)!
+    }
+    @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() -> Int32 {
+        return bridgeJSLowerParameter()
+    }
+
+    @_spi(BridgeJS) @usableFromInline init?(bridgeJSRawValue: Int32) {
+        switch bridgeJSRawValue {
+        case 0:
+            self = .flip
+        case 1:
+            self = .rotate
+        default:
+            return nil
+        }
+    }
+
+    @_spi(BridgeJS) @usableFromInline var bridgeJSRawValue: Int32 {
+        switch self {
+        case .flip:
+            return 0
+        case .rotate:
+            return 1
+        }
+    }
+}
+
+extension Library.Shelf: _BridgedSwiftStruct {
+    @_spi(BridgeJS) @_transparent public static func bridgeJSStackPop() -> Library.Shelf {
+        let label = String.bridgeJSStackPop()
+        return Library.Shelf(label: label)
+    }
+
+    @_spi(BridgeJS) @_transparent public consuming func bridgeJSStackPush() {
+        self.label.bridgeJSStackPush()
+    }
+
+    init(unsafelyCopying jsObject: JSObject) {
+        _bjs_struct_lower_Library_Shelf(jsObject.bridgeJSLowerParameter())
+        self = Self.bridgeJSStackPop()
+    }
+
+    func toJSObject() -> JSObject {
+        let __bjs_self = self
+        __bjs_self.bridgeJSStackPush()
+        return JSObject(id: UInt32(bitPattern: _bjs_struct_lift_Library_Shelf()))
+    }
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "swift_js_struct_lower_Library_Shelf")
+fileprivate func _bjs_struct_lower_Library_Shelf_extern(_ objectId: Int32) -> Void
+#else
+fileprivate func _bjs_struct_lower_Library_Shelf_extern(_ objectId: Int32) -> Void {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func _bjs_struct_lower_Library_Shelf(_ objectId: Int32) -> Void {
+    return _bjs_struct_lower_Library_Shelf_extern(objectId)
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "swift_js_struct_lift_Library_Shelf")
+fileprivate func _bjs_struct_lift_Library_Shelf_extern() -> Int32
+#else
+fileprivate func _bjs_struct_lift_Library_Shelf_extern() -> Int32 {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func _bjs_struct_lift_Library_Shelf() -> Int32 {
+    return _bjs_struct_lift_Library_Shelf_extern()
+}
+
+@_expose(wasm, "bjs_Library_Shelf_init")
+@_cdecl("bjs_Library_Shelf_init")
+public func _bjs_Library_Shelf_init(_ labelBytes: Int32, _ labelLength: Int32) -> Void {
+    #if arch(wasm32)
+    let ret = Library.Shelf(label: String.bridgeJSLiftParameter(labelBytes, labelLength))
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_Library_Shelf_static_capacity_get")
+@_cdecl("bjs_Library_Shelf_static_capacity_get")
+public func _bjs_Library_Shelf_static_capacity_get() -> Int32 {
+    #if arch(wasm32)
+    let ret = Library.Shelf.capacity
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_Library_Shelf_describeShelf")
+@_cdecl("bjs_Library_Shelf_describeShelf")
+public func _bjs_Library_Shelf_describeShelf() -> Void {
+    #if arch(wasm32)
+    let ret = Library.Shelf.bridgeJSLiftParameter().describeShelf()
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+extension Library.Shelf.Divider: _BridgedSwiftStruct {
+    @_spi(BridgeJS) @_transparent public static func bridgeJSStackPop() -> Library.Shelf.Divider {
+        let slot = Int.bridgeJSStackPop()
+        return Library.Shelf.Divider(slot: slot)
+    }
+
+    @_spi(BridgeJS) @_transparent public consuming func bridgeJSStackPush() {
+        self.slot.bridgeJSStackPush()
+    }
+
+    init(unsafelyCopying jsObject: JSObject) {
+        _bjs_struct_lower_Library_Shelf_Divider(jsObject.bridgeJSLowerParameter())
+        self = Self.bridgeJSStackPop()
+    }
+
+    func toJSObject() -> JSObject {
+        let __bjs_self = self
+        __bjs_self.bridgeJSStackPush()
+        return JSObject(id: UInt32(bitPattern: _bjs_struct_lift_Library_Shelf_Divider()))
+    }
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "swift_js_struct_lower_Library_Shelf_Divider")
+fileprivate func _bjs_struct_lower_Library_Shelf_Divider_extern(_ objectId: Int32) -> Void
+#else
+fileprivate func _bjs_struct_lower_Library_Shelf_Divider_extern(_ objectId: Int32) -> Void {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func _bjs_struct_lower_Library_Shelf_Divider(_ objectId: Int32) -> Void {
+    return _bjs_struct_lower_Library_Shelf_Divider_extern(objectId)
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "swift_js_struct_lift_Library_Shelf_Divider")
+fileprivate func _bjs_struct_lift_Library_Shelf_Divider_extern() -> Int32
+#else
+fileprivate func _bjs_struct_lift_Library_Shelf_Divider_extern() -> Int32 {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func _bjs_struct_lift_Library_Shelf_Divider() -> Int32 {
+    return _bjs_struct_lift_Library_Shelf_Divider_extern()
+}
+
+@_expose(wasm, "bjs_Library_Shelf_Divider_init")
+@_cdecl("bjs_Library_Shelf_Divider_init")
+public func _bjs_Library_Shelf_Divider_init(_ slot: Int32) -> Void {
+    #if arch(wasm32)
+    let ret = Library.Shelf.Divider(slot: Int.bridgeJSLiftParameter(slot))
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_roundTripMessage")
+@_cdecl("bjs_roundTripMessage")
+public func _bjs_roundTripMessage(_ message: Int32) -> Void {
+    #if arch(wasm32)
+    let ret = roundTripMessage(_: Message.bridgeJSLiftParameter(message))
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_Library_init")
+@_cdecl("bjs_Library_init")
+public func _bjs_Library_init(_ nameBytes: Int32, _ nameLength: Int32) -> UnsafeMutableRawPointer {
+    #if arch(wasm32)
+    let ret = Library(name: String.bridgeJSLiftParameter(nameBytes, nameLength))
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_Library_describe")
+@_cdecl("bjs_Library_describe")
+public func _bjs_Library_describe(_ _self: UnsafeMutableRawPointer) -> Void {
+    #if arch(wasm32)
+    let ret = Library.bridgeJSLiftParameter(_self).describe()
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_Library_rename")
+@_cdecl("bjs_Library_rename")
+public func _bjs_Library_rename(_ _self: UnsafeMutableRawPointer, _ titleBytes: Int32, _ titleLength: Int32) -> Void {
+    #if arch(wasm32)
+    let ret = Library.bridgeJSLiftParameter(_self).rename(_: String.bridgeJSLiftParameter(titleBytes, titleLength))
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_Library_shelf")
+@_cdecl("bjs_Library_shelf")
+public func _bjs_Library_shelf(_ _self: UnsafeMutableRawPointer, _ labelBytes: Int32, _ labelLength: Int32) -> Void {
+    #if arch(wasm32)
+    let ret = Library.bridgeJSLiftParameter(_self).shelf(label: String.bridgeJSLiftParameter(labelBytes, labelLength))
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_Library_name_get")
+@_cdecl("bjs_Library_name_get")
+public func _bjs_Library_name_get(_ _self: UnsafeMutableRawPointer) -> Void {
+    #if arch(wasm32)
+    let ret = Library.bridgeJSLiftParameter(_self).name
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_Library_name_set")
+@_cdecl("bjs_Library_name_set")
+public func _bjs_Library_name_set(_ _self: UnsafeMutableRawPointer, _ valueBytes: Int32, _ valueLength: Int32) -> Void {
+    #if arch(wasm32)
+    Library.bridgeJSLiftParameter(_self).name = String.bridgeJSLiftParameter(valueBytes, valueLength)
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_Library_deinit")
+@_cdecl("bjs_Library_deinit")
+public func _bjs_Library_deinit(_ pointer: UnsafeMutableRawPointer) -> Void {
+    #if arch(wasm32)
+    Unmanaged<Library>.fromOpaque(pointer).release()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+extension Library: ConvertibleToJSValue, _BridgedSwiftHeapObject, _BridgedSwiftProtocolExportable {
+    var jsValue: JSValue {
+        return .object(JSObject(id: UInt32(bitPattern: _bjs_Library_wrap(Unmanaged.passRetained(self).toOpaque()))))
+    }
+    consuming func bridgeJSLowerAsProtocolReturn() -> Int32 {
+        _bjs_Library_wrap(Unmanaged.passRetained(self).toOpaque())
+    }
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "TestModule", name: "bjs_Library_wrap")
+fileprivate func _bjs_Library_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32
+#else
+fileprivate func _bjs_Library_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func _bjs_Library_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 {
+    return _bjs_Library_wrap_extern(pointer)
+}
+
+extension Library.Shelf: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = Library.Shelf.bridgeJSMakeTypeHandle()
+}
+
+extension Library.Shelf.Divider: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = Library.Shelf.Divider.bridgeJSMakeTypeHandle()
+}
+
+extension Message: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = Message.bridgeJSMakeTypeHandle()
+}
+
+extension Library.Genre: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = Library.Genre.bridgeJSMakeTypeHandle()
+}
+
+extension Message.Update: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = Message.Update.bridgeJSMakeTypeHandle()
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "bjs_TestModule_register_type_handles")
+fileprivate func _bjs_TestModule_register_type_handles_extern(_ base: UnsafePointer<Int32>?, _ count: Int32)
+
+@_expose(wasm, "bjs_TestModule_register_type_handles")
+public func _bjs_TestModule_register_type_handles() {
+    let typeIds: [Int32] = [
+        Library.Shelf.bridgeJSTypeID,
+        Library.Shelf.Divider.bridgeJSTypeID,
+        Message.bridgeJSTypeID,
+        Library.Genre.bridgeJSTypeID,
+        Message.Update.bridgeJSTypeID,
+    ]
+    typeIds.withUnsafeBufferPointer { buffer in
+        _bjs_TestModule_register_type_handles_extern(buffer.baseAddress, Int32(buffer.count))
+    }
+}
+#endif
\ No newline at end of file
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ExtensionOrderIndependence.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ExtensionOrderIndependence.json
new file mode 100644
index 000000000..9096006ae
--- /dev/null
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ExtensionOrderIndependence.json
@@ -0,0 +1,106 @@
+{
+  "exported" : {
+    "aliases" : [
+
+    ],
+    "classes" : [
+      {
+        "constructor" : {
+          "abiName" : "bjs_Depot_init",
+          "effects" : {
+            "isAsync" : false,
+            "isStatic" : false,
+            "isThrows" : false
+          },
+          "parameters" : [
+
+          ]
+        },
+        "methods" : [
+
+        ],
+        "name" : "Depot",
+        "properties" : [
+
+        ],
+        "swiftCallName" : "Depot"
+      }
+    ],
+    "enums" : [
+
+    ],
+    "exposeToGlobal" : false,
+    "functions" : [
+
+    ],
+    "protocols" : [
+
+    ],
+    "structs" : [
+      {
+        "constructor" : {
+          "abiName" : "bjs_Depot_Crate_init",
+          "effects" : {
+            "isAsync" : false,
+            "isStatic" : false,
+            "isThrows" : false
+          },
+          "parameters" : [
+            {
+              "label" : "label",
+              "name" : "label",
+              "type" : {
+                "string" : {
+
+                }
+              }
+            }
+          ]
+        },
+        "methods" : [
+          {
+            "abiName" : "bjs_Depot_Crate_describeCrate",
+            "effects" : {
+              "isAsync" : false,
+              "isStatic" : false,
+              "isThrows" : false
+            },
+            "name" : "describeCrate",
+            "parameters" : [
+
+            ],
+            "returnType" : {
+              "string" : {
+
+              }
+            }
+          }
+        ],
+        "name" : "Crate",
+        "namespace" : [
+          "Depot"
+        ],
+        "properties" : [
+          {
+            "isReadonly" : true,
+            "isStatic" : false,
+            "name" : "label",
+            "namespace" : [
+              "Depot"
+            ],
+            "type" : {
+              "string" : {
+
+              }
+            }
+          }
+        ],
+        "swiftCallName" : "Depot.Crate"
+      }
+    ]
+  },
+  "moduleName" : "TestModule",
+  "usedExternalModules" : [
+
+  ]
+}
\ No newline at end of file
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ExtensionOrderIndependence.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ExtensionOrderIndependence.swift
new file mode 100644
index 000000000..cc8091bbe
--- /dev/null
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ExtensionOrderIndependence.swift
@@ -0,0 +1,128 @@
+extension Depot.Crate: _BridgedSwiftStruct {
+    @_spi(BridgeJS) @_transparent public static func bridgeJSStackPop() -> Depot.Crate {
+        let label = String.bridgeJSStackPop()
+        return Depot.Crate(label: label)
+    }
+
+    @_spi(BridgeJS) @_transparent public consuming func bridgeJSStackPush() {
+        self.label.bridgeJSStackPush()
+    }
+
+    init(unsafelyCopying jsObject: JSObject) {
+        _bjs_struct_lower_Depot_Crate(jsObject.bridgeJSLowerParameter())
+        self = Self.bridgeJSStackPop()
+    }
+
+    func toJSObject() -> JSObject {
+        let __bjs_self = self
+        __bjs_self.bridgeJSStackPush()
+        return JSObject(id: UInt32(bitPattern: _bjs_struct_lift_Depot_Crate()))
+    }
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "swift_js_struct_lower_Depot_Crate")
+fileprivate func _bjs_struct_lower_Depot_Crate_extern(_ objectId: Int32) -> Void
+#else
+fileprivate func _bjs_struct_lower_Depot_Crate_extern(_ objectId: Int32) -> Void {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func _bjs_struct_lower_Depot_Crate(_ objectId: Int32) -> Void {
+    return _bjs_struct_lower_Depot_Crate_extern(objectId)
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "swift_js_struct_lift_Depot_Crate")
+fileprivate func _bjs_struct_lift_Depot_Crate_extern() -> Int32
+#else
+fileprivate func _bjs_struct_lift_Depot_Crate_extern() -> Int32 {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func _bjs_struct_lift_Depot_Crate() -> Int32 {
+    return _bjs_struct_lift_Depot_Crate_extern()
+}
+
+@_expose(wasm, "bjs_Depot_Crate_init")
+@_cdecl("bjs_Depot_Crate_init")
+public func _bjs_Depot_Crate_init(_ labelBytes: Int32, _ labelLength: Int32) -> Void {
+    #if arch(wasm32)
+    let ret = Depot.Crate(label: String.bridgeJSLiftParameter(labelBytes, labelLength))
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_Depot_Crate_describeCrate")
+@_cdecl("bjs_Depot_Crate_describeCrate")
+public func _bjs_Depot_Crate_describeCrate() -> Void {
+    #if arch(wasm32)
+    let ret = Depot.Crate.bridgeJSLiftParameter().describeCrate()
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_Depot_init")
+@_cdecl("bjs_Depot_init")
+public func _bjs_Depot_init() -> UnsafeMutableRawPointer {
+    #if arch(wasm32)
+    let ret = Depot()
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_Depot_deinit")
+@_cdecl("bjs_Depot_deinit")
+public func _bjs_Depot_deinit(_ pointer: UnsafeMutableRawPointer) -> Void {
+    #if arch(wasm32)
+    Unmanaged<Depot>.fromOpaque(pointer).release()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+extension Depot: ConvertibleToJSValue, _BridgedSwiftHeapObject, _BridgedSwiftProtocolExportable {
+    var jsValue: JSValue {
+        return .object(JSObject(id: UInt32(bitPattern: _bjs_Depot_wrap(Unmanaged.passRetained(self).toOpaque()))))
+    }
+    consuming func bridgeJSLowerAsProtocolReturn() -> Int32 {
+        _bjs_Depot_wrap(Unmanaged.passRetained(self).toOpaque())
+    }
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "TestModule", name: "bjs_Depot_wrap")
+fileprivate func _bjs_Depot_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32
+#else
+fileprivate func _bjs_Depot_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func _bjs_Depot_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 {
+    return _bjs_Depot_wrap_extern(pointer)
+}
+
+extension Depot.Crate: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = Depot.Crate.bridgeJSMakeTypeHandle()
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "bjs_TestModule_register_type_handles")
+fileprivate func _bjs_TestModule_register_type_handles_extern(_ base: UnsafePointer<Int32>?, _ count: Int32)
+
+@_expose(wasm, "bjs_TestModule_register_type_handles")
+public func _bjs_TestModule_register_type_handles() {
+    let typeIds: [Int32] = [
+        Depot.Crate.bridgeJSTypeID,
+    ]
+    typeIds.withUnsafeBufferPointer { buffer in
+        _bjs_TestModule_register_type_handles_extern(buffer.baseAddress, Int32(buffer.count))
+    }
+}
+#endif
\ No newline at end of file
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ExtensionScopeParity.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ExtensionScopeParity.json
new file mode 100644
index 000000000..2e25e938e
--- /dev/null
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ExtensionScopeParity.json
@@ -0,0 +1,151 @@
+{
+  "exported" : {
+    "aliases" : [
+
+    ],
+    "classes" : [
+      {
+        "constructor" : {
+          "abiName" : "bjs_app_Toolbox_Mallet_init",
+          "effects" : {
+            "isAsync" : false,
+            "isStatic" : false,
+            "isThrows" : false
+          },
+          "parameters" : [
+
+          ]
+        },
+        "methods" : [
+
+        ],
+        "name" : "Mallet",
+        "namespace" : [
+          "app",
+          "Toolbox"
+        ],
+        "properties" : [
+
+        ],
+        "swiftCallName" : "Toolbox.Mallet"
+      },
+      {
+        "constructor" : {
+          "abiName" : "bjs_app_Toolbox_Hammer_init",
+          "effects" : {
+            "isAsync" : false,
+            "isStatic" : false,
+            "isThrows" : false
+          },
+          "parameters" : [
+
+          ]
+        },
+        "methods" : [
+
+        ],
+        "name" : "Hammer",
+        "namespace" : [
+          "app",
+          "Toolbox"
+        ],
+        "properties" : [
+
+        ],
+        "swiftCallName" : "Toolbox.Hammer"
+      }
+    ],
+    "enums" : [
+      {
+        "cases" : [
+
+        ],
+        "emitStyle" : "const",
+        "name" : "Toolbox",
+        "namespace" : [
+          "app"
+        ],
+        "staticMethods" : [
+
+        ],
+        "staticProperties" : [
+
+        ],
+        "swiftCallName" : "Toolbox",
+        "tsFullPath" : "app.Toolbox"
+      },
+      {
+        "cases" : [
+          {
+            "associatedValues" : [
+
+            ],
+            "name" : "ready"
+          }
+        ],
+        "emitStyle" : "const",
+        "name" : "Signal",
+        "rawType" : "String",
+        "staticMethods" : [
+
+        ],
+        "staticProperties" : [
+
+        ],
+        "swiftCallName" : "Signal",
+        "tsFullPath" : "Signal"
+      }
+    ],
+    "exposeToGlobal" : false,
+    "functions" : [
+
+    ],
+    "protocols" : [
+
+    ],
+    "structs" : [
+      {
+        "constructor" : {
+          "abiName" : "bjs_Meta_init",
+          "effects" : {
+            "isAsync" : false,
+            "isStatic" : false,
+            "isThrows" : false
+          },
+          "parameters" : [
+            {
+              "label" : "note",
+              "name" : "note",
+              "type" : {
+                "string" : {
+
+                }
+              }
+            }
+          ]
+        },
+        "methods" : [
+
+        ],
+        "name" : "Meta",
+        "properties" : [
+          {
+            "isReadonly" : true,
+            "isStatic" : false,
+            "name" : "note",
+            "type" : {
+              "string" : {
+
+              }
+            }
+          }
+        ],
+        "swiftCallName" : "Signal.Meta"
+      }
+    ]
+  },
+  "moduleName" : "TestModule",
+  "usedExternalModules" : [
+
+  ]
+}
\ No newline at end of file
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ExtensionScopeParity.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ExtensionScopeParity.swift
new file mode 100644
index 000000000..7fe6db4d2
--- /dev/null
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ExtensionScopeParity.swift
@@ -0,0 +1,167 @@
+extension Signal: _BridgedSwiftEnumNoPayload, _BridgedSwiftRawValueEnum {
+}
+
+extension Signal.Meta: _BridgedSwiftStruct {
+    @_spi(BridgeJS) @_transparent public static func bridgeJSStackPop() -> Signal.Meta {
+        let note = String.bridgeJSStackPop()
+        return Signal.Meta(note: note)
+    }
+
+    @_spi(BridgeJS) @_transparent public consuming func bridgeJSStackPush() {
+        self.note.bridgeJSStackPush()
+    }
+
+    init(unsafelyCopying jsObject: JSObject) {
+        _bjs_struct_lower_Meta(jsObject.bridgeJSLowerParameter())
+        self = Self.bridgeJSStackPop()
+    }
+
+    func toJSObject() -> JSObject {
+        let __bjs_self = self
+        __bjs_self.bridgeJSStackPush()
+        return JSObject(id: UInt32(bitPattern: _bjs_struct_lift_Meta()))
+    }
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "swift_js_struct_lower_Meta")
+fileprivate func _bjs_struct_lower_Meta_extern(_ objectId: Int32) -> Void
+#else
+fileprivate func _bjs_struct_lower_Meta_extern(_ objectId: Int32) -> Void {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func _bjs_struct_lower_Meta(_ objectId: Int32) -> Void {
+    return _bjs_struct_lower_Meta_extern(objectId)
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "swift_js_struct_lift_Meta")
+fileprivate func _bjs_struct_lift_Meta_extern() -> Int32
+#else
+fileprivate func _bjs_struct_lift_Meta_extern() -> Int32 {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func _bjs_struct_lift_Meta() -> Int32 {
+    return _bjs_struct_lift_Meta_extern()
+}
+
+@_expose(wasm, "bjs_Meta_init")
+@_cdecl("bjs_Meta_init")
+public func _bjs_Meta_init(_ noteBytes: Int32, _ noteLength: Int32) -> Void {
+    #if arch(wasm32)
+    let ret = Signal.Meta(note: String.bridgeJSLiftParameter(noteBytes, noteLength))
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_app_Toolbox_Mallet_init")
+@_cdecl("bjs_app_Toolbox_Mallet_init")
+public func _bjs_app_Toolbox_Mallet_init() -> UnsafeMutableRawPointer {
+    #if arch(wasm32)
+    let ret = Toolbox.Mallet()
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_app_Toolbox_Mallet_deinit")
+@_cdecl("bjs_app_Toolbox_Mallet_deinit")
+public func _bjs_app_Toolbox_Mallet_deinit(_ pointer: UnsafeMutableRawPointer) -> Void {
+    #if arch(wasm32)
+    Unmanaged<Toolbox.Mallet>.fromOpaque(pointer).release()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+extension Toolbox.Mallet: ConvertibleToJSValue, _BridgedSwiftHeapObject, _BridgedSwiftProtocolExportable {
+    var jsValue: JSValue {
+        return .object(JSObject(id: UInt32(bitPattern: _bjs_app_Toolbox_Mallet_wrap(Unmanaged.passRetained(self).toOpaque()))))
+    }
+    consuming func bridgeJSLowerAsProtocolReturn() -> Int32 {
+        _bjs_app_Toolbox_Mallet_wrap(Unmanaged.passRetained(self).toOpaque())
+    }
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "TestModule", name: "bjs_app_Toolbox_Mallet_wrap")
+fileprivate func _bjs_app_Toolbox_Mallet_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32
+#else
+fileprivate func _bjs_app_Toolbox_Mallet_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func _bjs_app_Toolbox_Mallet_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 {
+    return _bjs_app_Toolbox_Mallet_wrap_extern(pointer)
+}
+
+@_expose(wasm, "bjs_app_Toolbox_Hammer_init")
+@_cdecl("bjs_app_Toolbox_Hammer_init")
+public func _bjs_app_Toolbox_Hammer_init() -> UnsafeMutableRawPointer {
+    #if arch(wasm32)
+    let ret = Toolbox.Hammer()
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_app_Toolbox_Hammer_deinit")
+@_cdecl("bjs_app_Toolbox_Hammer_deinit")
+public func _bjs_app_Toolbox_Hammer_deinit(_ pointer: UnsafeMutableRawPointer) -> Void {
+    #if arch(wasm32)
+    Unmanaged<Toolbox.Hammer>.fromOpaque(pointer).release()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+extension Toolbox.Hammer: ConvertibleToJSValue, _BridgedSwiftHeapObject, _BridgedSwiftProtocolExportable {
+    var jsValue: JSValue {
+        return .object(JSObject(id: UInt32(bitPattern: _bjs_app_Toolbox_Hammer_wrap(Unmanaged.passRetained(self).toOpaque()))))
+    }
+    consuming func bridgeJSLowerAsProtocolReturn() -> Int32 {
+        _bjs_app_Toolbox_Hammer_wrap(Unmanaged.passRetained(self).toOpaque())
+    }
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "TestModule", name: "bjs_app_Toolbox_Hammer_wrap")
+fileprivate func _bjs_app_Toolbox_Hammer_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32
+#else
+fileprivate func _bjs_app_Toolbox_Hammer_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func _bjs_app_Toolbox_Hammer_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 {
+    return _bjs_app_Toolbox_Hammer_wrap_extern(pointer)
+}
+
+extension Signal.Meta: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = Signal.Meta.bridgeJSMakeTypeHandle()
+}
+
+extension Signal: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = Signal.bridgeJSMakeTypeHandle()
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "bjs_TestModule_register_type_handles")
+fileprivate func _bjs_TestModule_register_type_handles_extern(_ base: UnsafePointer<Int32>?, _ count: Int32)
+
+@_expose(wasm, "bjs_TestModule_register_type_handles")
+public func _bjs_TestModule_register_type_handles() {
+    let typeIds: [Int32] = [
+        Signal.Meta.bridgeJSTypeID,
+        Signal.bridgeJSTypeID,
+    ]
+    typeIds.withUnsafeBufferPointer { buffer in
+        _bjs_TestModule_register_type_handles_extern(buffer.baseAddress, Int32(buffer.count))
+    }
+}
+#endif
\ No newline at end of file
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/FixedWidthIntegers.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/FixedWidthIntegers.json
index 1186ad27d..0844c7475 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/FixedWidthIntegers.json
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/FixedWidthIntegers.json
@@ -1,5 +1,8 @@
 {
   "exported" : {
+    "aliases" : [
+
+    ],
     "classes" : [
 
     ],
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/GenericImports.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/GenericImports.json
new file mode 100644
index 000000000..c7f3e98ae
--- /dev/null
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/GenericImports.json
@@ -0,0 +1,669 @@
+{
+  "exported" : {
+    "aliases" : [
+
+    ],
+    "classes" : [
+      {
+        "constructor" : {
+          "abiName" : "bjs_GenericImportBox_init",
+          "effects" : {
+            "isAsync" : false,
+            "isStatic" : false,
+            "isThrows" : false
+          },
+          "parameters" : [
+            {
+              "label" : "value",
+              "name" : "value",
+              "type" : {
+                "integer" : {
+                  "_0" : {
+                    "isSigned" : true,
+                    "width" : "word"
+                  }
+                }
+              }
+            }
+          ]
+        },
+        "isFinal" : true,
+        "methods" : [
+          {
+            "abiName" : "bjs_GenericImportBox_get",
+            "effects" : {
+              "isAsync" : false,
+              "isStatic" : false,
+              "isThrows" : false
+            },
+            "name" : "get",
+            "parameters" : [
+
+            ],
+            "returnType" : {
+              "integer" : {
+                "_0" : {
+                  "isSigned" : true,
+                  "width" : "word"
+                }
+              }
+            }
+          }
+        ],
+        "name" : "GenericImportBox",
+        "properties" : [
+          {
+            "isReadonly" : false,
+            "isStatic" : false,
+            "name" : "value",
+            "type" : {
+              "integer" : {
+                "_0" : {
+                  "isSigned" : true,
+                  "width" : "word"
+                }
+              }
+            }
+          }
+        ],
+        "swiftCallName" : "GenericImportBox"
+      }
+    ],
+    "enums" : [
+      {
+        "cases" : [
+          {
+            "associatedValues" : [
+
+            ],
+            "name" : "red"
+          },
+          {
+            "associatedValues" : [
+
+            ],
+            "name" : "green"
+          }
+        ],
+        "emitStyle" : "const",
+        "name" : "GenericColor",
+        "staticMethods" : [
+
+        ],
+        "staticProperties" : [
+
+        ],
+        "swiftCallName" : "GenericColor",
+        "tsFullPath" : "GenericColor"
+      },
+      {
+        "cases" : [
+          {
+            "associatedValues" : [
+
+            ],
+            "name" : "light"
+          },
+          {
+            "associatedValues" : [
+
+            ],
+            "name" : "dark"
+          }
+        ],
+        "emitStyle" : "const",
+        "name" : "GenericMode",
+        "rawType" : "String",
+        "staticMethods" : [
+
+        ],
+        "staticProperties" : [
+
+        ],
+        "swiftCallName" : "GenericMode",
+        "tsFullPath" : "GenericMode"
+      },
+      {
+        "cases" : [
+          {
+            "associatedValues" : [
+              {
+                "label" : "value",
+                "type" : {
+                  "integer" : {
+                    "_0" : {
+                      "isSigned" : true,
+                      "width" : "word"
+                    }
+                  }
+                }
+              }
+            ],
+            "name" : "number"
+          },
+          {
+            "associatedValues" : [
+              {
+                "label" : "value",
+                "type" : {
+                  "string" : {
+
+                  }
+                }
+              }
+            ],
+            "name" : "text"
+          }
+        ],
+        "emitStyle" : "const",
+        "name" : "GenericTagged",
+        "staticMethods" : [
+
+        ],
+        "staticProperties" : [
+
+        ],
+        "swiftCallName" : "GenericTagged",
+        "tsFullPath" : "GenericTagged"
+      }
+    ],
+    "exposeToGlobal" : false,
+    "functions" : [
+
+    ],
+    "protocols" : [
+
+    ],
+    "structs" : [
+      {
+        "methods" : [
+
+        ],
+        "name" : "GenericPoint",
+        "properties" : [
+          {
+            "isReadonly" : true,
+            "isStatic" : false,
+            "name" : "x",
+            "type" : {
+              "integer" : {
+                "_0" : {
+                  "isSigned" : true,
+                  "width" : "word"
+                }
+              }
+            }
+          },
+          {
+            "isReadonly" : true,
+            "isStatic" : false,
+            "name" : "y",
+            "type" : {
+              "integer" : {
+                "_0" : {
+                  "isSigned" : true,
+                  "width" : "word"
+                }
+              }
+            }
+          }
+        ],
+        "swiftCallName" : "GenericPoint"
+      }
+    ]
+  },
+  "imported" : {
+    "children" : [
+      {
+        "functions" : [
+          {
+            "accessLevel" : "internal",
+            "effects" : {
+              "isAsync" : false,
+              "isStatic" : false,
+              "isThrows" : true
+            },
+            "genericParameters" : [
+              "T"
+            ],
+            "name" : "genericRoundTrip",
+            "parameters" : [
+              {
+                "name" : "value",
+                "type" : {
+                  "generic" : {
+                    "_0" : "T"
+                  }
+                }
+              }
+            ],
+            "returnType" : {
+              "generic" : {
+                "_0" : "T"
+              }
+            }
+          },
+          {
+            "accessLevel" : "internal",
+            "effects" : {
+              "isAsync" : false,
+              "isStatic" : false,
+              "isThrows" : true
+            },
+            "genericParameters" : [
+              "T"
+            ],
+            "name" : "genericParse",
+            "parameters" : [
+              {
+                "name" : "json",
+                "type" : {
+                  "string" : {
+
+                  }
+                }
+              }
+            ],
+            "returnType" : {
+              "generic" : {
+                "_0" : "T"
+              }
+            }
+          },
+          {
+            "accessLevel" : "internal",
+            "effects" : {
+              "isAsync" : false,
+              "isStatic" : false,
+              "isThrows" : true
+            },
+            "genericParameters" : [
+              "T",
+              "U"
+            ],
+            "name" : "importGenericCombine",
+            "parameters" : [
+              {
+                "name" : "a",
+                "type" : {
+                  "generic" : {
+                    "_0" : "T"
+                  }
+                }
+              },
+              {
+                "name" : "b",
+                "type" : {
+                  "generic" : {
+                    "_0" : "U"
+                  }
+                }
+              }
+            ],
+            "returnType" : {
+              "generic" : {
+                "_0" : "U"
+              }
+            }
+          },
+          {
+            "accessLevel" : "internal",
+            "effects" : {
+              "isAsync" : false,
+              "isStatic" : false,
+              "isThrows" : true
+            },
+            "genericParameters" : [
+              "T",
+              "t"
+            ],
+            "name" : "importGenericCaseDistinct",
+            "parameters" : [
+              {
+                "name" : "a",
+                "type" : {
+                  "generic" : {
+                    "_0" : "T"
+                  }
+                }
+              },
+              {
+                "name" : "b",
+                "type" : {
+                  "generic" : {
+                    "_0" : "t"
+                  }
+                }
+              }
+            ],
+            "returnType" : {
+              "generic" : {
+                "_0" : "T"
+              }
+            }
+          },
+          {
+            "accessLevel" : "internal",
+            "effects" : {
+              "isAsync" : false,
+              "isStatic" : false,
+              "isThrows" : true
+            },
+            "genericParameters" : [
+              "T"
+            ],
+            "name" : "importGenericArray",
+            "parameters" : [
+              {
+                "name" : "values",
+                "type" : {
+                  "array" : {
+                    "_0" : {
+                      "generic" : {
+                        "_0" : "T"
+                      }
+                    }
+                  }
+                }
+              }
+            ],
+            "returnType" : {
+              "array" : {
+                "_0" : {
+                  "generic" : {
+                    "_0" : "T"
+                  }
+                }
+              }
+            }
+          },
+          {
+            "accessLevel" : "internal",
+            "effects" : {
+              "isAsync" : false,
+              "isStatic" : false,
+              "isThrows" : true
+            },
+            "genericParameters" : [
+              "T"
+            ],
+            "name" : "importGenericOptional",
+            "parameters" : [
+              {
+                "name" : "value",
+                "type" : {
+                  "nullable" : {
+                    "_0" : {
+                      "generic" : {
+                        "_0" : "T"
+                      }
+                    },
+                    "_1" : "null"
+                  }
+                }
+              }
+            ],
+            "returnType" : {
+              "nullable" : {
+                "_0" : {
+                  "generic" : {
+                    "_0" : "T"
+                  }
+                },
+                "_1" : "null"
+              }
+            }
+          },
+          {
+            "accessLevel" : "internal",
+            "effects" : {
+              "isAsync" : false,
+              "isStatic" : false,
+              "isThrows" : true
+            },
+            "genericParameters" : [
+              "T"
+            ],
+            "name" : "importGenericDictionary",
+            "parameters" : [
+              {
+                "name" : "values",
+                "type" : {
+                  "dictionary" : {
+                    "_0" : {
+                      "generic" : {
+                        "_0" : "T"
+                      }
+                    }
+                  }
+                }
+              }
+            ],
+            "returnType" : {
+              "dictionary" : {
+                "_0" : {
+                  "generic" : {
+                    "_0" : "T"
+                  }
+                }
+              }
+            }
+          },
+          {
+            "accessLevel" : "internal",
+            "effects" : {
+              "isAsync" : false,
+              "isStatic" : false,
+              "isThrows" : true
+            },
+            "genericParameters" : [
+              "T"
+            ],
+            "name" : "importGenericAfterOptionalArray",
+            "parameters" : [
+              {
+                "name" : "values",
+                "type" : {
+                  "nullable" : {
+                    "_0" : {
+                      "array" : {
+                        "_0" : {
+                          "integer" : {
+                            "_0" : {
+                              "isSigned" : true,
+                              "width" : "word"
+                            }
+                          }
+                        }
+                      }
+                    },
+                    "_1" : "null"
+                  }
+                }
+              },
+              {
+                "name" : "value",
+                "type" : {
+                  "generic" : {
+                    "_0" : "T"
+                  }
+                }
+              }
+            ],
+            "returnType" : {
+              "generic" : {
+                "_0" : "T"
+              }
+            }
+          }
+        ],
+        "types" : [
+          {
+            "accessLevel" : "internal",
+            "constructor" : {
+              "accessLevel" : "internal",
+              "genericParameters" : [
+                "T",
+                "U"
+              ],
+              "parameters" : [
+                {
+                  "name" : "tag",
+                  "type" : {
+                    "string" : {
+
+                    }
+                  }
+                },
+                {
+                  "name" : "first",
+                  "type" : {
+                    "generic" : {
+                      "_0" : "T"
+                    }
+                  }
+                },
+                {
+                  "name" : "second",
+                  "type" : {
+                    "generic" : {
+                      "_0" : "U"
+                    }
+                  }
+                }
+              ]
+            },
+            "getters" : [
+
+            ],
+            "methods" : [
+
+            ],
+            "name" : "GenericPairFactory",
+            "setters" : [
+
+            ],
+            "staticMethods" : [
+
+            ]
+          },
+          {
+            "accessLevel" : "internal",
+            "constructor" : {
+              "accessLevel" : "internal",
+              "genericParameters" : [
+                "T"
+              ],
+              "parameters" : [
+                {
+                  "name" : "value",
+                  "type" : {
+                    "generic" : {
+                      "_0" : "T"
+                    }
+                  }
+                }
+              ]
+            },
+            "getters" : [
+
+            ],
+            "methods" : [
+              {
+                "accessLevel" : "internal",
+                "effects" : {
+                  "isAsync" : false,
+                  "isStatic" : false,
+                  "isThrows" : true
+                },
+                "genericParameters" : [
+                  "T"
+                ],
+                "name" : "accept",
+                "parameters" : [
+                  {
+                    "name" : "value",
+                    "type" : {
+                      "generic" : {
+                        "_0" : "T"
+                      }
+                    }
+                  }
+                ],
+                "returnType" : {
+                  "void" : {
+
+                  }
+                }
+              },
+              {
+                "accessLevel" : "internal",
+                "effects" : {
+                  "isAsync" : false,
+                  "isStatic" : false,
+                  "isThrows" : true
+                },
+                "genericParameters" : [
+                  "T"
+                ],
+                "name" : "identity",
+                "parameters" : [
+                  {
+                    "name" : "value",
+                    "type" : {
+                      "generic" : {
+                        "_0" : "T"
+                      }
+                    }
+                  }
+                ],
+                "returnType" : {
+                  "generic" : {
+                    "_0" : "T"
+                  }
+                }
+              }
+            ],
+            "name" : "GenericConsumer",
+            "setters" : [
+
+            ],
+            "staticMethods" : [
+              {
+                "accessLevel" : "internal",
+                "effects" : {
+                  "isAsync" : false,
+                  "isStatic" : false,
+                  "isThrows" : true
+                },
+                "genericParameters" : [
+                  "T"
+                ],
+                "name" : "box",
+                "parameters" : [
+                  {
+                    "name" : "value",
+                    "type" : {
+                      "generic" : {
+                        "_0" : "T"
+                      }
+                    }
+                  }
+                ],
+                "returnType" : {
+                  "generic" : {
+                    "_0" : "T"
+                  }
+                }
+              }
+            ]
+          }
+        ]
+      }
+    ]
+  },
+  "moduleName" : "TestModule",
+  "usedExternalModules" : [
+
+  ]
+}
\ No newline at end of file
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/GenericImports.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/GenericImports.swift
new file mode 100644
index 000000000..01ed6196e
--- /dev/null
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/GenericImports.swift
@@ -0,0 +1,505 @@
+extension GenericColor: _BridgedSwiftCaseEnum {
+    @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameter() -> Int32 {
+        return bridgeJSRawValue
+    }
+    @_spi(BridgeJS) @_transparent public static func bridgeJSLiftReturn(_ value: Int32) -> GenericColor {
+        return bridgeJSLiftParameter(value)
+    }
+    @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter(_ value: Int32) -> GenericColor {
+        return GenericColor(bridgeJSRawValue: value)!
+    }
+    @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() -> Int32 {
+        return bridgeJSLowerParameter()
+    }
+
+    @_spi(BridgeJS) @usableFromInline init?(bridgeJSRawValue: Int32) {
+        switch bridgeJSRawValue {
+        case 0:
+            self = .red
+        case 1:
+            self = .green
+        default:
+            return nil
+        }
+    }
+
+    @_spi(BridgeJS) @usableFromInline var bridgeJSRawValue: Int32 {
+        switch self {
+        case .red:
+            return 0
+        case .green:
+            return 1
+        }
+    }
+}
+
+extension GenericMode: _BridgedSwiftEnumNoPayload, _BridgedSwiftRawValueEnum {
+}
+
+extension GenericTagged: _BridgedSwiftAssociatedValueEnum {
+    @_spi(BridgeJS) @_transparent public static func bridgeJSStackPopPayload(_ caseId: Int32) -> GenericTagged {
+        switch caseId {
+        case 0:
+            return .number(value: Int.bridgeJSStackPop())
+        case 1:
+            return .text(value: String.bridgeJSStackPop())
+        default:
+            fatalError("Unknown GenericTagged case ID: \(caseId)")
+        }
+    }
+
+    @_spi(BridgeJS) @_transparent public consuming func bridgeJSStackPushPayload() -> Int32 {
+        switch self {
+        case .number(let value):
+            value.bridgeJSStackPush()
+            return Int32(0)
+        case .text(let value):
+            value.bridgeJSStackPush()
+            return Int32(1)
+        }
+    }
+}
+
+extension GenericPoint: _BridgedSwiftStruct {
+    @_spi(BridgeJS) @_transparent public static func bridgeJSStackPop() -> GenericPoint {
+        let y = Int.bridgeJSStackPop()
+        let x = Int.bridgeJSStackPop()
+        return GenericPoint(x: x, y: y)
+    }
+
+    @_spi(BridgeJS) @_transparent public consuming func bridgeJSStackPush() {
+        self.x.bridgeJSStackPush()
+        self.y.bridgeJSStackPush()
+    }
+
+    init(unsafelyCopying jsObject: JSObject) {
+        _bjs_struct_lower_GenericPoint(jsObject.bridgeJSLowerParameter())
+        self = Self.bridgeJSStackPop()
+    }
+
+    func toJSObject() -> JSObject {
+        let __bjs_self = self
+        __bjs_self.bridgeJSStackPush()
+        return JSObject(id: UInt32(bitPattern: _bjs_struct_lift_GenericPoint()))
+    }
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "swift_js_struct_lower_GenericPoint")
+fileprivate func _bjs_struct_lower_GenericPoint_extern(_ objectId: Int32) -> Void
+#else
+fileprivate func _bjs_struct_lower_GenericPoint_extern(_ objectId: Int32) -> Void {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func _bjs_struct_lower_GenericPoint(_ objectId: Int32) -> Void {
+    return _bjs_struct_lower_GenericPoint_extern(objectId)
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "swift_js_struct_lift_GenericPoint")
+fileprivate func _bjs_struct_lift_GenericPoint_extern() -> Int32
+#else
+fileprivate func _bjs_struct_lift_GenericPoint_extern() -> Int32 {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func _bjs_struct_lift_GenericPoint() -> Int32 {
+    return _bjs_struct_lift_GenericPoint_extern()
+}
+
+@_expose(wasm, "bjs_GenericImportBox_init")
+@_cdecl("bjs_GenericImportBox_init")
+public func _bjs_GenericImportBox_init(_ value: Int32) -> UnsafeMutableRawPointer {
+    #if arch(wasm32)
+    let ret = GenericImportBox(value: Int.bridgeJSLiftParameter(value))
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_GenericImportBox_get")
+@_cdecl("bjs_GenericImportBox_get")
+public func _bjs_GenericImportBox_get(_ _self: UnsafeMutableRawPointer) -> Int32 {
+    #if arch(wasm32)
+    let ret = GenericImportBox.bridgeJSLiftParameter(_self).get()
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_GenericImportBox_value_get")
+@_cdecl("bjs_GenericImportBox_value_get")
+public func _bjs_GenericImportBox_value_get(_ _self: UnsafeMutableRawPointer) -> Int32 {
+    #if arch(wasm32)
+    let ret = GenericImportBox.bridgeJSLiftParameter(_self).value
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_GenericImportBox_value_set")
+@_cdecl("bjs_GenericImportBox_value_set")
+public func _bjs_GenericImportBox_value_set(_ _self: UnsafeMutableRawPointer, _ value: Int32) -> Void {
+    #if arch(wasm32)
+    GenericImportBox.bridgeJSLiftParameter(_self).value = Int.bridgeJSLiftParameter(value)
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_GenericImportBox_deinit")
+@_cdecl("bjs_GenericImportBox_deinit")
+public func _bjs_GenericImportBox_deinit(_ pointer: UnsafeMutableRawPointer) -> Void {
+    #if arch(wasm32)
+    Unmanaged<GenericImportBox>.fromOpaque(pointer).release()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+extension GenericImportBox: ConvertibleToJSValue, _BridgedSwiftHeapObject, _BridgedSwiftProtocolExportable {
+    var jsValue: JSValue {
+        return .object(JSObject(id: UInt32(bitPattern: _bjs_GenericImportBox_wrap(Unmanaged.passRetained(self).toOpaque()))))
+    }
+    consuming func bridgeJSLowerAsProtocolReturn() -> Int32 {
+        _bjs_GenericImportBox_wrap(Unmanaged.passRetained(self).toOpaque())
+    }
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "TestModule", name: "bjs_GenericImportBox_wrap")
+fileprivate func _bjs_GenericImportBox_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32
+#else
+fileprivate func _bjs_GenericImportBox_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func _bjs_GenericImportBox_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 {
+    return _bjs_GenericImportBox_wrap_extern(pointer)
+}
+
+extension GenericPoint: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = GenericPoint.bridgeJSMakeTypeHandle()
+}
+
+extension GenericImportBox: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = GenericImportBox.bridgeJSMakeTypeHandle()
+}
+
+extension GenericColor: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = GenericColor.bridgeJSMakeTypeHandle()
+}
+
+extension GenericMode: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = GenericMode.bridgeJSMakeTypeHandle()
+}
+
+extension GenericTagged: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = GenericTagged.bridgeJSMakeTypeHandle()
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "TestModule", name: "bjs_genericRoundTrip")
+fileprivate func bjs_genericRoundTrip_extern(_ _generic0TypeId: Int32) -> Void
+#else
+fileprivate func bjs_genericRoundTrip_extern(_ _generic0TypeId: Int32) -> Void {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func bjs_genericRoundTrip(_ _generic0TypeId: Int32) -> Void {
+    return bjs_genericRoundTrip_extern(_generic0TypeId)
+}
+
+func _$genericRoundTrip<T: BridgedSwiftGenericBridgeable>(_ value: T) throws(JSException) -> T {
+    value.bridgeJSStackPush()
+    bjs_genericRoundTrip(T.bridgeJSTypeID)
+    if let error = _swift_js_take_exception() {
+        throw error
+    }
+    return T.bridgeJSStackPop()
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "TestModule", name: "bjs_genericParse")
+fileprivate func bjs_genericParse_extern(_ jsonBytes: Int32, _ jsonLength: Int32, _ _generic0TypeId: Int32) -> Void
+#else
+fileprivate func bjs_genericParse_extern(_ jsonBytes: Int32, _ jsonLength: Int32, _ _generic0TypeId: Int32) -> Void {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func bjs_genericParse(_ jsonBytes: Int32, _ jsonLength: Int32, _ _generic0TypeId: Int32) -> Void {
+    return bjs_genericParse_extern(jsonBytes, jsonLength, _generic0TypeId)
+}
+
+func _$genericParse<T: BridgedSwiftGenericBridgeable>(_ json: String) throws(JSException) -> T {
+    json.bridgeJSWithLoweredParameter { (jsonBytes, jsonLength) in
+        bjs_genericParse(jsonBytes, jsonLength, T.bridgeJSTypeID)
+    }
+    if let error = _swift_js_take_exception() {
+        throw error
+    }
+    return T.bridgeJSStackPop()
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "TestModule", name: "bjs_importGenericCombine")
+fileprivate func bjs_importGenericCombine_extern(_ _generic0TypeId: Int32, _ _generic1TypeId: Int32) -> Void
+#else
+fileprivate func bjs_importGenericCombine_extern(_ _generic0TypeId: Int32, _ _generic1TypeId: Int32) -> Void {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func bjs_importGenericCombine(_ _generic0TypeId: Int32, _ _generic1TypeId: Int32) -> Void {
+    return bjs_importGenericCombine_extern(_generic0TypeId, _generic1TypeId)
+}
+
+func _$importGenericCombine<T: BridgedSwiftGenericBridgeable, U: BridgedSwiftGenericBridgeable>(_ a: T, _ b: U) throws(JSException) -> U {
+    b.bridgeJSStackPush()
+    a.bridgeJSStackPush()
+    bjs_importGenericCombine(T.bridgeJSTypeID, U.bridgeJSTypeID)
+    if let error = _swift_js_take_exception() {
+        throw error
+    }
+    return U.bridgeJSStackPop()
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "TestModule", name: "bjs_importGenericCaseDistinct")
+fileprivate func bjs_importGenericCaseDistinct_extern(_ _generic0TypeId: Int32, _ _generic1TypeId: Int32) -> Void
+#else
+fileprivate func bjs_importGenericCaseDistinct_extern(_ _generic0TypeId: Int32, _ _generic1TypeId: Int32) -> Void {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func bjs_importGenericCaseDistinct(_ _generic0TypeId: Int32, _ _generic1TypeId: Int32) -> Void {
+    return bjs_importGenericCaseDistinct_extern(_generic0TypeId, _generic1TypeId)
+}
+
+func _$importGenericCaseDistinct<T: BridgedSwiftGenericBridgeable, t: BridgedSwiftGenericBridgeable>(_ a: T, _ b: t) throws(JSException) -> T {
+    b.bridgeJSStackPush()
+    a.bridgeJSStackPush()
+    bjs_importGenericCaseDistinct(T.bridgeJSTypeID, t.bridgeJSTypeID)
+    if let error = _swift_js_take_exception() {
+        throw error
+    }
+    return T.bridgeJSStackPop()
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "TestModule", name: "bjs_importGenericArray")
+fileprivate func bjs_importGenericArray_extern(_ _generic0TypeId: Int32) -> Void
+#else
+fileprivate func bjs_importGenericArray_extern(_ _generic0TypeId: Int32) -> Void {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func bjs_importGenericArray(_ _generic0TypeId: Int32) -> Void {
+    return bjs_importGenericArray_extern(_generic0TypeId)
+}
+
+func _$importGenericArray<T: BridgedSwiftGenericBridgeable>(_ values: [T]) throws(JSException) -> [T] {
+    let _ = values.bridgeJSLowerParameter()
+    bjs_importGenericArray(T.bridgeJSTypeID)
+    if let error = _swift_js_take_exception() {
+        throw error
+    }
+    return [T].bridgeJSLiftReturn()
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "TestModule", name: "bjs_importGenericOptional")
+fileprivate func bjs_importGenericOptional_extern(_ _generic0TypeId: Int32) -> Void
+#else
+fileprivate func bjs_importGenericOptional_extern(_ _generic0TypeId: Int32) -> Void {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func bjs_importGenericOptional(_ _generic0TypeId: Int32) -> Void {
+    return bjs_importGenericOptional_extern(_generic0TypeId)
+}
+
+func _$importGenericOptional<T: BridgedSwiftGenericBridgeable>(_ value: Optional<T>) throws(JSException) -> Optional<T> {
+    value.bridgeJSStackPush()
+    bjs_importGenericOptional(T.bridgeJSTypeID)
+    if let error = _swift_js_take_exception() {
+        throw error
+    }
+    return Optional<T>.bridgeJSStackPop()
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "TestModule", name: "bjs_importGenericDictionary")
+fileprivate func bjs_importGenericDictionary_extern(_ _generic0TypeId: Int32) -> Void
+#else
+fileprivate func bjs_importGenericDictionary_extern(_ _generic0TypeId: Int32) -> Void {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func bjs_importGenericDictionary(_ _generic0TypeId: Int32) -> Void {
+    return bjs_importGenericDictionary_extern(_generic0TypeId)
+}
+
+func _$importGenericDictionary<T: BridgedSwiftGenericBridgeable>(_ values: [String: T]) throws(JSException) -> [String: T] {
+    let _ = values.bridgeJSLowerParameter()
+    bjs_importGenericDictionary(T.bridgeJSTypeID)
+    if let error = _swift_js_take_exception() {
+        throw error
+    }
+    return [String: T].bridgeJSLiftReturn()
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "TestModule", name: "bjs_importGenericAfterOptionalArray")
+fileprivate func bjs_importGenericAfterOptionalArray_extern(_ _generic0TypeId: Int32) -> Void
+#else
+fileprivate func bjs_importGenericAfterOptionalArray_extern(_ _generic0TypeId: Int32) -> Void {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func bjs_importGenericAfterOptionalArray(_ _generic0TypeId: Int32) -> Void {
+    return bjs_importGenericAfterOptionalArray_extern(_generic0TypeId)
+}
+
+func _$importGenericAfterOptionalArray<T: BridgedSwiftGenericBridgeable>(_ values: Optional<[Int]>, _ value: T) throws(JSException) -> T {
+    value.bridgeJSStackPush()
+    let _ = values.bridgeJSLowerParameter()
+    bjs_importGenericAfterOptionalArray(T.bridgeJSTypeID)
+    if let error = _swift_js_take_exception() {
+        throw error
+    }
+    return T.bridgeJSStackPop()
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "TestModule", name: "bjs_GenericPairFactory_init")
+fileprivate func bjs_GenericPairFactory_init_extern(_ tagBytes: Int32, _ tagLength: Int32, _ _generic0TypeId: Int32, _ _generic1TypeId: Int32) -> Int32
+#else
+fileprivate func bjs_GenericPairFactory_init_extern(_ tagBytes: Int32, _ tagLength: Int32, _ _generic0TypeId: Int32, _ _generic1TypeId: Int32) -> Int32 {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func bjs_GenericPairFactory_init(_ tagBytes: Int32, _ tagLength: Int32, _ _generic0TypeId: Int32, _ _generic1TypeId: Int32) -> Int32 {
+    return bjs_GenericPairFactory_init_extern(tagBytes, tagLength, _generic0TypeId, _generic1TypeId)
+}
+
+func _$GenericPairFactory_init<T: BridgedSwiftGenericBridgeable, U: BridgedSwiftGenericBridgeable>(_ tag: String, _ first: T, _ second: U) throws(JSException) -> JSObject {
+    let ret0 = tag.bridgeJSWithLoweredParameter { (tagBytes, tagLength) in
+        second.bridgeJSStackPush()
+        first.bridgeJSStackPush()
+        let ret = bjs_GenericPairFactory_init(tagBytes, tagLength, T.bridgeJSTypeID, U.bridgeJSTypeID)
+        return ret
+    }
+    let ret = ret0
+    if let error = _swift_js_take_exception() {
+        throw error
+    }
+    return JSObject.bridgeJSLiftReturn(ret)
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "TestModule", name: "bjs_GenericConsumer_init")
+fileprivate func bjs_GenericConsumer_init_extern(_ _generic0TypeId: Int32) -> Int32
+#else
+fileprivate func bjs_GenericConsumer_init_extern(_ _generic0TypeId: Int32) -> Int32 {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func bjs_GenericConsumer_init(_ _generic0TypeId: Int32) -> Int32 {
+    return bjs_GenericConsumer_init_extern(_generic0TypeId)
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "TestModule", name: "bjs_GenericConsumer_box_static")
+fileprivate func bjs_GenericConsumer_box_static_extern(_ _generic0TypeId: Int32) -> Void
+#else
+fileprivate func bjs_GenericConsumer_box_static_extern(_ _generic0TypeId: Int32) -> Void {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func bjs_GenericConsumer_box_static(_ _generic0TypeId: Int32) -> Void {
+    return bjs_GenericConsumer_box_static_extern(_generic0TypeId)
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "TestModule", name: "bjs_GenericConsumer_accept")
+fileprivate func bjs_GenericConsumer_accept_extern(_ self: Int32, _ _generic0TypeId: Int32) -> Void
+#else
+fileprivate func bjs_GenericConsumer_accept_extern(_ self: Int32, _ _generic0TypeId: Int32) -> Void {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func bjs_GenericConsumer_accept(_ self: Int32, _ _generic0TypeId: Int32) -> Void {
+    return bjs_GenericConsumer_accept_extern(self, _generic0TypeId)
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "TestModule", name: "bjs_GenericConsumer_identity")
+fileprivate func bjs_GenericConsumer_identity_extern(_ self: Int32, _ _generic0TypeId: Int32) -> Void
+#else
+fileprivate func bjs_GenericConsumer_identity_extern(_ self: Int32, _ _generic0TypeId: Int32) -> Void {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func bjs_GenericConsumer_identity(_ self: Int32, _ _generic0TypeId: Int32) -> Void {
+    return bjs_GenericConsumer_identity_extern(self, _generic0TypeId)
+}
+
+func _$GenericConsumer_init<T: BridgedSwiftGenericBridgeable>(_ value: T) throws(JSException) -> JSObject {
+    value.bridgeJSStackPush()
+    let ret = bjs_GenericConsumer_init(T.bridgeJSTypeID)
+    if let error = _swift_js_take_exception() {
+        throw error
+    }
+    return JSObject.bridgeJSLiftReturn(ret)
+}
+
+func _$GenericConsumer_box<T: BridgedSwiftGenericBridgeable>(_ value: T) throws(JSException) -> T {
+    value.bridgeJSStackPush()
+    bjs_GenericConsumer_box_static(T.bridgeJSTypeID)
+    if let error = _swift_js_take_exception() {
+        throw error
+    }
+    return T.bridgeJSStackPop()
+}
+
+func _$GenericConsumer_accept<T: BridgedSwiftGenericBridgeable>(_ self: JSObject, _ value: T) throws(JSException) -> Void {
+    value.bridgeJSStackPush()
+    let selfValue = self.bridgeJSLowerParameter()
+    bjs_GenericConsumer_accept(selfValue, T.bridgeJSTypeID)
+    if let error = _swift_js_take_exception() {
+        throw error
+    }
+}
+
+func _$GenericConsumer_identity<T: BridgedSwiftGenericBridgeable>(_ self: JSObject, _ value: T) throws(JSException) -> T {
+    value.bridgeJSStackPush()
+    let selfValue = self.bridgeJSLowerParameter()
+    bjs_GenericConsumer_identity(selfValue, T.bridgeJSTypeID)
+    if let error = _swift_js_take_exception() {
+        throw error
+    }
+    return T.bridgeJSStackPop()
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "bjs_TestModule_register_type_handles")
+fileprivate func _bjs_TestModule_register_type_handles_extern(_ base: UnsafePointer<Int32>?, _ count: Int32)
+
+@_expose(wasm, "bjs_TestModule_register_type_handles")
+public func _bjs_TestModule_register_type_handles() {
+    let typeIds: [Int32] = [
+        GenericPoint.bridgeJSTypeID,
+        GenericImportBox.bridgeJSTypeID,
+        GenericColor.bridgeJSTypeID,
+        GenericMode.bridgeJSTypeID,
+        GenericTagged.bridgeJSTypeID,
+    ]
+    typeIds.withUnsafeBufferPointer { buffer in
+        _bjs_TestModule_register_type_handles_extern(buffer.baseAddress, Int32(buffer.count))
+    }
+}
+#endif
\ No newline at end of file
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/GlobalGetter.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/GlobalGetter.swift
index 5e7088db8..68afce080 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/GlobalGetter.swift
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/GlobalGetter.swift
@@ -31,8 +31,8 @@ fileprivate func bjs_JSConsole_log_extern(_ self: Int32, _ messageBytes: Int32,
 }
 
 func _$JSConsole_log(_ self: JSObject, _ message: String) throws(JSException) -> Void {
-    let selfValue = self.bridgeJSLowerParameter()
     message.bridgeJSWithLoweredParameter { (messageBytes, messageLength) in
+        let selfValue = self.bridgeJSLowerParameter()
         bjs_JSConsole_log(selfValue, messageBytes, messageLength)
     }
     if let error = _swift_js_take_exception() {
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/GlobalThisImports.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/GlobalThisImports.swift
index 35b1c6281..4ba7a26fe 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/GlobalThisImports.swift
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/GlobalThisImports.swift
@@ -55,8 +55,8 @@ fileprivate func bjs_JSConsole_log_extern(_ self: Int32, _ messageBytes: Int32,
 }
 
 func _$JSConsole_log(_ self: JSObject, _ message: String) throws(JSException) -> Void {
-    let selfValue = self.bridgeJSLowerParameter()
     message.bridgeJSWithLoweredParameter { (messageBytes, messageLength) in
+        let selfValue = self.bridgeJSLowerParameter()
         bjs_JSConsole_log(selfValue, messageBytes, messageLength)
     }
     if let error = _swift_js_take_exception() {
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/IdentityModeClass.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/IdentityModeClass.json
index f4a4440c6..bca32c30d 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/IdentityModeClass.json
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/IdentityModeClass.json
@@ -1,5 +1,8 @@
 {
   "exported" : {
+    "aliases" : [
+
+    ],
     "classes" : [
       {
         "constructor" : {
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ImportArray.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ImportArray.json
index 7bf447ad5..4d9bcc87f 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ImportArray.json
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ImportArray.json
@@ -68,6 +68,122 @@
 
               }
             }
+          },
+          {
+            "accessLevel" : "internal",
+            "effects" : {
+              "isAsync" : false,
+              "isStatic" : false,
+              "isThrows" : true
+            },
+            "name" : "optionalArrayThenArray",
+            "parameters" : [
+              {
+                "name" : "a",
+                "type" : {
+                  "nullable" : {
+                    "_0" : {
+                      "array" : {
+                        "_0" : {
+                          "integer" : {
+                            "_0" : {
+                              "isSigned" : true,
+                              "width" : "word"
+                            }
+                          }
+                        }
+                      }
+                    },
+                    "_1" : "null"
+                  }
+                }
+              },
+              {
+                "name" : "b",
+                "type" : {
+                  "array" : {
+                    "_0" : {
+                      "integer" : {
+                        "_0" : {
+                          "isSigned" : true,
+                          "width" : "word"
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            ],
+            "returnType" : {
+              "integer" : {
+                "_0" : {
+                  "isSigned" : true,
+                  "width" : "word"
+                }
+              }
+            }
+          },
+          {
+            "accessLevel" : "internal",
+            "effects" : {
+              "isAsync" : false,
+              "isStatic" : false,
+              "isThrows" : true
+            },
+            "name" : "borrowedStringAroundStackParams",
+            "parameters" : [
+              {
+                "name" : "s",
+                "type" : {
+                  "string" : {
+
+                  }
+                }
+              },
+              {
+                "name" : "a",
+                "type" : {
+                  "nullable" : {
+                    "_0" : {
+                      "array" : {
+                        "_0" : {
+                          "integer" : {
+                            "_0" : {
+                              "isSigned" : true,
+                              "width" : "word"
+                            }
+                          }
+                        }
+                      }
+                    },
+                    "_1" : "null"
+                  }
+                }
+              },
+              {
+                "name" : "b",
+                "type" : {
+                  "array" : {
+                    "_0" : {
+                      "integer" : {
+                        "_0" : {
+                          "isSigned" : true,
+                          "width" : "word"
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            ],
+            "returnType" : {
+              "integer" : {
+                "_0" : {
+                  "isSigned" : true,
+                  "width" : "word"
+                }
+              }
+            }
           }
         ],
         "types" : [
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ImportArray.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ImportArray.swift
index db1f136e7..12abbd1e6 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ImportArray.swift
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ImportArray.swift
@@ -37,4 +37,52 @@ func _$logStrings(_ items: [String]) throws(JSException) -> Void {
     if let error = _swift_js_take_exception() {
         throw error
     }
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "TestModule", name: "bjs_optionalArrayThenArray")
+fileprivate func bjs_optionalArrayThenArray_extern() -> Int32
+#else
+fileprivate func bjs_optionalArrayThenArray_extern() -> Int32 {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func bjs_optionalArrayThenArray() -> Int32 {
+    return bjs_optionalArrayThenArray_extern()
+}
+
+func _$optionalArrayThenArray(_ a: Optional<[Int]>, _ b: [Int]) throws(JSException) -> Int {
+    let _ = b.bridgeJSLowerParameter()
+    let _ = a.bridgeJSLowerParameter()
+    let ret = bjs_optionalArrayThenArray()
+    if let error = _swift_js_take_exception() {
+        throw error
+    }
+    return Int.bridgeJSLiftReturn(ret)
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "TestModule", name: "bjs_borrowedStringAroundStackParams")
+fileprivate func bjs_borrowedStringAroundStackParams_extern(_ sBytes: Int32, _ sLength: Int32) -> Int32
+#else
+fileprivate func bjs_borrowedStringAroundStackParams_extern(_ sBytes: Int32, _ sLength: Int32) -> Int32 {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func bjs_borrowedStringAroundStackParams(_ sBytes: Int32, _ sLength: Int32) -> Int32 {
+    return bjs_borrowedStringAroundStackParams_extern(sBytes, sLength)
+}
+
+func _$borrowedStringAroundStackParams(_ s: String, _ a: Optional<[Int]>, _ b: [Int]) throws(JSException) -> Int {
+    let ret0 = s.bridgeJSWithLoweredParameter { (sBytes, sLength) in
+        let _ = b.bridgeJSLowerParameter()
+        let _ = a.bridgeJSLowerParameter()
+        let ret = bjs_borrowedStringAroundStackParams(sBytes, sLength)
+        return ret
+    }
+    let ret = ret0
+    if let error = _swift_js_take_exception() {
+        throw error
+    }
+    return Int.bridgeJSLiftReturn(ret)
 }
\ No newline at end of file
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ImportedTypeInExportedInterface.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ImportedTypeInExportedInterface.json
index 600ae8c89..e4d10d07b 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ImportedTypeInExportedInterface.json
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ImportedTypeInExportedInterface.json
@@ -1,5 +1,8 @@
 {
   "exported" : {
+    "aliases" : [
+
+    ],
     "classes" : [
 
     ],
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ImportedTypeInExportedInterface.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ImportedTypeInExportedInterface.swift
index f3c3f2fc1..b9fddf706 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ImportedTypeInExportedInterface.swift
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ImportedTypeInExportedInterface.swift
@@ -59,7 +59,7 @@ public func _bjs_makeFoo() -> Int32 {
                 _swift_js_throw(Int32(bitPattern: $0.id))
             }
         } else {
-            let jsError = JSError(message: String(describing: error))
+            let jsError = JSError(message: error.description)
             withExtendedLifetime(jsError.jsObject) {
                 _swift_js_throw(Int32(bitPattern: $0.id))
             }
@@ -104,6 +104,10 @@ public func _bjs_roundtripFooContainer() -> Void {
     #endif
 }
 
+extension FooContainer: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = FooContainer.bridgeJSMakeTypeHandle()
+}
+
 #if arch(wasm32)
 @_extern(wasm, module: "TestModule", name: "bjs_Foo_init")
 fileprivate func bjs_Foo_init_extern() -> Int32
@@ -122,4 +126,19 @@ func _$Foo_init() throws(JSException) -> JSObject {
         throw error
     }
     return JSObject.bridgeJSLiftReturn(ret)
-}
\ No newline at end of file
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "bjs_TestModule_register_type_handles")
+fileprivate func _bjs_TestModule_register_type_handles_extern(_ base: UnsafePointer<Int32>?, _ count: Int32)
+
+@_expose(wasm, "bjs_TestModule_register_type_handles")
+public func _bjs_TestModule_register_type_handles() {
+    let typeIds: [Int32] = [
+        FooContainer.bridgeJSTypeID,
+    ]
+    typeIds.withUnsafeBufferPointer { buffer in
+        _bjs_TestModule_register_type_handles_extern(buffer.baseAddress, Int32(buffer.count))
+    }
+}
+#endif
\ No newline at end of file
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/InvalidPropertyNames.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/InvalidPropertyNames.swift
index 7f7fa8685..f82632737 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/InvalidPropertyNames.swift
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/InvalidPropertyNames.swift
@@ -327,8 +327,8 @@ func _$WeirdNaming_Any_get(_ self: JSObject) throws(JSException) -> String {
 }
 
 func _$WeirdNaming_normalProperty_set(_ self: JSObject, _ newValue: String) throws(JSException) -> Void {
-    let selfValue = self.bridgeJSLowerParameter()
     newValue.bridgeJSWithLoweredParameter { (newValueBytes, newValueLength) in
+        let selfValue = self.bridgeJSLowerParameter()
         bjs_WeirdNaming_normalProperty_set(selfValue, newValueBytes, newValueLength)
     }
     if let error = _swift_js_take_exception() {
@@ -337,8 +337,8 @@ func _$WeirdNaming_normalProperty_set(_ self: JSObject, _ newValue: String) thro
 }
 
 func _$WeirdNaming_property_with_dashes_set(_ self: JSObject, _ newValue: Double) throws(JSException) -> Void {
-    let selfValue = self.bridgeJSLowerParameter()
     let newValueValue = newValue.bridgeJSLowerParameter()
+    let selfValue = self.bridgeJSLowerParameter()
     bjs_WeirdNaming_property_with_dashes_set(selfValue, newValueValue)
     if let error = _swift_js_take_exception() {
         throw error
@@ -346,8 +346,8 @@ func _$WeirdNaming_property_with_dashes_set(_ self: JSObject, _ newValue: Double
 }
 
 func _$WeirdNaming__123invalidStart_set(_ self: JSObject, _ newValue: Bool) throws(JSException) -> Void {
-    let selfValue = self.bridgeJSLowerParameter()
     let newValueValue = newValue.bridgeJSLowerParameter()
+    let selfValue = self.bridgeJSLowerParameter()
     bjs_WeirdNaming__123invalidStart_set(selfValue, newValueValue)
     if let error = _swift_js_take_exception() {
         throw error
@@ -355,8 +355,8 @@ func _$WeirdNaming__123invalidStart_set(_ self: JSObject, _ newValue: Bool) thro
 }
 
 func _$WeirdNaming_property_with_spaces_set(_ self: JSObject, _ newValue: String) throws(JSException) -> Void {
-    let selfValue = self.bridgeJSLowerParameter()
     newValue.bridgeJSWithLoweredParameter { (newValueBytes, newValueLength) in
+        let selfValue = self.bridgeJSLowerParameter()
         bjs_WeirdNaming_property_with_spaces_set(selfValue, newValueBytes, newValueLength)
     }
     if let error = _swift_js_take_exception() {
@@ -365,8 +365,8 @@ func _$WeirdNaming_property_with_spaces_set(_ self: JSObject, _ newValue: String
 }
 
 func _$WeirdNaming__specialChar_set(_ self: JSObject, _ newValue: Double) throws(JSException) -> Void {
-    let selfValue = self.bridgeJSLowerParameter()
     let newValueValue = newValue.bridgeJSLowerParameter()
+    let selfValue = self.bridgeJSLowerParameter()
     bjs_WeirdNaming__specialChar_set(selfValue, newValueValue)
     if let error = _swift_js_take_exception() {
         throw error
@@ -374,8 +374,8 @@ func _$WeirdNaming__specialChar_set(_ self: JSObject, _ newValue: Double) throws
 }
 
 func _$WeirdNaming_constructor_set(_ self: JSObject, _ newValue: String) throws(JSException) -> Void {
-    let selfValue = self.bridgeJSLowerParameter()
     newValue.bridgeJSWithLoweredParameter { (newValueBytes, newValueLength) in
+        let selfValue = self.bridgeJSLowerParameter()
         bjs_WeirdNaming_constructor_set(selfValue, newValueBytes, newValueLength)
     }
     if let error = _swift_js_take_exception() {
@@ -384,8 +384,8 @@ func _$WeirdNaming_constructor_set(_ self: JSObject, _ newValue: String) throws(
 }
 
 func _$WeirdNaming_for_set(_ self: JSObject, _ newValue: String) throws(JSException) -> Void {
-    let selfValue = self.bridgeJSLowerParameter()
     newValue.bridgeJSWithLoweredParameter { (newValueBytes, newValueLength) in
+        let selfValue = self.bridgeJSLowerParameter()
         bjs_WeirdNaming_for_set(selfValue, newValueBytes, newValueLength)
     }
     if let error = _swift_js_take_exception() {
@@ -394,8 +394,8 @@ func _$WeirdNaming_for_set(_ self: JSObject, _ newValue: String) throws(JSExcept
 }
 
 func _$WeirdNaming_any_set(_ self: JSObject, _ newValue: String) throws(JSException) -> Void {
-    let selfValue = self.bridgeJSLowerParameter()
     newValue.bridgeJSWithLoweredParameter { (newValueBytes, newValueLength) in
+        let selfValue = self.bridgeJSLowerParameter()
         bjs_WeirdNaming_any_set(selfValue, newValueBytes, newValueLength)
     }
     if let error = _swift_js_take_exception() {
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/JSClass.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/JSClass.swift
index 3e1de0030..37009f318 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/JSClass.swift
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/JSClass.swift
@@ -121,8 +121,8 @@ func _$Greeter_age_get(_ self: JSObject) throws(JSException) -> Double {
 }
 
 func _$Greeter_name_set(_ self: JSObject, _ newValue: String) throws(JSException) -> Void {
-    let selfValue = self.bridgeJSLowerParameter()
     newValue.bridgeJSWithLoweredParameter { (newValueBytes, newValueLength) in
+        let selfValue = self.bridgeJSLowerParameter()
         bjs_Greeter_name_set(selfValue, newValueBytes, newValueLength)
     }
     if let error = _swift_js_take_exception() {
@@ -140,8 +140,8 @@ func _$Greeter_greet(_ self: JSObject) throws(JSException) -> String {
 }
 
 func _$Greeter_changeName(_ self: JSObject, _ name: String) throws(JSException) -> Void {
-    let selfValue = self.bridgeJSLowerParameter()
     name.bridgeJSWithLoweredParameter { (nameBytes, nameLength) in
+        let selfValue = self.bridgeJSLowerParameter()
         bjs_Greeter_changeName(selfValue, nameBytes, nameLength)
     }
     if let error = _swift_js_take_exception() {
@@ -174,9 +174,9 @@ fileprivate func bjs_Animatable_getAnimations_extern(_ self: Int32, _ options: I
 }
 
 func _$Animatable_animate(_ self: JSObject, _ keyframes: JSObject, _ options: JSObject) throws(JSException) -> JSObject {
-    let selfValue = self.bridgeJSLowerParameter()
-    let keyframesValue = keyframes.bridgeJSLowerParameter()
     let optionsValue = options.bridgeJSLowerParameter()
+    let keyframesValue = keyframes.bridgeJSLowerParameter()
+    let selfValue = self.bridgeJSLowerParameter()
     let ret = bjs_Animatable_animate(selfValue, keyframesValue, optionsValue)
     if let error = _swift_js_take_exception() {
         throw error
@@ -185,8 +185,8 @@ func _$Animatable_animate(_ self: JSObject, _ keyframes: JSObject, _ options: JS
 }
 
 func _$Animatable_getAnimations(_ self: JSObject, _ options: JSObject) throws(JSException) -> JSObject {
-    let selfValue = self.bridgeJSLowerParameter()
     let optionsValue = options.bridgeJSLowerParameter()
+    let selfValue = self.bridgeJSLowerParameter()
     let ret = bjs_Animatable_getAnimations(selfValue, optionsValue)
     if let error = _swift_js_take_exception() {
         throw error
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/JSImportBareModule.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/JSImportBareModule.json
new file mode 100644
index 000000000..5aebf1ac7
--- /dev/null
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/JSImportBareModule.json
@@ -0,0 +1,232 @@
+{
+  "imported" : {
+    "children" : [
+      {
+        "functions" : [
+          {
+            "accessLevel" : "internal",
+            "effects" : {
+              "isAsync" : false,
+              "isStatic" : false,
+              "isThrows" : true
+            },
+            "from" : {
+              "kind" : "module",
+              "specifier" : "node:path"
+            },
+            "jsName" : "basename",
+            "name" : "nodeBasename",
+            "parameters" : [
+              {
+                "name" : "path",
+                "type" : {
+                  "string" : {
+
+                  }
+                }
+              }
+            ],
+            "returnType" : {
+              "string" : {
+
+              }
+            }
+          },
+          {
+            "accessLevel" : "internal",
+            "effects" : {
+              "isAsync" : false,
+              "isStatic" : false,
+              "isThrows" : true
+            },
+            "from" : {
+              "kind" : "module",
+              "specifier" : "node:path"
+            },
+            "jsName" : "dirname",
+            "name" : "nodeDirname",
+            "parameters" : [
+              {
+                "name" : "path",
+                "type" : {
+                  "string" : {
+
+                  }
+                }
+              }
+            ],
+            "returnType" : {
+              "string" : {
+
+              }
+            }
+          },
+          {
+            "accessLevel" : "internal",
+            "effects" : {
+              "isAsync" : false,
+              "isStatic" : false,
+              "isThrows" : true
+            },
+            "from" : {
+              "kind" : "module",
+              "specifier" : "default-export-package"
+            },
+            "jsName" : "default",
+            "name" : "callDefaultExport",
+            "parameters" : [
+              {
+                "name" : "value",
+                "type" : {
+                  "integer" : {
+                    "_0" : {
+                      "isSigned" : true,
+                      "width" : "word"
+                    }
+                  }
+                }
+              }
+            ],
+            "returnType" : {
+              "integer" : {
+                "_0" : {
+                  "isSigned" : true,
+                  "width" : "word"
+                }
+              }
+            }
+          }
+        ],
+        "globalGetters" : [
+          {
+            "accessLevel" : "internal",
+            "from" : {
+              "kind" : "module",
+              "specifier" : "some-package"
+            },
+            "jsName" : "version",
+            "name" : "packageVersion",
+            "type" : {
+              "string" : {
+
+              }
+            }
+          },
+          {
+            "accessLevel" : "internal",
+            "from" : {
+              "kind" : "snippet",
+              "path" : "\/Modules\/DefaultExport.mjs"
+            },
+            "jsName" : "default",
+            "name" : "localDefaultExport",
+            "type" : {
+              "jsObject" : {
+
+              }
+            }
+          }
+        ],
+        "types" : [
+          {
+            "accessLevel" : "internal",
+            "constructor" : {
+              "accessLevel" : "internal",
+              "parameters" : [
+                {
+                  "name" : "value",
+                  "type" : {
+                    "integer" : {
+                      "_0" : {
+                        "isSigned" : true,
+                        "width" : "word"
+                      }
+                    }
+                  }
+                }
+              ]
+            },
+            "from" : {
+              "kind" : "module",
+              "specifier" : "@scope\/package"
+            },
+            "getters" : [
+              {
+                "accessLevel" : "internal",
+                "name" : "size",
+                "type" : {
+                  "integer" : {
+                    "_0" : {
+                      "isSigned" : true,
+                      "width" : "word"
+                    }
+                  }
+                }
+              }
+            ],
+            "jsName" : "File",
+            "methods" : [
+              {
+                "accessLevel" : "internal",
+                "effects" : {
+                  "isAsync" : false,
+                  "isStatic" : false,
+                  "isThrows" : true
+                },
+                "name" : "read",
+                "parameters" : [
+
+                ],
+                "returnType" : {
+                  "integer" : {
+                    "_0" : {
+                      "isSigned" : true,
+                      "width" : "word"
+                    }
+                  }
+                }
+              }
+            ],
+            "name" : "ScopedFile",
+            "setters" : [
+
+            ],
+            "staticMethods" : [
+              {
+                "accessLevel" : "internal",
+                "effects" : {
+                  "isAsync" : false,
+                  "isStatic" : false,
+                  "isThrows" : true
+                },
+                "name" : "create",
+                "parameters" : [
+                  {
+                    "name" : "value",
+                    "type" : {
+                      "integer" : {
+                        "_0" : {
+                          "isSigned" : true,
+                          "width" : "word"
+                        }
+                      }
+                    }
+                  }
+                ],
+                "returnType" : {
+                  "jsObject" : {
+                    "_0" : "ScopedFile"
+                  }
+                }
+              }
+            ]
+          }
+        ]
+      }
+    ]
+  },
+  "moduleName" : "TestModule",
+  "usedExternalModules" : [
+
+  ]
+}
\ No newline at end of file
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/JSImportBareModule.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/JSImportBareModule.swift
new file mode 100644
index 000000000..4baf8d0f0
--- /dev/null
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/JSImportBareModule.swift
@@ -0,0 +1,192 @@
+#if arch(wasm32)
+@_extern(wasm, module: "TestModule", name: "bjs_packageVersion_get")
+fileprivate func bjs_packageVersion_get_extern() -> Int32
+#else
+fileprivate func bjs_packageVersion_get_extern() -> Int32 {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func bjs_packageVersion_get() -> Int32 {
+    return bjs_packageVersion_get_extern()
+}
+
+func _$packageVersion_get() throws(JSException) -> String {
+    let ret = bjs_packageVersion_get()
+    if let error = _swift_js_take_exception() {
+        throw error
+    }
+    return String.bridgeJSLiftReturn(ret)
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "TestModule", name: "bjs_localDefaultExport_get")
+fileprivate func bjs_localDefaultExport_get_extern() -> Int32
+#else
+fileprivate func bjs_localDefaultExport_get_extern() -> Int32 {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func bjs_localDefaultExport_get() -> Int32 {
+    return bjs_localDefaultExport_get_extern()
+}
+
+func _$localDefaultExport_get() throws(JSException) -> JSObject {
+    let ret = bjs_localDefaultExport_get()
+    if let error = _swift_js_take_exception() {
+        throw error
+    }
+    return JSObject.bridgeJSLiftReturn(ret)
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "TestModule", name: "bjs_nodeBasename")
+fileprivate func bjs_nodeBasename_extern(_ pathBytes: Int32, _ pathLength: Int32) -> Int32
+#else
+fileprivate func bjs_nodeBasename_extern(_ pathBytes: Int32, _ pathLength: Int32) -> Int32 {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func bjs_nodeBasename(_ pathBytes: Int32, _ pathLength: Int32) -> Int32 {
+    return bjs_nodeBasename_extern(pathBytes, pathLength)
+}
+
+func _$nodeBasename(_ path: String) throws(JSException) -> String {
+    let ret0 = path.bridgeJSWithLoweredParameter { (pathBytes, pathLength) in
+        let ret = bjs_nodeBasename(pathBytes, pathLength)
+        return ret
+    }
+    let ret = ret0
+    if let error = _swift_js_take_exception() {
+        throw error
+    }
+    return String.bridgeJSLiftReturn(ret)
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "TestModule", name: "bjs_nodeDirname")
+fileprivate func bjs_nodeDirname_extern(_ pathBytes: Int32, _ pathLength: Int32) -> Int32
+#else
+fileprivate func bjs_nodeDirname_extern(_ pathBytes: Int32, _ pathLength: Int32) -> Int32 {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func bjs_nodeDirname(_ pathBytes: Int32, _ pathLength: Int32) -> Int32 {
+    return bjs_nodeDirname_extern(pathBytes, pathLength)
+}
+
+func _$nodeDirname(_ path: String) throws(JSException) -> String {
+    let ret0 = path.bridgeJSWithLoweredParameter { (pathBytes, pathLength) in
+        let ret = bjs_nodeDirname(pathBytes, pathLength)
+        return ret
+    }
+    let ret = ret0
+    if let error = _swift_js_take_exception() {
+        throw error
+    }
+    return String.bridgeJSLiftReturn(ret)
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "TestModule", name: "bjs_callDefaultExport")
+fileprivate func bjs_callDefaultExport_extern(_ value: Int32) -> Int32
+#else
+fileprivate func bjs_callDefaultExport_extern(_ value: Int32) -> Int32 {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func bjs_callDefaultExport(_ value: Int32) -> Int32 {
+    return bjs_callDefaultExport_extern(value)
+}
+
+func _$callDefaultExport(_ value: Int) throws(JSException) -> Int {
+    let valueValue = value.bridgeJSLowerParameter()
+    let ret = bjs_callDefaultExport(valueValue)
+    if let error = _swift_js_take_exception() {
+        throw error
+    }
+    return Int.bridgeJSLiftReturn(ret)
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "TestModule", name: "bjs_ScopedFile_init")
+fileprivate func bjs_ScopedFile_init_extern(_ value: Int32) -> Int32
+#else
+fileprivate func bjs_ScopedFile_init_extern(_ value: Int32) -> Int32 {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func bjs_ScopedFile_init(_ value: Int32) -> Int32 {
+    return bjs_ScopedFile_init_extern(value)
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "TestModule", name: "bjs_ScopedFile_create_static")
+fileprivate func bjs_ScopedFile_create_static_extern(_ value: Int32) -> Int32
+#else
+fileprivate func bjs_ScopedFile_create_static_extern(_ value: Int32) -> Int32 {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func bjs_ScopedFile_create_static(_ value: Int32) -> Int32 {
+    return bjs_ScopedFile_create_static_extern(value)
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "TestModule", name: "bjs_ScopedFile_size_get")
+fileprivate func bjs_ScopedFile_size_get_extern(_ self: Int32) -> Int32
+#else
+fileprivate func bjs_ScopedFile_size_get_extern(_ self: Int32) -> Int32 {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func bjs_ScopedFile_size_get(_ self: Int32) -> Int32 {
+    return bjs_ScopedFile_size_get_extern(self)
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "TestModule", name: "bjs_ScopedFile_read")
+fileprivate func bjs_ScopedFile_read_extern(_ self: Int32) -> Int32
+#else
+fileprivate func bjs_ScopedFile_read_extern(_ self: Int32) -> Int32 {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func bjs_ScopedFile_read(_ self: Int32) -> Int32 {
+    return bjs_ScopedFile_read_extern(self)
+}
+
+func _$ScopedFile_init(_ value: Int) throws(JSException) -> JSObject {
+    let valueValue = value.bridgeJSLowerParameter()
+    let ret = bjs_ScopedFile_init(valueValue)
+    if let error = _swift_js_take_exception() {
+        throw error
+    }
+    return JSObject.bridgeJSLiftReturn(ret)
+}
+
+func _$ScopedFile_create(_ value: Int) throws(JSException) -> ScopedFile {
+    let valueValue = value.bridgeJSLowerParameter()
+    let ret = bjs_ScopedFile_create_static(valueValue)
+    if let error = _swift_js_take_exception() {
+        throw error
+    }
+    return ScopedFile.bridgeJSLiftReturn(ret)
+}
+
+func _$ScopedFile_size_get(_ self: JSObject) throws(JSException) -> Int {
+    let selfValue = self.bridgeJSLowerParameter()
+    let ret = bjs_ScopedFile_size_get(selfValue)
+    if let error = _swift_js_take_exception() {
+        throw error
+    }
+    return Int.bridgeJSLiftReturn(ret)
+}
+
+func _$ScopedFile_read(_ self: JSObject) throws(JSException) -> Int {
+    let selfValue = self.bridgeJSLowerParameter()
+    let ret = bjs_ScopedFile_read(selfValue)
+    if let error = _swift_js_take_exception() {
+        throw error
+    }
+    return Int.bridgeJSLiftReturn(ret)
+}
\ No newline at end of file
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/JSImportBareModuleFallback.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/JSImportBareModuleFallback.json
new file mode 100644
index 000000000..451d21402
--- /dev/null
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/JSImportBareModuleFallback.json
@@ -0,0 +1,95 @@
+{
+  "imported" : {
+    "children" : [
+      {
+        "functions" : [
+          {
+            "accessLevel" : "internal",
+            "effects" : {
+              "isAsync" : false,
+              "isStatic" : false,
+              "isThrows" : true
+            },
+            "from" : {
+              "kind" : "module",
+              "specifier" : "weird-package"
+            },
+            "jsName" : "kebab-case-function",
+            "name" : "kebabCaseFunction",
+            "parameters" : [
+
+            ],
+            "returnType" : {
+              "integer" : {
+                "_0" : {
+                  "isSigned" : true,
+                  "width" : "word"
+                }
+              }
+            }
+          },
+          {
+            "accessLevel" : "internal",
+            "effects" : {
+              "isAsync" : false,
+              "isStatic" : false,
+              "isThrows" : true
+            },
+            "from" : {
+              "kind" : "module",
+              "specifier" : "node:path"
+            },
+            "jsName" : "join",
+            "name" : "joinPaths",
+            "parameters" : [
+              {
+                "name" : "lhs",
+                "type" : {
+                  "string" : {
+
+                  }
+                }
+              },
+              {
+                "name" : "rhs",
+                "type" : {
+                  "string" : {
+
+                  }
+                }
+              }
+            ],
+            "returnType" : {
+              "string" : {
+
+              }
+            }
+          }
+        ],
+        "globalGetters" : [
+          {
+            "accessLevel" : "internal",
+            "from" : {
+              "kind" : "module",
+              "specifier" : "weird-package"
+            },
+            "jsName" : "dashed-property",
+            "name" : "dashedProperty",
+            "type" : {
+              "string" : {
+
+              }
+            }
+          }
+        ],
+        "types" : [
+
+        ]
+      }
+    ]
+  },
+  "moduleName" : "TestModule",
+  "usedExternalModules" : [
+
+  ]
+}
\ No newline at end of file
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/JSImportBareModuleFallback.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/JSImportBareModuleFallback.swift
new file mode 100644
index 000000000..7780b5eb0
--- /dev/null
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/JSImportBareModuleFallback.swift
@@ -0,0 +1,66 @@
+#if arch(wasm32)
+@_extern(wasm, module: "TestModule", name: "bjs_dashedProperty_get")
+fileprivate func bjs_dashedProperty_get_extern() -> Int32
+#else
+fileprivate func bjs_dashedProperty_get_extern() -> Int32 {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func bjs_dashedProperty_get() -> Int32 {
+    return bjs_dashedProperty_get_extern()
+}
+
+func _$dashedProperty_get() throws(JSException) -> String {
+    let ret = bjs_dashedProperty_get()
+    if let error = _swift_js_take_exception() {
+        throw error
+    }
+    return String.bridgeJSLiftReturn(ret)
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "TestModule", name: "bjs_kebabCaseFunction")
+fileprivate func bjs_kebabCaseFunction_extern() -> Int32
+#else
+fileprivate func bjs_kebabCaseFunction_extern() -> Int32 {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func bjs_kebabCaseFunction() -> Int32 {
+    return bjs_kebabCaseFunction_extern()
+}
+
+func _$kebabCaseFunction() throws(JSException) -> Int {
+    let ret = bjs_kebabCaseFunction()
+    if let error = _swift_js_take_exception() {
+        throw error
+    }
+    return Int.bridgeJSLiftReturn(ret)
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "TestModule", name: "bjs_joinPaths")
+fileprivate func bjs_joinPaths_extern(_ lhsBytes: Int32, _ lhsLength: Int32, _ rhsBytes: Int32, _ rhsLength: Int32) -> Int32
+#else
+fileprivate func bjs_joinPaths_extern(_ lhsBytes: Int32, _ lhsLength: Int32, _ rhsBytes: Int32, _ rhsLength: Int32) -> Int32 {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func bjs_joinPaths(_ lhsBytes: Int32, _ lhsLength: Int32, _ rhsBytes: Int32, _ rhsLength: Int32) -> Int32 {
+    return bjs_joinPaths_extern(lhsBytes, lhsLength, rhsBytes, rhsLength)
+}
+
+func _$joinPaths(_ lhs: String, _ rhs: String) throws(JSException) -> String {
+    let ret0 = lhs.bridgeJSWithLoweredParameter { (lhsBytes, lhsLength) in
+        let ret1 = rhs.bridgeJSWithLoweredParameter { (rhsBytes, rhsLength) in
+            let ret = bjs_joinPaths(lhsBytes, lhsLength, rhsBytes, rhsLength)
+            return ret
+        }
+        return ret1
+    }
+    let ret = ret0
+    if let error = _swift_js_take_exception() {
+        throw error
+    }
+    return String.bridgeJSLiftReturn(ret)
+}
\ No newline at end of file
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/JSImportModule.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/JSImportModule.json
new file mode 100644
index 000000000..3d886fb9d
--- /dev/null
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/JSImportModule.json
@@ -0,0 +1,203 @@
+{
+  "imported" : {
+    "children" : [
+      {
+        "functions" : [
+          {
+            "accessLevel" : "internal",
+            "effects" : {
+              "isAsync" : false,
+              "isStatic" : false,
+              "isThrows" : true
+            },
+            "from" : {
+              "kind" : "snippet",
+              "path" : "\/Modules\/JSImportModule.mjs"
+            },
+            "name" : "moduleAdd",
+            "parameters" : [
+              {
+                "name" : "lhs",
+                "type" : {
+                  "integer" : {
+                    "_0" : {
+                      "isSigned" : true,
+                      "width" : "word"
+                    }
+                  }
+                }
+              },
+              {
+                "name" : "rhs",
+                "type" : {
+                  "integer" : {
+                    "_0" : {
+                      "isSigned" : true,
+                      "width" : "word"
+                    }
+                  }
+                }
+              }
+            ],
+            "returnType" : {
+              "integer" : {
+                "_0" : {
+                  "isSigned" : true,
+                  "width" : "word"
+                }
+              }
+            }
+          },
+          {
+            "accessLevel" : "internal",
+            "effects" : {
+              "isAsync" : false,
+              "isStatic" : false,
+              "isThrows" : true
+            },
+            "from" : {
+              "kind" : "snippet",
+              "path" : "\/Modules\/JSImportModule.mjs"
+            },
+            "jsName" : "renamedFunction",
+            "name" : "moduleRenamed",
+            "parameters" : [
+
+            ],
+            "returnType" : {
+              "string" : {
+
+              }
+            }
+          }
+        ],
+        "globalGetters" : [
+          {
+            "accessLevel" : "internal",
+            "from" : {
+              "kind" : "snippet",
+              "path" : "\/Modules\/JSImportModule.mjs"
+            },
+            "jsName" : "version",
+            "name" : "moduleVersion",
+            "type" : {
+              "string" : {
+
+              }
+            }
+          }
+        ],
+        "types" : [
+          {
+            "accessLevel" : "internal",
+            "constructor" : {
+              "accessLevel" : "internal",
+              "parameters" : [
+                {
+                  "name" : "value",
+                  "type" : {
+                    "integer" : {
+                      "_0" : {
+                        "isSigned" : true,
+                        "width" : "word"
+                      }
+                    }
+                  }
+                }
+              ]
+            },
+            "from" : {
+              "kind" : "snippet",
+              "path" : "\/Modules\/ModuleCounter.mjs"
+            },
+            "getters" : [
+              {
+                "accessLevel" : "internal",
+                "name" : "value",
+                "type" : {
+                  "integer" : {
+                    "_0" : {
+                      "isSigned" : true,
+                      "width" : "word"
+                    }
+                  }
+                }
+              }
+            ],
+            "methods" : [
+              {
+                "accessLevel" : "internal",
+                "effects" : {
+                  "isAsync" : false,
+                  "isStatic" : false,
+                  "isThrows" : true
+                },
+                "name" : "increment",
+                "parameters" : [
+
+                ],
+                "returnType" : {
+                  "integer" : {
+                    "_0" : {
+                      "isSigned" : true,
+                      "width" : "word"
+                    }
+                  }
+                }
+              }
+            ],
+            "name" : "ModuleCounter",
+            "setters" : [
+              {
+                "accessLevel" : "internal",
+                "functionName" : "value_set",
+                "name" : "value",
+                "type" : {
+                  "integer" : {
+                    "_0" : {
+                      "isSigned" : true,
+                      "width" : "word"
+                    }
+                  }
+                }
+              }
+            ],
+            "staticMethods" : [
+              {
+                "accessLevel" : "internal",
+                "effects" : {
+                  "isAsync" : false,
+                  "isStatic" : false,
+                  "isThrows" : true
+                },
+                "name" : "create",
+                "parameters" : [
+                  {
+                    "name" : "value",
+                    "type" : {
+                      "integer" : {
+                        "_0" : {
+                          "isSigned" : true,
+                          "width" : "word"
+                        }
+                      }
+                    }
+                  }
+                ],
+                "returnType" : {
+                  "jsObject" : {
+                    "_0" : "ModuleCounter"
+                  }
+                }
+              }
+            ]
+          }
+        ]
+      }
+    ]
+  },
+  "moduleName" : "TestModule",
+  "usedExternalModules" : [
+
+  ]
+}
\ No newline at end of file
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/JSImportModule.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/JSImportModule.swift
new file mode 100644
index 000000000..dc22aceb9
--- /dev/null
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/JSImportModule.swift
@@ -0,0 +1,166 @@
+#if arch(wasm32)
+@_extern(wasm, module: "TestModule", name: "bjs_moduleVersion_get")
+fileprivate func bjs_moduleVersion_get_extern() -> Int32
+#else
+fileprivate func bjs_moduleVersion_get_extern() -> Int32 {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func bjs_moduleVersion_get() -> Int32 {
+    return bjs_moduleVersion_get_extern()
+}
+
+func _$moduleVersion_get() throws(JSException) -> String {
+    let ret = bjs_moduleVersion_get()
+    if let error = _swift_js_take_exception() {
+        throw error
+    }
+    return String.bridgeJSLiftReturn(ret)
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "TestModule", name: "bjs_moduleAdd")
+fileprivate func bjs_moduleAdd_extern(_ lhs: Int32, _ rhs: Int32) -> Int32
+#else
+fileprivate func bjs_moduleAdd_extern(_ lhs: Int32, _ rhs: Int32) -> Int32 {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func bjs_moduleAdd(_ lhs: Int32, _ rhs: Int32) -> Int32 {
+    return bjs_moduleAdd_extern(lhs, rhs)
+}
+
+func _$moduleAdd(_ lhs: Int, _ rhs: Int) throws(JSException) -> Int {
+    let rhsValue = rhs.bridgeJSLowerParameter()
+    let lhsValue = lhs.bridgeJSLowerParameter()
+    let ret = bjs_moduleAdd(lhsValue, rhsValue)
+    if let error = _swift_js_take_exception() {
+        throw error
+    }
+    return Int.bridgeJSLiftReturn(ret)
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "TestModule", name: "bjs_moduleRenamed")
+fileprivate func bjs_moduleRenamed_extern() -> Int32
+#else
+fileprivate func bjs_moduleRenamed_extern() -> Int32 {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func bjs_moduleRenamed() -> Int32 {
+    return bjs_moduleRenamed_extern()
+}
+
+func _$moduleRenamed() throws(JSException) -> String {
+    let ret = bjs_moduleRenamed()
+    if let error = _swift_js_take_exception() {
+        throw error
+    }
+    return String.bridgeJSLiftReturn(ret)
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "TestModule", name: "bjs_ModuleCounter_init")
+fileprivate func bjs_ModuleCounter_init_extern(_ value: Int32) -> Int32
+#else
+fileprivate func bjs_ModuleCounter_init_extern(_ value: Int32) -> Int32 {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func bjs_ModuleCounter_init(_ value: Int32) -> Int32 {
+    return bjs_ModuleCounter_init_extern(value)
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "TestModule", name: "bjs_ModuleCounter_create_static")
+fileprivate func bjs_ModuleCounter_create_static_extern(_ value: Int32) -> Int32
+#else
+fileprivate func bjs_ModuleCounter_create_static_extern(_ value: Int32) -> Int32 {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func bjs_ModuleCounter_create_static(_ value: Int32) -> Int32 {
+    return bjs_ModuleCounter_create_static_extern(value)
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "TestModule", name: "bjs_ModuleCounter_value_get")
+fileprivate func bjs_ModuleCounter_value_get_extern(_ self: Int32) -> Int32
+#else
+fileprivate func bjs_ModuleCounter_value_get_extern(_ self: Int32) -> Int32 {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func bjs_ModuleCounter_value_get(_ self: Int32) -> Int32 {
+    return bjs_ModuleCounter_value_get_extern(self)
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "TestModule", name: "bjs_ModuleCounter_value_set")
+fileprivate func bjs_ModuleCounter_value_set_extern(_ self: Int32, _ newValue: Int32) -> Void
+#else
+fileprivate func bjs_ModuleCounter_value_set_extern(_ self: Int32, _ newValue: Int32) -> Void {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func bjs_ModuleCounter_value_set(_ self: Int32, _ newValue: Int32) -> Void {
+    return bjs_ModuleCounter_value_set_extern(self, newValue)
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "TestModule", name: "bjs_ModuleCounter_increment")
+fileprivate func bjs_ModuleCounter_increment_extern(_ self: Int32) -> Int32
+#else
+fileprivate func bjs_ModuleCounter_increment_extern(_ self: Int32) -> Int32 {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func bjs_ModuleCounter_increment(_ self: Int32) -> Int32 {
+    return bjs_ModuleCounter_increment_extern(self)
+}
+
+func _$ModuleCounter_init(_ value: Int) throws(JSException) -> JSObject {
+    let valueValue = value.bridgeJSLowerParameter()
+    let ret = bjs_ModuleCounter_init(valueValue)
+    if let error = _swift_js_take_exception() {
+        throw error
+    }
+    return JSObject.bridgeJSLiftReturn(ret)
+}
+
+func _$ModuleCounter_create(_ value: Int) throws(JSException) -> ModuleCounter {
+    let valueValue = value.bridgeJSLowerParameter()
+    let ret = bjs_ModuleCounter_create_static(valueValue)
+    if let error = _swift_js_take_exception() {
+        throw error
+    }
+    return ModuleCounter.bridgeJSLiftReturn(ret)
+}
+
+func _$ModuleCounter_value_get(_ self: JSObject) throws(JSException) -> Int {
+    let selfValue = self.bridgeJSLowerParameter()
+    let ret = bjs_ModuleCounter_value_get(selfValue)
+    if let error = _swift_js_take_exception() {
+        throw error
+    }
+    return Int.bridgeJSLiftReturn(ret)
+}
+
+func _$ModuleCounter_value_set(_ self: JSObject, _ newValue: Int) throws(JSException) -> Void {
+    let newValueValue = newValue.bridgeJSLowerParameter()
+    let selfValue = self.bridgeJSLowerParameter()
+    bjs_ModuleCounter_value_set(selfValue, newValueValue)
+    if let error = _swift_js_take_exception() {
+        throw error
+    }
+}
+
+func _$ModuleCounter_increment(_ self: JSObject) throws(JSException) -> Int {
+    let selfValue = self.bridgeJSLowerParameter()
+    let ret = bjs_ModuleCounter_increment(selfValue)
+    if let error = _swift_js_take_exception() {
+        throw error
+    }
+    return Int.bridgeJSLiftReturn(ret)
+}
\ No newline at end of file
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/JSNameOverride.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/JSNameOverride.json
new file mode 100644
index 000000000..c5cd01631
--- /dev/null
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/JSNameOverride.json
@@ -0,0 +1,524 @@
+{
+  "exported" : {
+    "aliases" : [
+
+    ],
+    "classes" : [
+      {
+        "constructor" : {
+          "abiName" : "bjs_RenamedMembers_init",
+          "effects" : {
+            "isAsync" : false,
+            "isStatic" : false,
+            "isThrows" : false
+          },
+          "parameters" : [
+            {
+              "label" : "title",
+              "name" : "title",
+              "type" : {
+                "string" : {
+
+                }
+              }
+            },
+            {
+              "label" : "count",
+              "name" : "count",
+              "type" : {
+                "integer" : {
+                  "_0" : {
+                    "isSigned" : true,
+                    "width" : "word"
+                  }
+                }
+              }
+            }
+          ]
+        },
+        "methods" : [
+          {
+            "abiName" : "bjs_RenamedMembers_makeGreeting",
+            "effects" : {
+              "isAsync" : false,
+              "isStatic" : false,
+              "isThrows" : false
+            },
+            "jsName" : "makeGreeting",
+            "name" : "greet",
+            "parameters" : [
+
+            ],
+            "returnType" : {
+              "string" : {
+
+              }
+            }
+          },
+          {
+            "abiName" : "bjs_RenamedMembers_static_makeDefault",
+            "effects" : {
+              "isAsync" : false,
+              "isStatic" : true,
+              "isThrows" : false
+            },
+            "jsName" : "makeDefault",
+            "name" : "createDefault",
+            "parameters" : [
+
+            ],
+            "returnType" : {
+              "swiftHeapObject" : {
+                "_0" : "RenamedMembers"
+              }
+            },
+            "staticContext" : {
+              "className" : {
+                "_0" : "RenamedMembers"
+              }
+            }
+          }
+        ],
+        "name" : "RenamedMembers",
+        "properties" : [
+          {
+            "isReadonly" : false,
+            "isStatic" : false,
+            "jsName" : "label",
+            "name" : "title",
+            "type" : {
+              "string" : {
+
+              }
+            }
+          },
+          {
+            "isReadonly" : true,
+            "isStatic" : false,
+            "jsName" : "total",
+            "name" : "count",
+            "type" : {
+              "integer" : {
+                "_0" : {
+                  "isSigned" : true,
+                  "width" : "word"
+                }
+              }
+            }
+          },
+          {
+            "isReadonly" : false,
+            "isStatic" : true,
+            "jsName" : "sharedTotal",
+            "name" : "sharedCount",
+            "staticContext" : {
+              "className" : {
+                "_0" : "RenamedMembers"
+              }
+            },
+            "type" : {
+              "integer" : {
+                "_0" : {
+                  "isSigned" : true,
+                  "width" : "word"
+                }
+              }
+            }
+          },
+          {
+            "isReadonly" : true,
+            "isStatic" : true,
+            "jsName" : "readOnlyLimit",
+            "name" : "limit",
+            "staticContext" : {
+              "className" : {
+                "_0" : "RenamedMembers"
+              }
+            },
+            "type" : {
+              "integer" : {
+                "_0" : {
+                  "isSigned" : true,
+                  "width" : "word"
+                }
+              }
+            }
+          }
+        ],
+        "swiftCallName" : "RenamedMembers"
+      }
+    ],
+    "enums" : [
+      {
+        "cases" : [
+          {
+            "associatedValues" : [
+
+            ],
+            "name" : "active"
+          },
+          {
+            "associatedValues" : [
+
+            ],
+            "name" : "inactive"
+          }
+        ],
+        "emitStyle" : "const",
+        "name" : "RenamedEnumMembers",
+        "staticMethods" : [
+          {
+            "abiName" : "bjs_RenamedEnumMembers_static_describeCase",
+            "effects" : {
+              "isAsync" : false,
+              "isStatic" : true,
+              "isThrows" : false
+            },
+            "jsName" : "describeCase",
+            "name" : "describe",
+            "parameters" : [
+
+            ],
+            "returnType" : {
+              "string" : {
+
+              }
+            },
+            "staticContext" : {
+              "enumName" : {
+                "_0" : "RenamedEnumMembers"
+              }
+            }
+          }
+        ],
+        "staticProperties" : [
+          {
+            "isReadonly" : false,
+            "isStatic" : true,
+            "jsName" : "currentDefault",
+            "name" : "defaultValue",
+            "staticContext" : {
+              "enumName" : {
+                "_0" : "RenamedEnumMembers"
+              }
+            },
+            "type" : {
+              "string" : {
+
+              }
+            }
+          }
+        ],
+        "swiftCallName" : "RenamedEnumMembers",
+        "tsFullPath" : "RenamedEnumMembers"
+      },
+      {
+        "cases" : [
+
+        ],
+        "emitStyle" : "const",
+        "name" : "RenamedNamespaceMembers",
+        "staticMethods" : [
+          {
+            "abiName" : "bjs_RenamedNamespaceMembers_static_plus",
+            "effects" : {
+              "isAsync" : false,
+              "isStatic" : true,
+              "isThrows" : false
+            },
+            "jsName" : "plus",
+            "name" : "add",
+            "namespace" : [
+              "RenamedNamespaceMembers"
+            ],
+            "parameters" : [
+              {
+                "label" : "_",
+                "name" : "a",
+                "type" : {
+                  "integer" : {
+                    "_0" : {
+                      "isSigned" : true,
+                      "width" : "word"
+                    }
+                  }
+                }
+              },
+              {
+                "label" : "_",
+                "name" : "b",
+                "type" : {
+                  "integer" : {
+                    "_0" : {
+                      "isSigned" : true,
+                      "width" : "word"
+                    }
+                  }
+                }
+              }
+            ],
+            "returnType" : {
+              "integer" : {
+                "_0" : {
+                  "isSigned" : true,
+                  "width" : "word"
+                }
+              }
+            },
+            "staticContext" : {
+              "namespaceEnum" : {
+                "_0" : "RenamedNamespaceMembers"
+              }
+            }
+          }
+        ],
+        "staticProperties" : [
+          {
+            "isReadonly" : false,
+            "isStatic" : true,
+            "jsName" : "theAnswer",
+            "name" : "answer",
+            "namespace" : [
+              "RenamedNamespaceMembers"
+            ],
+            "staticContext" : {
+              "namespaceEnum" : {
+                "_0" : "RenamedNamespaceMembers"
+              }
+            },
+            "type" : {
+              "integer" : {
+                "_0" : {
+                  "isSigned" : true,
+                  "width" : "word"
+                }
+              }
+            }
+          }
+        ],
+        "swiftCallName" : "RenamedNamespaceMembers",
+        "tsFullPath" : "RenamedNamespaceMembers"
+      }
+    ],
+    "exposeToGlobal" : false,
+    "functions" : [
+      {
+        "abiName" : "bjs_makeGreeting",
+        "effects" : {
+          "isAsync" : false,
+          "isStatic" : false,
+          "isThrows" : false
+        },
+        "jsName" : "makeGreeting",
+        "name" : "renderGreeting",
+        "parameters" : [
+          {
+            "label" : "name",
+            "name" : "name",
+            "type" : {
+              "string" : {
+
+              }
+            }
+          }
+        ],
+        "returnType" : {
+          "string" : {
+
+          }
+        }
+      },
+      {
+        "abiName" : "bjs_greetName",
+        "effects" : {
+          "isAsync" : false,
+          "isStatic" : false,
+          "isThrows" : false
+        },
+        "jsName" : "greetName",
+        "name" : "greet",
+        "parameters" : [
+          {
+            "label" : "_",
+            "name" : "name",
+            "type" : {
+              "string" : {
+
+              }
+            }
+          }
+        ],
+        "returnType" : {
+          "string" : {
+
+          }
+        }
+      },
+      {
+        "abiName" : "bjs_greetCount",
+        "effects" : {
+          "isAsync" : false,
+          "isStatic" : false,
+          "isThrows" : false
+        },
+        "jsName" : "greetCount",
+        "name" : "greet",
+        "parameters" : [
+          {
+            "label" : "_",
+            "name" : "count",
+            "type" : {
+              "integer" : {
+                "_0" : {
+                  "isSigned" : true,
+                  "width" : "word"
+                }
+              }
+            }
+          }
+        ],
+        "returnType" : {
+          "string" : {
+
+          }
+        }
+      },
+      {
+        "abiName" : "bjs_Utils_Text_namespacedRenamed",
+        "effects" : {
+          "isAsync" : false,
+          "isStatic" : false,
+          "isThrows" : false
+        },
+        "jsName" : "namespacedRenamed",
+        "name" : "namespacedFunction",
+        "namespace" : [
+          "Utils",
+          "Text"
+        ],
+        "parameters" : [
+
+        ],
+        "returnType" : {
+          "integer" : {
+            "_0" : {
+              "isSigned" : true,
+              "width" : "word"
+            }
+          }
+        }
+      }
+    ],
+    "protocols" : [
+
+    ],
+    "structs" : [
+      {
+        "methods" : [
+          {
+            "abiName" : "bjs_RenamedVector_magnitude",
+            "effects" : {
+              "isAsync" : false,
+              "isStatic" : false,
+              "isThrows" : false
+            },
+            "jsName" : "magnitude",
+            "name" : "length",
+            "parameters" : [
+
+            ],
+            "returnType" : {
+              "double" : {
+
+              }
+            }
+          },
+          {
+            "abiName" : "bjs_RenamedVector_static_fromPolar",
+            "effects" : {
+              "isAsync" : false,
+              "isStatic" : true,
+              "isThrows" : false
+            },
+            "jsName" : "fromPolar",
+            "name" : "polar",
+            "parameters" : [
+              {
+                "label" : "radius",
+                "name" : "radius",
+                "type" : {
+                  "double" : {
+
+                  }
+                }
+              },
+              {
+                "label" : "angle",
+                "name" : "angle",
+                "type" : {
+                  "double" : {
+
+                  }
+                }
+              }
+            ],
+            "returnType" : {
+              "swiftStruct" : {
+                "_0" : "RenamedVector"
+              }
+            },
+            "staticContext" : {
+              "structName" : {
+                "_0" : "RenamedVector"
+              }
+            }
+          }
+        ],
+        "name" : "RenamedVector",
+        "properties" : [
+          {
+            "isReadonly" : true,
+            "isStatic" : false,
+            "name" : "dx",
+            "type" : {
+              "double" : {
+
+              }
+            }
+          },
+          {
+            "isReadonly" : true,
+            "isStatic" : false,
+            "name" : "dy",
+            "type" : {
+              "double" : {
+
+              }
+            }
+          },
+          {
+            "isReadonly" : true,
+            "isStatic" : true,
+            "jsName" : "originVector",
+            "name" : "origin",
+            "staticContext" : {
+              "structName" : {
+                "_0" : "RenamedVector"
+              }
+            },
+            "type" : {
+              "swiftStruct" : {
+                "_0" : "RenamedVector"
+              }
+            }
+          }
+        ],
+        "swiftCallName" : "RenamedVector"
+      }
+    ]
+  },
+  "moduleName" : "TestModule",
+  "usedExternalModules" : [
+
+  ]
+}
\ No newline at end of file
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/JSNameOverride.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/JSNameOverride.swift
new file mode 100644
index 000000000..8e01bca22
--- /dev/null
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/JSNameOverride.swift
@@ -0,0 +1,375 @@
+extension RenamedEnumMembers: _BridgedSwiftCaseEnum {
+    @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameter() -> Int32 {
+        return bridgeJSRawValue
+    }
+    @_spi(BridgeJS) @_transparent public static func bridgeJSLiftReturn(_ value: Int32) -> RenamedEnumMembers {
+        return bridgeJSLiftParameter(value)
+    }
+    @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter(_ value: Int32) -> RenamedEnumMembers {
+        return RenamedEnumMembers(bridgeJSRawValue: value)!
+    }
+    @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() -> Int32 {
+        return bridgeJSLowerParameter()
+    }
+
+    @_spi(BridgeJS) @usableFromInline init?(bridgeJSRawValue: Int32) {
+        switch bridgeJSRawValue {
+        case 0:
+            self = .active
+        case 1:
+            self = .inactive
+        default:
+            return nil
+        }
+    }
+
+    @_spi(BridgeJS) @usableFromInline var bridgeJSRawValue: Int32 {
+        switch self {
+        case .active:
+            return 0
+        case .inactive:
+            return 1
+        }
+    }
+}
+
+@_expose(wasm, "bjs_RenamedEnumMembers_static_describeCase")
+@_cdecl("bjs_RenamedEnumMembers_static_describeCase")
+public func _bjs_RenamedEnumMembers_static_describeCase() -> Void {
+    #if arch(wasm32)
+    let ret = RenamedEnumMembers.describe()
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_RenamedEnumMembers_static_defaultValue_get")
+@_cdecl("bjs_RenamedEnumMembers_static_defaultValue_get")
+public func _bjs_RenamedEnumMembers_static_defaultValue_get() -> Void {
+    #if arch(wasm32)
+    let ret = RenamedEnumMembers.defaultValue
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_RenamedEnumMembers_static_defaultValue_set")
+@_cdecl("bjs_RenamedEnumMembers_static_defaultValue_set")
+public func _bjs_RenamedEnumMembers_static_defaultValue_set(_ valueBytes: Int32, _ valueLength: Int32) -> Void {
+    #if arch(wasm32)
+    RenamedEnumMembers.defaultValue = String.bridgeJSLiftParameter(valueBytes, valueLength)
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_RenamedNamespaceMembers_static_plus")
+@_cdecl("bjs_RenamedNamespaceMembers_static_plus")
+public func _bjs_RenamedNamespaceMembers_static_plus(_ a: Int32, _ b: Int32) -> Int32 {
+    #if arch(wasm32)
+    let ret = RenamedNamespaceMembers.add(_: Int.bridgeJSLiftParameter(a), _: Int.bridgeJSLiftParameter(b))
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_RenamedNamespaceMembers_static_answer_get")
+@_cdecl("bjs_RenamedNamespaceMembers_static_answer_get")
+public func _bjs_RenamedNamespaceMembers_static_answer_get() -> Int32 {
+    #if arch(wasm32)
+    let ret = RenamedNamespaceMembers.answer
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_RenamedNamespaceMembers_static_answer_set")
+@_cdecl("bjs_RenamedNamespaceMembers_static_answer_set")
+public func _bjs_RenamedNamespaceMembers_static_answer_set(_ value: Int32) -> Void {
+    #if arch(wasm32)
+    RenamedNamespaceMembers.answer = Int.bridgeJSLiftParameter(value)
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+extension RenamedVector: _BridgedSwiftStruct {
+    @_spi(BridgeJS) @_transparent public static func bridgeJSStackPop() -> RenamedVector {
+        let dy = Double.bridgeJSStackPop()
+        let dx = Double.bridgeJSStackPop()
+        return RenamedVector(dx: dx, dy: dy)
+    }
+
+    @_spi(BridgeJS) @_transparent public consuming func bridgeJSStackPush() {
+        self.dx.bridgeJSStackPush()
+        self.dy.bridgeJSStackPush()
+    }
+
+    init(unsafelyCopying jsObject: JSObject) {
+        _bjs_struct_lower_RenamedVector(jsObject.bridgeJSLowerParameter())
+        self = Self.bridgeJSStackPop()
+    }
+
+    func toJSObject() -> JSObject {
+        let __bjs_self = self
+        __bjs_self.bridgeJSStackPush()
+        return JSObject(id: UInt32(bitPattern: _bjs_struct_lift_RenamedVector()))
+    }
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "swift_js_struct_lower_RenamedVector")
+fileprivate func _bjs_struct_lower_RenamedVector_extern(_ objectId: Int32) -> Void
+#else
+fileprivate func _bjs_struct_lower_RenamedVector_extern(_ objectId: Int32) -> Void {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func _bjs_struct_lower_RenamedVector(_ objectId: Int32) -> Void {
+    return _bjs_struct_lower_RenamedVector_extern(objectId)
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "swift_js_struct_lift_RenamedVector")
+fileprivate func _bjs_struct_lift_RenamedVector_extern() -> Int32
+#else
+fileprivate func _bjs_struct_lift_RenamedVector_extern() -> Int32 {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func _bjs_struct_lift_RenamedVector() -> Int32 {
+    return _bjs_struct_lift_RenamedVector_extern()
+}
+
+@_expose(wasm, "bjs_RenamedVector_static_origin_get")
+@_cdecl("bjs_RenamedVector_static_origin_get")
+public func _bjs_RenamedVector_static_origin_get() -> Void {
+    #if arch(wasm32)
+    let ret = RenamedVector.origin
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_RenamedVector_magnitude")
+@_cdecl("bjs_RenamedVector_magnitude")
+public func _bjs_RenamedVector_magnitude() -> Float64 {
+    #if arch(wasm32)
+    let ret = RenamedVector.bridgeJSLiftParameter().length()
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_RenamedVector_static_fromPolar")
+@_cdecl("bjs_RenamedVector_static_fromPolar")
+public func _bjs_RenamedVector_static_fromPolar(_ radius: Float64, _ angle: Float64) -> Void {
+    #if arch(wasm32)
+    let ret = RenamedVector.polar(radius: Double.bridgeJSLiftParameter(radius), angle: Double.bridgeJSLiftParameter(angle))
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_makeGreeting")
+@_cdecl("bjs_makeGreeting")
+public func _bjs_makeGreeting(_ nameBytes: Int32, _ nameLength: Int32) -> Void {
+    #if arch(wasm32)
+    let ret = renderGreeting(name: String.bridgeJSLiftParameter(nameBytes, nameLength))
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_greetName")
+@_cdecl("bjs_greetName")
+public func _bjs_greetName(_ nameBytes: Int32, _ nameLength: Int32) -> Void {
+    #if arch(wasm32)
+    let ret = greet(_: String.bridgeJSLiftParameter(nameBytes, nameLength))
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_greetCount")
+@_cdecl("bjs_greetCount")
+public func _bjs_greetCount(_ count: Int32) -> Void {
+    #if arch(wasm32)
+    let ret = greet(_: Int.bridgeJSLiftParameter(count))
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_Utils_Text_namespacedRenamed")
+@_cdecl("bjs_Utils_Text_namespacedRenamed")
+public func _bjs_Utils_Text_namespacedRenamed() -> Int32 {
+    #if arch(wasm32)
+    let ret = namespacedFunction()
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_RenamedMembers_init")
+@_cdecl("bjs_RenamedMembers_init")
+public func _bjs_RenamedMembers_init(_ titleBytes: Int32, _ titleLength: Int32, _ count: Int32) -> UnsafeMutableRawPointer {
+    #if arch(wasm32)
+    let ret = RenamedMembers(title: String.bridgeJSLiftParameter(titleBytes, titleLength), count: Int.bridgeJSLiftParameter(count))
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_RenamedMembers_makeGreeting")
+@_cdecl("bjs_RenamedMembers_makeGreeting")
+public func _bjs_RenamedMembers_makeGreeting(_ _self: UnsafeMutableRawPointer) -> Void {
+    #if arch(wasm32)
+    let ret = RenamedMembers.bridgeJSLiftParameter(_self).greet()
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_RenamedMembers_static_makeDefault")
+@_cdecl("bjs_RenamedMembers_static_makeDefault")
+public func _bjs_RenamedMembers_static_makeDefault() -> UnsafeMutableRawPointer {
+    #if arch(wasm32)
+    let ret = RenamedMembers.createDefault()
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_RenamedMembers_title_get")
+@_cdecl("bjs_RenamedMembers_title_get")
+public func _bjs_RenamedMembers_title_get(_ _self: UnsafeMutableRawPointer) -> Void {
+    #if arch(wasm32)
+    let ret = RenamedMembers.bridgeJSLiftParameter(_self).title
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_RenamedMembers_title_set")
+@_cdecl("bjs_RenamedMembers_title_set")
+public func _bjs_RenamedMembers_title_set(_ _self: UnsafeMutableRawPointer, _ valueBytes: Int32, _ valueLength: Int32) -> Void {
+    #if arch(wasm32)
+    RenamedMembers.bridgeJSLiftParameter(_self).title = String.bridgeJSLiftParameter(valueBytes, valueLength)
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_RenamedMembers_count_get")
+@_cdecl("bjs_RenamedMembers_count_get")
+public func _bjs_RenamedMembers_count_get(_ _self: UnsafeMutableRawPointer) -> Int32 {
+    #if arch(wasm32)
+    let ret = RenamedMembers.bridgeJSLiftParameter(_self).count
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_RenamedMembers_static_sharedCount_get")
+@_cdecl("bjs_RenamedMembers_static_sharedCount_get")
+public func _bjs_RenamedMembers_static_sharedCount_get() -> Int32 {
+    #if arch(wasm32)
+    let ret = RenamedMembers.sharedCount
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_RenamedMembers_static_sharedCount_set")
+@_cdecl("bjs_RenamedMembers_static_sharedCount_set")
+public func _bjs_RenamedMembers_static_sharedCount_set(_ value: Int32) -> Void {
+    #if arch(wasm32)
+    RenamedMembers.sharedCount = Int.bridgeJSLiftParameter(value)
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_RenamedMembers_static_limit_get")
+@_cdecl("bjs_RenamedMembers_static_limit_get")
+public func _bjs_RenamedMembers_static_limit_get() -> Int32 {
+    #if arch(wasm32)
+    let ret = RenamedMembers.limit
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_RenamedMembers_deinit")
+@_cdecl("bjs_RenamedMembers_deinit")
+public func _bjs_RenamedMembers_deinit(_ pointer: UnsafeMutableRawPointer) -> Void {
+    #if arch(wasm32)
+    Unmanaged<RenamedMembers>.fromOpaque(pointer).release()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+extension RenamedMembers: ConvertibleToJSValue, _BridgedSwiftHeapObject, _BridgedSwiftProtocolExportable {
+    var jsValue: JSValue {
+        return .object(JSObject(id: UInt32(bitPattern: _bjs_RenamedMembers_wrap(Unmanaged.passRetained(self).toOpaque()))))
+    }
+    consuming func bridgeJSLowerAsProtocolReturn() -> Int32 {
+        _bjs_RenamedMembers_wrap(Unmanaged.passRetained(self).toOpaque())
+    }
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "TestModule", name: "bjs_RenamedMembers_wrap")
+fileprivate func _bjs_RenamedMembers_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32
+#else
+fileprivate func _bjs_RenamedMembers_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func _bjs_RenamedMembers_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 {
+    return _bjs_RenamedMembers_wrap_extern(pointer)
+}
+
+extension RenamedVector: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = RenamedVector.bridgeJSMakeTypeHandle()
+}
+
+extension RenamedEnumMembers: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = RenamedEnumMembers.bridgeJSMakeTypeHandle()
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "bjs_TestModule_register_type_handles")
+fileprivate func _bjs_TestModule_register_type_handles_extern(_ base: UnsafePointer<Int32>?, _ count: Int32)
+
+@_expose(wasm, "bjs_TestModule_register_type_handles")
+public func _bjs_TestModule_register_type_handles() {
+    let typeIds: [Int32] = [
+        RenamedVector.bridgeJSTypeID,
+        RenamedEnumMembers.bridgeJSTypeID,
+    ]
+    typeIds.withUnsafeBufferPointer { buffer in
+        _bjs_TestModule_register_type_handles_extern(buffer.baseAddress, Int32(buffer.count))
+    }
+}
+#endif
\ No newline at end of file
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/JSTypedArrayTypes.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/JSTypedArrayTypes.json
index a7b9c8623..5d4425096 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/JSTypedArrayTypes.json
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/JSTypedArrayTypes.json
@@ -1,5 +1,8 @@
 {
   "exported" : {
+    "aliases" : [
+
+    ],
     "classes" : [
 
     ],
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/JSValue.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/JSValue.json
index f0cd29565..eba5d34fb 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/JSValue.json
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/JSValue.json
@@ -1,5 +1,8 @@
 {
   "exported" : {
+    "aliases" : [
+
+    ],
     "classes" : [
       {
         "constructor" : {
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/MixedGlobal.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/MixedGlobal.json
index 0d30063ee..05279a762 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/MixedGlobal.json
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/MixedGlobal.json
@@ -1,5 +1,8 @@
 {
   "exported" : {
+    "aliases" : [
+
+    ],
     "classes" : [
       {
         "constructor" : {
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/MixedPrivate.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/MixedPrivate.json
index e6bcf2e5c..0f46b4ddb 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/MixedPrivate.json
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/MixedPrivate.json
@@ -1,5 +1,8 @@
 {
   "exported" : {
+    "aliases" : [
+
+    ],
     "classes" : [
       {
         "constructor" : {
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/NamespacedClassSignature.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/NamespacedClassSignature.json
new file mode 100644
index 000000000..e6ea49859
--- /dev/null
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/NamespacedClassSignature.json
@@ -0,0 +1,133 @@
+{
+  "exported" : {
+    "aliases" : [
+
+    ],
+    "classes" : [
+      {
+        "constructor" : {
+          "abiName" : "bjs_Workshop_Bench_init",
+          "effects" : {
+            "isAsync" : false,
+            "isStatic" : false,
+            "isThrows" : false
+          },
+          "parameters" : [
+
+          ]
+        },
+        "methods" : [
+
+        ],
+        "name" : "Bench",
+        "namespace" : [
+          "Workshop"
+        ],
+        "properties" : [
+
+        ],
+        "swiftCallName" : "Workshop.Bench"
+      }
+    ],
+    "enums" : [
+      {
+        "cases" : [
+
+        ],
+        "emitStyle" : "const",
+        "name" : "Workshop",
+        "staticMethods" : [
+
+        ],
+        "staticProperties" : [
+
+        ],
+        "swiftCallName" : "Workshop",
+        "tsFullPath" : "Workshop"
+      }
+    ],
+    "exposeToGlobal" : false,
+    "functions" : [
+      {
+        "abiName" : "bjs_makeBench",
+        "effects" : {
+          "isAsync" : false,
+          "isStatic" : false,
+          "isThrows" : false
+        },
+        "name" : "makeBench",
+        "parameters" : [
+
+        ],
+        "returnType" : {
+          "swiftHeapObject" : {
+            "_0" : "Workshop.Bench"
+          }
+        }
+      },
+      {
+        "abiName" : "bjs_refitBench",
+        "effects" : {
+          "isAsync" : false,
+          "isStatic" : false,
+          "isThrows" : false
+        },
+        "name" : "refitBench",
+        "parameters" : [
+          {
+            "label" : "_",
+            "name" : "bench",
+            "type" : {
+              "swiftHeapObject" : {
+                "_0" : "Workshop.Bench"
+              }
+            }
+          },
+          {
+            "label" : "_",
+            "name" : "transform",
+            "type" : {
+              "closure" : {
+                "_0" : {
+                  "isAsync" : false,
+                  "isThrows" : false,
+                  "mangleName" : "10TestModule8Workshop5BenchC_8Workshop5BenchC",
+                  "moduleName" : "TestModule",
+                  "parameters" : [
+                    {
+                      "swiftHeapObject" : {
+                        "_0" : "Workshop.Bench"
+                      }
+                    }
+                  ],
+                  "returnType" : {
+                    "swiftHeapObject" : {
+                      "_0" : "Workshop.Bench"
+                    }
+                  },
+                  "sendingParameters" : false
+                },
+                "useJSTypedClosure" : false
+              }
+            }
+          }
+        ],
+        "returnType" : {
+          "swiftHeapObject" : {
+            "_0" : "Workshop.Bench"
+          }
+        }
+      }
+    ],
+    "protocols" : [
+
+    ],
+    "structs" : [
+
+    ]
+  },
+  "moduleName" : "TestModule",
+  "usedExternalModules" : [
+
+  ]
+}
\ No newline at end of file
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/NamespacedClassSignature.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/NamespacedClassSignature.swift
new file mode 100644
index 000000000..bff3007b7
--- /dev/null
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/NamespacedClassSignature.swift
@@ -0,0 +1,126 @@
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "invoke_js_callback_TestModule_10TestModule8Workshop5BenchC_8Workshop5BenchC")
+fileprivate func invoke_js_callback_TestModule_10TestModule8Workshop5BenchC_8Workshop5BenchC_extern(_ callback: Int32, _ param0: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer
+#else
+fileprivate func invoke_js_callback_TestModule_10TestModule8Workshop5BenchC_8Workshop5BenchC_extern(_ callback: Int32, _ param0: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func invoke_js_callback_TestModule_10TestModule8Workshop5BenchC_8Workshop5BenchC(_ callback: Int32, _ param0: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer {
+    return invoke_js_callback_TestModule_10TestModule8Workshop5BenchC_8Workshop5BenchC_extern(callback, param0)
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "make_swift_closure_TestModule_10TestModule8Workshop5BenchC_8Workshop5BenchC")
+fileprivate func make_swift_closure_TestModule_10TestModule8Workshop5BenchC_8Workshop5BenchC_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer<UInt8>, _ line: UInt32) -> Int32
+#else
+fileprivate func make_swift_closure_TestModule_10TestModule8Workshop5BenchC_8Workshop5BenchC_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer<UInt8>, _ line: UInt32) -> Int32 {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func make_swift_closure_TestModule_10TestModule8Workshop5BenchC_8Workshop5BenchC(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer<UInt8>, _ line: UInt32) -> Int32 {
+    return make_swift_closure_TestModule_10TestModule8Workshop5BenchC_8Workshop5BenchC_extern(boxPtr, file, line)
+}
+
+private enum _BJS_Closure_10TestModule8Workshop5BenchC_8Workshop5BenchC {
+    static func bridgeJSLift(_ callbackId: Int32) -> (Workshop.Bench) -> Workshop.Bench {
+        let callback = JSObject.bridgeJSLiftParameter(callbackId)
+        return { [callback] param0 in
+            #if arch(wasm32)
+            let param0Pointer = param0.bridgeJSLowerParameter()
+            let callbackValue = callback.bridgeJSLowerParameter()
+            let ret = invoke_js_callback_TestModule_10TestModule8Workshop5BenchC_8Workshop5BenchC(callbackValue, param0Pointer)
+            return Workshop.Bench.bridgeJSLiftReturn(ret)
+            #else
+            fatalError("Only available on WebAssembly")
+            #endif
+        }
+    }
+}
+
+extension JSTypedClosure where Signature == (Workshop.Bench) -> Workshop.Bench {
+    init(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping (Workshop.Bench) -> Workshop.Bench) {
+        self.init(
+            makeClosure: make_swift_closure_TestModule_10TestModule8Workshop5BenchC_8Workshop5BenchC,
+            body: body,
+            fileID: fileID,
+            line: line
+        )
+    }
+}
+
+@_expose(wasm, "invoke_swift_closure_TestModule_10TestModule8Workshop5BenchC_8Workshop5BenchC")
+@_cdecl("invoke_swift_closure_TestModule_10TestModule8Workshop5BenchC_8Workshop5BenchC")
+public func _invoke_swift_closure_TestModule_10TestModule8Workshop5BenchC_8Workshop5BenchC(_ boxPtr: UnsafeMutableRawPointer, _ param0: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer {
+    #if arch(wasm32)
+    let closure = Unmanaged<_BridgeJSTypedClosureBox<(Workshop.Bench) -> Workshop.Bench>>.fromOpaque(boxPtr).takeUnretainedValue().closure
+    let result = closure(Workshop.Bench.bridgeJSLiftParameter(param0))
+    return result.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_makeBench")
+@_cdecl("bjs_makeBench")
+public func _bjs_makeBench() -> UnsafeMutableRawPointer {
+    #if arch(wasm32)
+    let ret = makeBench()
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_refitBench")
+@_cdecl("bjs_refitBench")
+public func _bjs_refitBench(_ bench: UnsafeMutableRawPointer, _ transform: Int32) -> UnsafeMutableRawPointer {
+    #if arch(wasm32)
+    let ret = refitBench(_: Workshop.Bench.bridgeJSLiftParameter(bench), _: _BJS_Closure_10TestModule8Workshop5BenchC_8Workshop5BenchC.bridgeJSLift(transform))
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_Workshop_Bench_init")
+@_cdecl("bjs_Workshop_Bench_init")
+public func _bjs_Workshop_Bench_init() -> UnsafeMutableRawPointer {
+    #if arch(wasm32)
+    let ret = Workshop.Bench()
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_Workshop_Bench_deinit")
+@_cdecl("bjs_Workshop_Bench_deinit")
+public func _bjs_Workshop_Bench_deinit(_ pointer: UnsafeMutableRawPointer) -> Void {
+    #if arch(wasm32)
+    Unmanaged<Workshop.Bench>.fromOpaque(pointer).release()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+extension Workshop.Bench: ConvertibleToJSValue, _BridgedSwiftHeapObject, _BridgedSwiftProtocolExportable {
+    var jsValue: JSValue {
+        return .object(JSObject(id: UInt32(bitPattern: _bjs_Workshop_Bench_wrap(Unmanaged.passRetained(self).toOpaque()))))
+    }
+    consuming func bridgeJSLowerAsProtocolReturn() -> Int32 {
+        _bjs_Workshop_Bench_wrap(Unmanaged.passRetained(self).toOpaque())
+    }
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "TestModule", name: "bjs_Workshop_Bench_wrap")
+fileprivate func _bjs_Workshop_Bench_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32
+#else
+fileprivate func _bjs_Workshop_Bench_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func _bjs_Workshop_Bench_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 {
+    return _bjs_Workshop_Bench_wrap_extern(pointer)
+}
\ No newline at end of file
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Namespaces.Global.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Namespaces.Global.json
index 4b6b720f1..243f3c885 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Namespaces.Global.json
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Namespaces.Global.json
@@ -1,5 +1,8 @@
 {
   "exported" : {
+    "aliases" : [
+
+    ],
     "classes" : [
       {
         "constructor" : {
@@ -21,9 +24,11 @@
             }
           ]
         },
+        "documentation" : "A greeter living in a namespace.",
         "methods" : [
           {
             "abiName" : "bjs___Swift_Foundation_Greeter_greet",
+            "documentation" : "Produces a greeting for the configured name.\n- Returns: The greeting message.",
             "effects" : {
               "isAsync" : false,
               "isStatic" : false,
@@ -262,6 +267,7 @@
       },
       {
         "abiName" : "bjs_MyModule_Utils_namespacedFunction",
+        "documentation" : "A namespaced free function.\n- Returns: A fixed namespaced string.",
         "effects" : {
           "isAsync" : false,
           "isStatic" : false,
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Namespaces.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Namespaces.json
index 3c07b7dcf..7823e5fdc 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Namespaces.json
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Namespaces.json
@@ -1,5 +1,8 @@
 {
   "exported" : {
+    "aliases" : [
+
+    ],
     "classes" : [
       {
         "constructor" : {
@@ -21,9 +24,11 @@
             }
           ]
         },
+        "documentation" : "A greeter living in a namespace.",
         "methods" : [
           {
             "abiName" : "bjs___Swift_Foundation_Greeter_greet",
+            "documentation" : "Produces a greeting for the configured name.\n- Returns: The greeting message.",
             "effects" : {
               "isAsync" : false,
               "isStatic" : false,
@@ -262,6 +267,7 @@
       },
       {
         "abiName" : "bjs_MyModule_Utils_namespacedFunction",
+        "documentation" : "A namespaced free function.\n- Returns: A fixed namespaced string.",
         "effects" : {
           "isAsync" : false,
           "isStatic" : false,
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/NestedType.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/NestedType.json
index f924b3eba..c741304a7 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/NestedType.json
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/NestedType.json
@@ -1,5 +1,8 @@
 {
   "exported" : {
+    "aliases" : [
+
+    ],
     "classes" : [
       {
         "methods" : [
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/NestedType.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/NestedType.swift
index ed1a080e9..9e1b0e0f6 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/NestedType.swift
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/NestedType.swift
@@ -176,4 +176,28 @@ fileprivate func _bjs_Player_wrap_extern(_ pointer: UnsafeMutableRawPointer) ->
 #endif
 @inline(never) fileprivate func _bjs_Player_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 {
     return _bjs_Player_wrap_extern(pointer)
-}
\ No newline at end of file
+}
+
+extension User.Stats: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = User.Stats.bridgeJSMakeTypeHandle()
+}
+
+extension Player.Stats: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = Player.Stats.bridgeJSMakeTypeHandle()
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "bjs_TestModule_register_type_handles")
+fileprivate func _bjs_TestModule_register_type_handles_extern(_ base: UnsafePointer<Int32>?, _ count: Int32)
+
+@_expose(wasm, "bjs_TestModule_register_type_handles")
+public func _bjs_TestModule_register_type_handles() {
+    let typeIds: [Int32] = [
+        User.Stats.bridgeJSTypeID,
+        Player.Stats.bridgeJSTypeID,
+    ]
+    typeIds.withUnsafeBufferPointer { buffer in
+        _bjs_TestModule_register_type_handles_extern(buffer.baseAddress, Int32(buffer.count))
+    }
+}
+#endif
\ No newline at end of file
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/NestedTypeNameCollision.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/NestedTypeNameCollision.json
new file mode 100644
index 000000000..8683e11b1
--- /dev/null
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/NestedTypeNameCollision.json
@@ -0,0 +1,177 @@
+{
+  "exported" : {
+    "aliases" : [
+
+    ],
+    "classes" : [
+
+    ],
+    "enums" : [
+      {
+        "cases" : [
+
+        ],
+        "emitStyle" : "const",
+        "name" : "Catalog",
+        "staticMethods" : [
+
+        ],
+        "staticProperties" : [
+
+        ],
+        "swiftCallName" : "Catalog",
+        "tsFullPath" : "Catalog"
+      }
+    ],
+    "exposeToGlobal" : false,
+    "functions" : [
+      {
+        "abiName" : "bjs_takeEntry",
+        "effects" : {
+          "isAsync" : false,
+          "isStatic" : false,
+          "isThrows" : false
+        },
+        "name" : "takeEntry",
+        "parameters" : [
+          {
+            "label" : "_",
+            "name" : "entry",
+            "type" : {
+              "swiftStruct" : {
+                "_0" : "Entry"
+              }
+            }
+          }
+        ],
+        "returnType" : {
+          "swiftStruct" : {
+            "_0" : "Entry"
+          }
+        }
+      },
+      {
+        "abiName" : "bjs_takeCatalogEntry",
+        "effects" : {
+          "isAsync" : false,
+          "isStatic" : false,
+          "isThrows" : false
+        },
+        "name" : "takeCatalogEntry",
+        "parameters" : [
+          {
+            "label" : "_",
+            "name" : "entry",
+            "type" : {
+              "swiftStruct" : {
+                "_0" : "Catalog.Entry"
+              }
+            }
+          }
+        ],
+        "returnType" : {
+          "swiftStruct" : {
+            "_0" : "Catalog.Entry"
+          }
+        }
+      }
+    ],
+    "protocols" : [
+
+    ],
+    "structs" : [
+      {
+        "constructor" : {
+          "abiName" : "bjs_Catalog_Entry_init",
+          "effects" : {
+            "isAsync" : false,
+            "isStatic" : false,
+            "isThrows" : false
+          },
+          "parameters" : [
+            {
+              "label" : "title",
+              "name" : "title",
+              "type" : {
+                "string" : {
+
+                }
+              }
+            }
+          ]
+        },
+        "methods" : [
+
+        ],
+        "name" : "Entry",
+        "namespace" : [
+          "Catalog"
+        ],
+        "properties" : [
+          {
+            "isReadonly" : true,
+            "isStatic" : false,
+            "name" : "title",
+            "namespace" : [
+              "Catalog"
+            ],
+            "type" : {
+              "string" : {
+
+              }
+            }
+          }
+        ],
+        "swiftCallName" : "Catalog.Entry"
+      },
+      {
+        "constructor" : {
+          "abiName" : "bjs_Entry_init",
+          "effects" : {
+            "isAsync" : false,
+            "isStatic" : false,
+            "isThrows" : false
+          },
+          "parameters" : [
+            {
+              "label" : "identifier",
+              "name" : "identifier",
+              "type" : {
+                "integer" : {
+                  "_0" : {
+                    "isSigned" : true,
+                    "width" : "word"
+                  }
+                }
+              }
+            }
+          ]
+        },
+        "methods" : [
+
+        ],
+        "name" : "Entry",
+        "properties" : [
+          {
+            "isReadonly" : true,
+            "isStatic" : false,
+            "name" : "identifier",
+            "type" : {
+              "integer" : {
+                "_0" : {
+                  "isSigned" : true,
+                  "width" : "word"
+                }
+              }
+            }
+          }
+        ],
+        "swiftCallName" : "Entry"
+      }
+    ]
+  },
+  "moduleName" : "TestModule",
+  "usedExternalModules" : [
+
+  ]
+}
\ No newline at end of file
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/NestedTypeNameCollision.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/NestedTypeNameCollision.swift
new file mode 100644
index 000000000..266f37f09
--- /dev/null
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/NestedTypeNameCollision.swift
@@ -0,0 +1,159 @@
+extension Catalog.Entry: _BridgedSwiftStruct {
+    @_spi(BridgeJS) @_transparent public static func bridgeJSStackPop() -> Catalog.Entry {
+        let title = String.bridgeJSStackPop()
+        return Catalog.Entry(title: title)
+    }
+
+    @_spi(BridgeJS) @_transparent public consuming func bridgeJSStackPush() {
+        self.title.bridgeJSStackPush()
+    }
+
+    init(unsafelyCopying jsObject: JSObject) {
+        _bjs_struct_lower_Catalog_Entry(jsObject.bridgeJSLowerParameter())
+        self = Self.bridgeJSStackPop()
+    }
+
+    func toJSObject() -> JSObject {
+        let __bjs_self = self
+        __bjs_self.bridgeJSStackPush()
+        return JSObject(id: UInt32(bitPattern: _bjs_struct_lift_Catalog_Entry()))
+    }
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "swift_js_struct_lower_Catalog_Entry")
+fileprivate func _bjs_struct_lower_Catalog_Entry_extern(_ objectId: Int32) -> Void
+#else
+fileprivate func _bjs_struct_lower_Catalog_Entry_extern(_ objectId: Int32) -> Void {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func _bjs_struct_lower_Catalog_Entry(_ objectId: Int32) -> Void {
+    return _bjs_struct_lower_Catalog_Entry_extern(objectId)
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "swift_js_struct_lift_Catalog_Entry")
+fileprivate func _bjs_struct_lift_Catalog_Entry_extern() -> Int32
+#else
+fileprivate func _bjs_struct_lift_Catalog_Entry_extern() -> Int32 {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func _bjs_struct_lift_Catalog_Entry() -> Int32 {
+    return _bjs_struct_lift_Catalog_Entry_extern()
+}
+
+@_expose(wasm, "bjs_Catalog_Entry_init")
+@_cdecl("bjs_Catalog_Entry_init")
+public func _bjs_Catalog_Entry_init(_ titleBytes: Int32, _ titleLength: Int32) -> Void {
+    #if arch(wasm32)
+    let ret = Catalog.Entry(title: String.bridgeJSLiftParameter(titleBytes, titleLength))
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+extension Entry: _BridgedSwiftStruct {
+    @_spi(BridgeJS) @_transparent public static func bridgeJSStackPop() -> Entry {
+        let identifier = Int.bridgeJSStackPop()
+        return Entry(identifier: identifier)
+    }
+
+    @_spi(BridgeJS) @_transparent public consuming func bridgeJSStackPush() {
+        self.identifier.bridgeJSStackPush()
+    }
+
+    init(unsafelyCopying jsObject: JSObject) {
+        _bjs_struct_lower_Entry(jsObject.bridgeJSLowerParameter())
+        self = Self.bridgeJSStackPop()
+    }
+
+    func toJSObject() -> JSObject {
+        let __bjs_self = self
+        __bjs_self.bridgeJSStackPush()
+        return JSObject(id: UInt32(bitPattern: _bjs_struct_lift_Entry()))
+    }
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "swift_js_struct_lower_Entry")
+fileprivate func _bjs_struct_lower_Entry_extern(_ objectId: Int32) -> Void
+#else
+fileprivate func _bjs_struct_lower_Entry_extern(_ objectId: Int32) -> Void {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func _bjs_struct_lower_Entry(_ objectId: Int32) -> Void {
+    return _bjs_struct_lower_Entry_extern(objectId)
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "swift_js_struct_lift_Entry")
+fileprivate func _bjs_struct_lift_Entry_extern() -> Int32
+#else
+fileprivate func _bjs_struct_lift_Entry_extern() -> Int32 {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func _bjs_struct_lift_Entry() -> Int32 {
+    return _bjs_struct_lift_Entry_extern()
+}
+
+@_expose(wasm, "bjs_Entry_init")
+@_cdecl("bjs_Entry_init")
+public func _bjs_Entry_init(_ identifier: Int32) -> Void {
+    #if arch(wasm32)
+    let ret = Entry(identifier: Int.bridgeJSLiftParameter(identifier))
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_takeEntry")
+@_cdecl("bjs_takeEntry")
+public func _bjs_takeEntry() -> Void {
+    #if arch(wasm32)
+    let ret = takeEntry(_: Entry.bridgeJSLiftParameter())
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_takeCatalogEntry")
+@_cdecl("bjs_takeCatalogEntry")
+public func _bjs_takeCatalogEntry() -> Void {
+    #if arch(wasm32)
+    let ret = takeCatalogEntry(_: Catalog.Entry.bridgeJSLiftParameter())
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+extension Catalog.Entry: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = Catalog.Entry.bridgeJSMakeTypeHandle()
+}
+
+extension Entry: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = Entry.bridgeJSMakeTypeHandle()
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "bjs_TestModule_register_type_handles")
+fileprivate func _bjs_TestModule_register_type_handles_extern(_ base: UnsafePointer<Int32>?, _ count: Int32)
+
+@_expose(wasm, "bjs_TestModule_register_type_handles")
+public func _bjs_TestModule_register_type_handles() {
+    let typeIds: [Int32] = [
+        Catalog.Entry.bridgeJSTypeID,
+        Entry.bridgeJSTypeID,
+    ]
+    typeIds.withUnsafeBufferPointer { buffer in
+        _bjs_TestModule_register_type_handles_extern(buffer.baseAddress, Int32(buffer.count))
+    }
+}
+#endif
\ No newline at end of file
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Optionals.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Optionals.json
index 91291c24e..d86d06f86 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Optionals.json
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Optionals.json
@@ -1,5 +1,8 @@
 {
   "exported" : {
+    "aliases" : [
+
+    ],
     "classes" : [
       {
         "constructor" : {
@@ -239,6 +242,76 @@
           }
         }
       },
+      {
+        "abiName" : "bjs_roundTripExportedOptionalJSObject",
+        "effects" : {
+          "isAsync" : false,
+          "isStatic" : false,
+          "isThrows" : false
+        },
+        "name" : "roundTripExportedOptionalJSObject",
+        "parameters" : [
+          {
+            "label" : "value",
+            "name" : "value",
+            "type" : {
+              "nullable" : {
+                "_0" : {
+                  "jsObject" : {
+
+                  }
+                },
+                "_1" : "null"
+              }
+            }
+          }
+        ],
+        "returnType" : {
+          "nullable" : {
+            "_0" : {
+              "jsObject" : {
+
+              }
+            },
+            "_1" : "null"
+          }
+        }
+      },
+      {
+        "abiName" : "bjs_roundTripExportedOptionalJSClass",
+        "effects" : {
+          "isAsync" : false,
+          "isStatic" : false,
+          "isThrows" : false
+        },
+        "name" : "roundTripExportedOptionalJSClass",
+        "parameters" : [
+          {
+            "label" : "value",
+            "name" : "value",
+            "type" : {
+              "nullable" : {
+                "_0" : {
+                  "jsObject" : {
+                    "_0" : "WithOptionalJSClass"
+                  }
+                },
+                "_1" : "null"
+              }
+            }
+          }
+        ],
+        "returnType" : {
+          "nullable" : {
+            "_0" : {
+              "jsObject" : {
+                "_0" : "WithOptionalJSClass"
+              }
+            },
+            "_1" : "null"
+          }
+        }
+      },
       {
         "abiName" : "bjs_roundTripString",
         "effects" : {
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Optionals.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Optionals.swift
index 0a2528340..f96fe39ff 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Optionals.swift
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Optionals.swift
@@ -20,6 +20,28 @@ public func _bjs_testOptionalPropertyRoundtrip(_ holderIsSome: Int32, _ holderVa
     #endif
 }
 
+@_expose(wasm, "bjs_roundTripExportedOptionalJSObject")
+@_cdecl("bjs_roundTripExportedOptionalJSObject")
+public func _bjs_roundTripExportedOptionalJSObject(_ valueIsSome: Int32, _ valueValue: Int32) -> Void {
+    #if arch(wasm32)
+    let ret = roundTripExportedOptionalJSObject(value: Optional<JSObject>.bridgeJSLiftParameter(valueIsSome, valueValue))
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_roundTripExportedOptionalJSClass")
+@_cdecl("bjs_roundTripExportedOptionalJSClass")
+public func _bjs_roundTripExportedOptionalJSClass(_ valueIsSome: Int32, _ valueValue: Int32) -> Void {
+    #if arch(wasm32)
+    let ret = roundTripExportedOptionalJSClass(value: Optional<WithOptionalJSClass>.bridgeJSLiftParameter(valueIsSome, valueValue))
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
 @_expose(wasm, "bjs_roundTripString")
 @_cdecl("bjs_roundTripString")
 public func _bjs_roundTripString(_ nameIsSome: Int32, _ nameBytes: Int32, _ nameLength: Int32) -> Void {
@@ -851,8 +873,8 @@ func _$WithOptionalJSClass_childOrNull_get(_ self: JSObject) throws(JSException)
 }
 
 func _$WithOptionalJSClass_stringOrNull_set(_ self: JSObject, _ newValue: Optional<String>) throws(JSException) -> Void {
-    let selfValue = self.bridgeJSLowerParameter()
     newValue.bridgeJSWithLoweredParameter { (newValueIsSome, newValueBytes, newValueLength) in
+        let selfValue = self.bridgeJSLowerParameter()
         bjs_WithOptionalJSClass_stringOrNull_set(selfValue, newValueIsSome, newValueBytes, newValueLength)
     }
     if let error = _swift_js_take_exception() {
@@ -861,8 +883,8 @@ func _$WithOptionalJSClass_stringOrNull_set(_ self: JSObject, _ newValue: Option
 }
 
 func _$WithOptionalJSClass_stringOrUndefined_set(_ self: JSObject, _ newValue: JSUndefinedOr<String>) throws(JSException) -> Void {
-    let selfValue = self.bridgeJSLowerParameter()
     newValue.bridgeJSWithLoweredParameter { (newValueIsSome, newValueBytes, newValueLength) in
+        let selfValue = self.bridgeJSLowerParameter()
         bjs_WithOptionalJSClass_stringOrUndefined_set(selfValue, newValueIsSome, newValueBytes, newValueLength)
     }
     if let error = _swift_js_take_exception() {
@@ -871,8 +893,8 @@ func _$WithOptionalJSClass_stringOrUndefined_set(_ self: JSObject, _ newValue: J
 }
 
 func _$WithOptionalJSClass_doubleOrNull_set(_ self: JSObject, _ newValue: Optional<Double>) throws(JSException) -> Void {
-    let selfValue = self.bridgeJSLowerParameter()
     let (newValueIsSome, newValueValue) = newValue.bridgeJSLowerParameter()
+    let selfValue = self.bridgeJSLowerParameter()
     bjs_WithOptionalJSClass_doubleOrNull_set(selfValue, newValueIsSome, newValueValue)
     if let error = _swift_js_take_exception() {
         throw error
@@ -880,8 +902,8 @@ func _$WithOptionalJSClass_doubleOrNull_set(_ self: JSObject, _ newValue: Option
 }
 
 func _$WithOptionalJSClass_doubleOrUndefined_set(_ self: JSObject, _ newValue: JSUndefinedOr<Double>) throws(JSException) -> Void {
-    let selfValue = self.bridgeJSLowerParameter()
     let (newValueIsSome, newValueValue) = newValue.bridgeJSLowerParameter()
+    let selfValue = self.bridgeJSLowerParameter()
     bjs_WithOptionalJSClass_doubleOrUndefined_set(selfValue, newValueIsSome, newValueValue)
     if let error = _swift_js_take_exception() {
         throw error
@@ -889,8 +911,8 @@ func _$WithOptionalJSClass_doubleOrUndefined_set(_ self: JSObject, _ newValue: J
 }
 
 func _$WithOptionalJSClass_boolOrNull_set(_ self: JSObject, _ newValue: Optional<Bool>) throws(JSException) -> Void {
-    let selfValue = self.bridgeJSLowerParameter()
     let (newValueIsSome, newValueValue) = newValue.bridgeJSLowerParameter()
+    let selfValue = self.bridgeJSLowerParameter()
     bjs_WithOptionalJSClass_boolOrNull_set(selfValue, newValueIsSome, newValueValue)
     if let error = _swift_js_take_exception() {
         throw error
@@ -898,8 +920,8 @@ func _$WithOptionalJSClass_boolOrNull_set(_ self: JSObject, _ newValue: Optional
 }
 
 func _$WithOptionalJSClass_boolOrUndefined_set(_ self: JSObject, _ newValue: JSUndefinedOr<Bool>) throws(JSException) -> Void {
-    let selfValue = self.bridgeJSLowerParameter()
     let (newValueIsSome, newValueValue) = newValue.bridgeJSLowerParameter()
+    let selfValue = self.bridgeJSLowerParameter()
     bjs_WithOptionalJSClass_boolOrUndefined_set(selfValue, newValueIsSome, newValueValue)
     if let error = _swift_js_take_exception() {
         throw error
@@ -907,8 +929,8 @@ func _$WithOptionalJSClass_boolOrUndefined_set(_ self: JSObject, _ newValue: JSU
 }
 
 func _$WithOptionalJSClass_intOrNull_set(_ self: JSObject, _ newValue: Optional<Int>) throws(JSException) -> Void {
-    let selfValue = self.bridgeJSLowerParameter()
     let (newValueIsSome, newValueValue) = newValue.bridgeJSLowerParameter()
+    let selfValue = self.bridgeJSLowerParameter()
     bjs_WithOptionalJSClass_intOrNull_set(selfValue, newValueIsSome, newValueValue)
     if let error = _swift_js_take_exception() {
         throw error
@@ -916,8 +938,8 @@ func _$WithOptionalJSClass_intOrNull_set(_ self: JSObject, _ newValue: Optional<
 }
 
 func _$WithOptionalJSClass_intOrUndefined_set(_ self: JSObject, _ newValue: JSUndefinedOr<Int>) throws(JSException) -> Void {
-    let selfValue = self.bridgeJSLowerParameter()
     let (newValueIsSome, newValueValue) = newValue.bridgeJSLowerParameter()
+    let selfValue = self.bridgeJSLowerParameter()
     bjs_WithOptionalJSClass_intOrUndefined_set(selfValue, newValueIsSome, newValueValue)
     if let error = _swift_js_take_exception() {
         throw error
@@ -925,8 +947,8 @@ func _$WithOptionalJSClass_intOrUndefined_set(_ self: JSObject, _ newValue: JSUn
 }
 
 func _$WithOptionalJSClass_childOrNull_set(_ self: JSObject, _ newValue: Optional<WithOptionalJSClass>) throws(JSException) -> Void {
-    let selfValue = self.bridgeJSLowerParameter()
     let (newValueIsSome, newValueValue) = newValue.bridgeJSLowerParameter()
+    let selfValue = self.bridgeJSLowerParameter()
     bjs_WithOptionalJSClass_childOrNull_set(selfValue, newValueIsSome, newValueValue)
     if let error = _swift_js_take_exception() {
         throw error
@@ -934,8 +956,8 @@ func _$WithOptionalJSClass_childOrNull_set(_ self: JSObject, _ newValue: Optiona
 }
 
 func _$WithOptionalJSClass_roundTripStringOrNull(_ self: JSObject, _ value: Optional<String>) throws(JSException) -> Optional<String> {
-    let selfValue = self.bridgeJSLowerParameter()
     value.bridgeJSWithLoweredParameter { (valueIsSome, valueBytes, valueLength) in
+        let selfValue = self.bridgeJSLowerParameter()
         bjs_WithOptionalJSClass_roundTripStringOrNull(selfValue, valueIsSome, valueBytes, valueLength)
     }
     if let error = _swift_js_take_exception() {
@@ -945,8 +967,8 @@ func _$WithOptionalJSClass_roundTripStringOrNull(_ self: JSObject, _ value: Opti
 }
 
 func _$WithOptionalJSClass_roundTripStringOrUndefined(_ self: JSObject, _ value: JSUndefinedOr<String>) throws(JSException) -> JSUndefinedOr<String> {
-    let selfValue = self.bridgeJSLowerParameter()
     value.bridgeJSWithLoweredParameter { (valueIsSome, valueBytes, valueLength) in
+        let selfValue = self.bridgeJSLowerParameter()
         bjs_WithOptionalJSClass_roundTripStringOrUndefined(selfValue, valueIsSome, valueBytes, valueLength)
     }
     if let error = _swift_js_take_exception() {
@@ -956,8 +978,8 @@ func _$WithOptionalJSClass_roundTripStringOrUndefined(_ self: JSObject, _ value:
 }
 
 func _$WithOptionalJSClass_roundTripDoubleOrNull(_ self: JSObject, _ value: Optional<Double>) throws(JSException) -> Optional<Double> {
-    let selfValue = self.bridgeJSLowerParameter()
     let (valueIsSome, valueValue) = value.bridgeJSLowerParameter()
+    let selfValue = self.bridgeJSLowerParameter()
     bjs_WithOptionalJSClass_roundTripDoubleOrNull(selfValue, valueIsSome, valueValue)
     if let error = _swift_js_take_exception() {
         throw error
@@ -966,8 +988,8 @@ func _$WithOptionalJSClass_roundTripDoubleOrNull(_ self: JSObject, _ value: Opti
 }
 
 func _$WithOptionalJSClass_roundTripDoubleOrUndefined(_ self: JSObject, _ value: JSUndefinedOr<Double>) throws(JSException) -> JSUndefinedOr<Double> {
-    let selfValue = self.bridgeJSLowerParameter()
     let (valueIsSome, valueValue) = value.bridgeJSLowerParameter()
+    let selfValue = self.bridgeJSLowerParameter()
     bjs_WithOptionalJSClass_roundTripDoubleOrUndefined(selfValue, valueIsSome, valueValue)
     if let error = _swift_js_take_exception() {
         throw error
@@ -976,8 +998,8 @@ func _$WithOptionalJSClass_roundTripDoubleOrUndefined(_ self: JSObject, _ value:
 }
 
 func _$WithOptionalJSClass_roundTripBoolOrNull(_ self: JSObject, _ value: Optional<Bool>) throws(JSException) -> Optional<Bool> {
-    let selfValue = self.bridgeJSLowerParameter()
     let (valueIsSome, valueValue) = value.bridgeJSLowerParameter()
+    let selfValue = self.bridgeJSLowerParameter()
     let ret = bjs_WithOptionalJSClass_roundTripBoolOrNull(selfValue, valueIsSome, valueValue)
     if let error = _swift_js_take_exception() {
         throw error
@@ -986,8 +1008,8 @@ func _$WithOptionalJSClass_roundTripBoolOrNull(_ self: JSObject, _ value: Option
 }
 
 func _$WithOptionalJSClass_roundTripBoolOrUndefined(_ self: JSObject, _ value: JSUndefinedOr<Bool>) throws(JSException) -> JSUndefinedOr<Bool> {
-    let selfValue = self.bridgeJSLowerParameter()
     let (valueIsSome, valueValue) = value.bridgeJSLowerParameter()
+    let selfValue = self.bridgeJSLowerParameter()
     let ret = bjs_WithOptionalJSClass_roundTripBoolOrUndefined(selfValue, valueIsSome, valueValue)
     if let error = _swift_js_take_exception() {
         throw error
@@ -996,8 +1018,8 @@ func _$WithOptionalJSClass_roundTripBoolOrUndefined(_ self: JSObject, _ value: J
 }
 
 func _$WithOptionalJSClass_roundTripIntOrNull(_ self: JSObject, _ value: Optional<Int>) throws(JSException) -> Optional<Int> {
-    let selfValue = self.bridgeJSLowerParameter()
     let (valueIsSome, valueValue) = value.bridgeJSLowerParameter()
+    let selfValue = self.bridgeJSLowerParameter()
     bjs_WithOptionalJSClass_roundTripIntOrNull(selfValue, valueIsSome, valueValue)
     if let error = _swift_js_take_exception() {
         throw error
@@ -1006,8 +1028,8 @@ func _$WithOptionalJSClass_roundTripIntOrNull(_ self: JSObject, _ value: Optiona
 }
 
 func _$WithOptionalJSClass_roundTripIntOrUndefined(_ self: JSObject, _ value: JSUndefinedOr<Int>) throws(JSException) -> JSUndefinedOr<Int> {
-    let selfValue = self.bridgeJSLowerParameter()
     let (valueIsSome, valueValue) = value.bridgeJSLowerParameter()
+    let selfValue = self.bridgeJSLowerParameter()
     bjs_WithOptionalJSClass_roundTripIntOrUndefined(selfValue, valueIsSome, valueValue)
     if let error = _swift_js_take_exception() {
         throw error
@@ -1016,8 +1038,8 @@ func _$WithOptionalJSClass_roundTripIntOrUndefined(_ self: JSObject, _ value: JS
 }
 
 func _$WithOptionalJSClass_roundTripChildOrNull(_ self: JSObject, _ value: Optional<WithOptionalJSClass>) throws(JSException) -> Optional<WithOptionalJSClass> {
-    let selfValue = self.bridgeJSLowerParameter()
     let (valueIsSome, valueValue) = value.bridgeJSLowerParameter()
+    let selfValue = self.bridgeJSLowerParameter()
     bjs_WithOptionalJSClass_roundTripChildOrNull(selfValue, valueIsSome, valueValue)
     if let error = _swift_js_take_exception() {
         throw error
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/PrimitiveParameters.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/PrimitiveParameters.json
index 320499ff3..8b7ee7338 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/PrimitiveParameters.json
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/PrimitiveParameters.json
@@ -1,5 +1,8 @@
 {
   "exported" : {
+    "aliases" : [
+
+    ],
     "classes" : [
 
     ],
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/PrimitiveParameters.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/PrimitiveParameters.swift
index 3f9448a4b..e818f2877 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/PrimitiveParameters.swift
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/PrimitiveParameters.swift
@@ -21,8 +21,8 @@ fileprivate func bjs_check_extern(_ a: Float64, _ b: Int32) -> Void {
 }
 
 func _$check(_ a: Double, _ b: Bool) throws(JSException) -> Void {
-    let aValue = a.bridgeJSLowerParameter()
     let bValue = b.bridgeJSLowerParameter()
+    let aValue = a.bridgeJSLowerParameter()
     bjs_check(aValue, bValue)
     if let error = _swift_js_take_exception() {
         throw error
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/PrimitiveReturn.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/PrimitiveReturn.json
index 414fedbbd..a2b08f4c6 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/PrimitiveReturn.json
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/PrimitiveReturn.json
@@ -1,5 +1,8 @@
 {
   "exported" : {
+    "aliases" : [
+
+    ],
     "classes" : [
 
     ],
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/PropertyTypes.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/PropertyTypes.json
index 281538dd6..8e6496336 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/PropertyTypes.json
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/PropertyTypes.json
@@ -1,5 +1,8 @@
 {
   "exported" : {
+    "aliases" : [
+
+    ],
     "classes" : [
       {
         "constructor" : {
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Protocol.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Protocol.json
index feca4615b..bc443c6c0 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Protocol.json
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Protocol.json
@@ -1,5 +1,8 @@
 {
   "exported" : {
+    "aliases" : [
+
+    ],
     "classes" : [
       {
         "constructor" : {
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Protocol.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Protocol.swift
index e8df6c966..7c2db9a98 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Protocol.swift
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Protocol.swift
@@ -7,23 +7,23 @@ struct AnyMyViewControllerDelegate: MyViewControllerDelegate, _BridgedSwiftProto
     }
 
     func onValueChanged(_ value: String) -> Void {
-        let jsObjectValue = jsObject.bridgeJSLowerParameter()
         value.bridgeJSWithLoweredParameter { (valueBytes, valueLength) in
+            let jsObjectValue = jsObject.bridgeJSLowerParameter()
             _extern_onValueChanged(jsObjectValue, valueBytes, valueLength)
         }
     }
 
     func onCountUpdated(count: Int) -> Bool {
-        let jsObjectValue = jsObject.bridgeJSLowerParameter()
         let countValue = count.bridgeJSLowerParameter()
+        let jsObjectValue = jsObject.bridgeJSLowerParameter()
         let ret = _extern_onCountUpdated(jsObjectValue, countValue)
         return Bool.bridgeJSLiftReturn(ret)
     }
 
     func onLabelUpdated(_ prefix: String, _ suffix: String) -> Void {
-        let jsObjectValue = jsObject.bridgeJSLowerParameter()
         prefix.bridgeJSWithLoweredParameter { (prefixBytes, prefixLength) in
             suffix.bridgeJSWithLoweredParameter { (suffixBytes, suffixLength) in
+                let jsObjectValue = jsObject.bridgeJSLowerParameter()
                 _extern_onLabelUpdated(jsObjectValue, prefixBytes, prefixLength, suffixBytes, suffixLength)
             }
         }
@@ -36,8 +36,8 @@ struct AnyMyViewControllerDelegate: MyViewControllerDelegate, _BridgedSwiftProto
     }
 
     func onHelperUpdated(_ helper: Helper) -> Void {
-        let jsObjectValue = jsObject.bridgeJSLowerParameter()
         let helperPointer = helper.bridgeJSLowerParameter()
+        let jsObjectValue = jsObject.bridgeJSLowerParameter()
         _extern_onHelperUpdated(jsObjectValue, helperPointer)
     }
 
@@ -48,8 +48,8 @@ struct AnyMyViewControllerDelegate: MyViewControllerDelegate, _BridgedSwiftProto
     }
 
     func onOptionalHelperUpdated(_ helper: Optional<Helper>) -> Void {
-        let jsObjectValue = jsObject.bridgeJSLowerParameter()
         let (helperIsSome, helperPointer) = helper.bridgeJSLowerParameter()
+        let jsObjectValue = jsObject.bridgeJSLowerParameter()
         _extern_onOptionalHelperUpdated(jsObjectValue, helperIsSome, helperPointer)
     }
 
@@ -66,8 +66,8 @@ struct AnyMyViewControllerDelegate: MyViewControllerDelegate, _BridgedSwiftProto
     }
 
     func handleResult(_ result: Result) -> Void {
-        let jsObjectValue = jsObject.bridgeJSLowerParameter()
         let resultCaseId = result.bridgeJSLowerParameter()
+        let jsObjectValue = jsObject.bridgeJSLowerParameter()
         _extern_handleResult(jsObjectValue, resultCaseId)
     }
 
@@ -84,8 +84,8 @@ struct AnyMyViewControllerDelegate: MyViewControllerDelegate, _BridgedSwiftProto
             return Int.bridgeJSLiftReturn(ret)
         }
         set {
-            let jsObjectValue = jsObject.bridgeJSLowerParameter()
             let newValueValue = newValue.bridgeJSLowerParameter()
+            let jsObjectValue = jsObject.bridgeJSLowerParameter()
             bjs_MyViewControllerDelegate_eventCount_set(jsObjectValue, newValueValue)
         }
     }
@@ -105,8 +105,8 @@ struct AnyMyViewControllerDelegate: MyViewControllerDelegate, _BridgedSwiftProto
             return Optional<String>.bridgeJSLiftReturnFromSideChannel()
         }
         set {
-            let jsObjectValue = jsObject.bridgeJSLowerParameter()
             newValue.bridgeJSWithLoweredParameter { (newValueIsSome, newValueBytes, newValueLength) in
+                let jsObjectValue = jsObject.bridgeJSLowerParameter()
                 bjs_MyViewControllerDelegate_optionalName_set(jsObjectValue, newValueIsSome, newValueBytes, newValueLength)
             }
         }
@@ -119,8 +119,8 @@ struct AnyMyViewControllerDelegate: MyViewControllerDelegate, _BridgedSwiftProto
             return Optional<ExampleEnum>.bridgeJSLiftReturnFromSideChannel()
         }
         set {
-            let jsObjectValue = jsObject.bridgeJSLowerParameter()
             newValue.bridgeJSWithLoweredParameter { (newValueIsSome, newValueBytes, newValueLength) in
+                let jsObjectValue = jsObject.bridgeJSLowerParameter()
                 bjs_MyViewControllerDelegate_optionalRawEnum_set(jsObjectValue, newValueIsSome, newValueBytes, newValueLength)
             }
         }
@@ -133,8 +133,8 @@ struct AnyMyViewControllerDelegate: MyViewControllerDelegate, _BridgedSwiftProto
             return ExampleEnum.bridgeJSLiftReturn(ret)
         }
         set {
-            let jsObjectValue = jsObject.bridgeJSLowerParameter()
             newValue.bridgeJSWithLoweredParameter { (newValueBytes, newValueLength) in
+                let jsObjectValue = jsObject.bridgeJSLowerParameter()
                 bjs_MyViewControllerDelegate_rawStringEnum_set(jsObjectValue, newValueBytes, newValueLength)
             }
         }
@@ -147,8 +147,8 @@ struct AnyMyViewControllerDelegate: MyViewControllerDelegate, _BridgedSwiftProto
             return Result.bridgeJSLiftReturn(ret)
         }
         set {
-            let jsObjectValue = jsObject.bridgeJSLowerParameter()
             let newValueCaseId = newValue.bridgeJSLowerParameter()
+            let jsObjectValue = jsObject.bridgeJSLowerParameter()
             bjs_MyViewControllerDelegate_result_set(jsObjectValue, newValueCaseId)
         }
     }
@@ -160,8 +160,8 @@ struct AnyMyViewControllerDelegate: MyViewControllerDelegate, _BridgedSwiftProto
             return Optional<Result>.bridgeJSLiftReturn(ret)
         }
         set {
-            let jsObjectValue = jsObject.bridgeJSLowerParameter()
             let (newValueIsSome, newValueCaseId) = newValue.bridgeJSLowerParameter()
+            let jsObjectValue = jsObject.bridgeJSLowerParameter()
             bjs_MyViewControllerDelegate_optionalResult_set(jsObjectValue, newValueIsSome, newValueCaseId)
         }
     }
@@ -173,8 +173,8 @@ struct AnyMyViewControllerDelegate: MyViewControllerDelegate, _BridgedSwiftProto
             return Direction.bridgeJSLiftReturn(ret)
         }
         set {
-            let jsObjectValue = jsObject.bridgeJSLowerParameter()
             let newValueValue = newValue.bridgeJSLowerParameter()
+            let jsObjectValue = jsObject.bridgeJSLowerParameter()
             bjs_MyViewControllerDelegate_direction_set(jsObjectValue, newValueValue)
         }
     }
@@ -186,8 +186,8 @@ struct AnyMyViewControllerDelegate: MyViewControllerDelegate, _BridgedSwiftProto
             return Optional<Direction>.bridgeJSLiftReturn(ret)
         }
         set {
-            let jsObjectValue = jsObject.bridgeJSLowerParameter()
             let (newValueIsSome, newValueValue) = newValue.bridgeJSLowerParameter()
+            let jsObjectValue = jsObject.bridgeJSLowerParameter()
             bjs_MyViewControllerDelegate_directionOptional_set(jsObjectValue, newValueIsSome, newValueValue)
         }
     }
@@ -199,8 +199,8 @@ struct AnyMyViewControllerDelegate: MyViewControllerDelegate, _BridgedSwiftProto
             return Priority.bridgeJSLiftReturn(ret)
         }
         set {
-            let jsObjectValue = jsObject.bridgeJSLowerParameter()
             let newValueValue = newValue.bridgeJSLowerParameter()
+            let jsObjectValue = jsObject.bridgeJSLowerParameter()
             bjs_MyViewControllerDelegate_priority_set(jsObjectValue, newValueValue)
         }
     }
@@ -212,8 +212,8 @@ struct AnyMyViewControllerDelegate: MyViewControllerDelegate, _BridgedSwiftProto
             return Optional<Priority>.bridgeJSLiftReturnFromSideChannel()
         }
         set {
-            let jsObjectValue = jsObject.bridgeJSLowerParameter()
             let (newValueIsSome, newValueValue) = newValue.bridgeJSLowerParameter()
+            let jsObjectValue = jsObject.bridgeJSLowerParameter()
             bjs_MyViewControllerDelegate_priorityOptional_set(jsObjectValue, newValueIsSome, newValueValue)
         }
     }
@@ -1043,4 +1043,38 @@ fileprivate func _bjs_DelegateManager_wrap_extern(_ pointer: UnsafeMutableRawPoi
 #endif
 @inline(never) fileprivate func _bjs_DelegateManager_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 {
     return _bjs_DelegateManager_wrap_extern(pointer)
-}
\ No newline at end of file
+}
+
+extension Direction: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = Direction.bridgeJSMakeTypeHandle()
+}
+
+extension ExampleEnum: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = ExampleEnum.bridgeJSMakeTypeHandle()
+}
+
+extension Result: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = Result.bridgeJSMakeTypeHandle()
+}
+
+extension Priority: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = Priority.bridgeJSMakeTypeHandle()
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "bjs_TestModule_register_type_handles")
+fileprivate func _bjs_TestModule_register_type_handles_extern(_ base: UnsafePointer<Int32>?, _ count: Int32)
+
+@_expose(wasm, "bjs_TestModule_register_type_handles")
+public func _bjs_TestModule_register_type_handles() {
+    let typeIds: [Int32] = [
+        Direction.bridgeJSTypeID,
+        ExampleEnum.bridgeJSTypeID,
+        Result.bridgeJSTypeID,
+        Priority.bridgeJSTypeID,
+    ]
+    typeIds.withUnsafeBufferPointer { buffer in
+        _bjs_TestModule_register_type_handles_extern(buffer.baseAddress, Int32(buffer.count))
+    }
+}
+#endif
\ No newline at end of file
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ProtocolInClosure.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ProtocolInClosure.json
index 70273f8b3..56f8e26e0 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ProtocolInClosure.json
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ProtocolInClosure.json
@@ -1,5 +1,8 @@
 {
   "exported" : {
+    "aliases" : [
+
+    ],
     "classes" : [
       {
         "constructor" : {
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ProtocolInClosure.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ProtocolInClosure.swift
index 26c3d1db0..d956a6f3a 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ProtocolInClosure.swift
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ProtocolInClosure.swift
@@ -27,8 +27,8 @@ private enum _BJS_Closure_10TestModule10RenderableP_10RenderableP {
         let callback = JSObject.bridgeJSLiftParameter(callbackId)
         return { [callback] param0 in
             #if arch(wasm32)
-            let callbackValue = callback.bridgeJSLowerParameter()
             let param0ObjectId = (param0 as! _BridgedSwiftProtocolExportable).bridgeJSLowerAsProtocolReturn()
+            let callbackValue = callback.bridgeJSLowerParameter()
             let ret = invoke_js_callback_TestModule_10TestModule10RenderableP_10RenderableP(callbackValue, param0ObjectId)
             return AnyRenderable.bridgeJSLiftReturn(ret)
             #else
@@ -90,8 +90,8 @@ private enum _BJS_Closure_10TestModule10RenderableP_SS {
         let callback = JSObject.bridgeJSLiftParameter(callbackId)
         return { [callback] param0 in
             #if arch(wasm32)
-            let callbackValue = callback.bridgeJSLowerParameter()
             let param0ObjectId = (param0 as! _BridgedSwiftProtocolExportable).bridgeJSLowerAsProtocolReturn()
+            let callbackValue = callback.bridgeJSLowerParameter()
             let ret = invoke_js_callback_TestModule_10TestModule10RenderableP_SS(callbackValue, param0ObjectId)
             return String.bridgeJSLiftReturn(ret)
             #else
@@ -153,13 +153,13 @@ private enum _BJS_Closure_10TestModuleSq10RenderableP_SS {
         let callback = JSObject.bridgeJSLiftParameter(callbackId)
         return { [callback] param0 in
             #if arch(wasm32)
-            let callbackValue = callback.bridgeJSLowerParameter()
             let (param0IsSome, param0ObjectId): (Int32, Int32)
             if let param0 {
                 (param0IsSome, param0ObjectId) = (1, (param0 as! _BridgedSwiftProtocolExportable).bridgeJSLowerAsProtocolReturn())
             } else {
                 (param0IsSome, param0ObjectId) = (0, 0)
             }
+            let callbackValue = callback.bridgeJSLowerParameter()
             let ret = invoke_js_callback_TestModule_10TestModuleSq10RenderableP_SS(callbackValue, param0IsSome, param0ObjectId)
             return String.bridgeJSLiftReturn(ret)
             #else
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/RelativeQualifiedTypes.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/RelativeQualifiedTypes.json
new file mode 100644
index 000000000..0872c6d79
--- /dev/null
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/RelativeQualifiedTypes.json
@@ -0,0 +1,239 @@
+{
+  "exported" : {
+    "aliases" : [
+
+    ],
+    "classes" : [
+      {
+        "constructor" : {
+          "abiName" : "bjs_Library_init",
+          "effects" : {
+            "isAsync" : false,
+            "isStatic" : false,
+            "isThrows" : false
+          },
+          "parameters" : [
+
+          ]
+        },
+        "methods" : [
+          {
+            "abiName" : "bjs_Library_divider",
+            "effects" : {
+              "isAsync" : false,
+              "isStatic" : false,
+              "isThrows" : false
+            },
+            "name" : "divider",
+            "parameters" : [
+              {
+                "label" : "_",
+                "name" : "value",
+                "type" : {
+                  "swiftStruct" : {
+                    "_0" : "Library.Shelf.Divider"
+                  }
+                }
+              }
+            ],
+            "returnType" : {
+              "swiftStruct" : {
+                "_0" : "Library.Shelf.Divider"
+              }
+            }
+          }
+        ],
+        "name" : "Library",
+        "properties" : [
+
+        ],
+        "swiftCallName" : "Library"
+      },
+      {
+        "constructor" : {
+          "abiName" : "bjs_Outer_init",
+          "effects" : {
+            "isAsync" : false,
+            "isStatic" : false,
+            "isThrows" : false
+          },
+          "parameters" : [
+
+          ]
+        },
+        "methods" : [
+
+        ],
+        "name" : "Outer",
+        "properties" : [
+
+        ],
+        "swiftCallName" : "Outer"
+      }
+    ],
+    "enums" : [
+
+    ],
+    "exposeToGlobal" : false,
+    "functions" : [
+
+    ],
+    "protocols" : [
+
+    ],
+    "structs" : [
+      {
+        "methods" : [
+
+        ],
+        "name" : "Shelf",
+        "namespace" : [
+          "Library"
+        ],
+        "properties" : [
+
+        ],
+        "swiftCallName" : "Library.Shelf"
+      },
+      {
+        "constructor" : {
+          "abiName" : "bjs_Library_Shelf_Divider_init",
+          "effects" : {
+            "isAsync" : false,
+            "isStatic" : false,
+            "isThrows" : false
+          },
+          "parameters" : [
+            {
+              "label" : "slot",
+              "name" : "slot",
+              "type" : {
+                "integer" : {
+                  "_0" : {
+                    "isSigned" : true,
+                    "width" : "word"
+                  }
+                }
+              }
+            }
+          ]
+        },
+        "methods" : [
+
+        ],
+        "name" : "Divider",
+        "namespace" : [
+          "Library",
+          "Shelf"
+        ],
+        "properties" : [
+          {
+            "isReadonly" : true,
+            "isStatic" : false,
+            "name" : "slot",
+            "namespace" : [
+              "Library",
+              "Shelf"
+            ],
+            "type" : {
+              "integer" : {
+                "_0" : {
+                  "isSigned" : true,
+                  "width" : "word"
+                }
+              }
+            }
+          }
+        ],
+        "swiftCallName" : "Library.Shelf.Divider"
+      },
+      {
+        "constructor" : {
+          "abiName" : "bjs_Outer_Inner_init",
+          "effects" : {
+            "isAsync" : false,
+            "isStatic" : false,
+            "isThrows" : false
+          },
+          "parameters" : [
+
+          ]
+        },
+        "methods" : [
+          {
+            "abiName" : "bjs_Outer_Inner_marker",
+            "effects" : {
+              "isAsync" : false,
+              "isStatic" : false,
+              "isThrows" : false
+            },
+            "name" : "marker",
+            "parameters" : [
+
+            ],
+            "returnType" : {
+              "integer" : {
+                "_0" : {
+                  "isSigned" : true,
+                  "width" : "word"
+                }
+              }
+            }
+          }
+        ],
+        "name" : "Inner",
+        "namespace" : [
+          "Outer"
+        ],
+        "properties" : [
+
+        ],
+        "swiftCallName" : "Outer.Inner"
+      },
+      {
+        "methods" : [
+
+        ],
+        "name" : "Outer",
+        "namespace" : [
+          "Outer",
+          "Inner"
+        ],
+        "properties" : [
+
+        ],
+        "swiftCallName" : "Outer.Inner.Outer"
+      },
+      {
+        "constructor" : {
+          "abiName" : "bjs_Outer_Inner_Outer_Inner_init",
+          "effects" : {
+            "isAsync" : false,
+            "isStatic" : false,
+            "isThrows" : false
+          },
+          "parameters" : [
+
+          ]
+        },
+        "methods" : [
+
+        ],
+        "name" : "Inner",
+        "namespace" : [
+          "Outer",
+          "Inner",
+          "Outer"
+        ],
+        "properties" : [
+
+        ],
+        "swiftCallName" : "Outer.Inner.Outer.Inner"
+      }
+    ]
+  },
+  "moduleName" : "TestModule",
+  "usedExternalModules" : [
+
+  ]
+}
\ No newline at end of file
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/RelativeQualifiedTypes.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/RelativeQualifiedTypes.swift
new file mode 100644
index 000000000..0a6b272e9
--- /dev/null
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/RelativeQualifiedTypes.swift
@@ -0,0 +1,399 @@
+extension Library.Shelf: _BridgedSwiftStruct {
+    @_spi(BridgeJS) @_transparent public static func bridgeJSStackPop() -> Library.Shelf {
+        return Library.Shelf()
+    }
+
+    @_spi(BridgeJS) @_transparent public consuming func bridgeJSStackPush() {
+    }
+
+    init(unsafelyCopying jsObject: JSObject) {
+        _bjs_struct_lower_Library_Shelf(jsObject.bridgeJSLowerParameter())
+        self = Self.bridgeJSStackPop()
+    }
+
+    func toJSObject() -> JSObject {
+        let __bjs_self = self
+        __bjs_self.bridgeJSStackPush()
+        return JSObject(id: UInt32(bitPattern: _bjs_struct_lift_Library_Shelf()))
+    }
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "swift_js_struct_lower_Library_Shelf")
+fileprivate func _bjs_struct_lower_Library_Shelf_extern(_ objectId: Int32) -> Void
+#else
+fileprivate func _bjs_struct_lower_Library_Shelf_extern(_ objectId: Int32) -> Void {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func _bjs_struct_lower_Library_Shelf(_ objectId: Int32) -> Void {
+    return _bjs_struct_lower_Library_Shelf_extern(objectId)
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "swift_js_struct_lift_Library_Shelf")
+fileprivate func _bjs_struct_lift_Library_Shelf_extern() -> Int32
+#else
+fileprivate func _bjs_struct_lift_Library_Shelf_extern() -> Int32 {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func _bjs_struct_lift_Library_Shelf() -> Int32 {
+    return _bjs_struct_lift_Library_Shelf_extern()
+}
+
+extension Library.Shelf.Divider: _BridgedSwiftStruct {
+    @_spi(BridgeJS) @_transparent public static func bridgeJSStackPop() -> Library.Shelf.Divider {
+        let slot = Int.bridgeJSStackPop()
+        return Library.Shelf.Divider(slot: slot)
+    }
+
+    @_spi(BridgeJS) @_transparent public consuming func bridgeJSStackPush() {
+        self.slot.bridgeJSStackPush()
+    }
+
+    init(unsafelyCopying jsObject: JSObject) {
+        _bjs_struct_lower_Library_Shelf_Divider(jsObject.bridgeJSLowerParameter())
+        self = Self.bridgeJSStackPop()
+    }
+
+    func toJSObject() -> JSObject {
+        let __bjs_self = self
+        __bjs_self.bridgeJSStackPush()
+        return JSObject(id: UInt32(bitPattern: _bjs_struct_lift_Library_Shelf_Divider()))
+    }
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "swift_js_struct_lower_Library_Shelf_Divider")
+fileprivate func _bjs_struct_lower_Library_Shelf_Divider_extern(_ objectId: Int32) -> Void
+#else
+fileprivate func _bjs_struct_lower_Library_Shelf_Divider_extern(_ objectId: Int32) -> Void {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func _bjs_struct_lower_Library_Shelf_Divider(_ objectId: Int32) -> Void {
+    return _bjs_struct_lower_Library_Shelf_Divider_extern(objectId)
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "swift_js_struct_lift_Library_Shelf_Divider")
+fileprivate func _bjs_struct_lift_Library_Shelf_Divider_extern() -> Int32
+#else
+fileprivate func _bjs_struct_lift_Library_Shelf_Divider_extern() -> Int32 {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func _bjs_struct_lift_Library_Shelf_Divider() -> Int32 {
+    return _bjs_struct_lift_Library_Shelf_Divider_extern()
+}
+
+@_expose(wasm, "bjs_Library_Shelf_Divider_init")
+@_cdecl("bjs_Library_Shelf_Divider_init")
+public func _bjs_Library_Shelf_Divider_init(_ slot: Int32) -> Void {
+    #if arch(wasm32)
+    let ret = Library.Shelf.Divider(slot: Int.bridgeJSLiftParameter(slot))
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+extension Outer.Inner: _BridgedSwiftStruct {
+    @_spi(BridgeJS) @_transparent public static func bridgeJSStackPop() -> Outer.Inner {
+        return Outer.Inner()
+    }
+
+    @_spi(BridgeJS) @_transparent public consuming func bridgeJSStackPush() {
+    }
+
+    init(unsafelyCopying jsObject: JSObject) {
+        _bjs_struct_lower_Outer_Inner(jsObject.bridgeJSLowerParameter())
+        self = Self.bridgeJSStackPop()
+    }
+
+    func toJSObject() -> JSObject {
+        let __bjs_self = self
+        __bjs_self.bridgeJSStackPush()
+        return JSObject(id: UInt32(bitPattern: _bjs_struct_lift_Outer_Inner()))
+    }
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "swift_js_struct_lower_Outer_Inner")
+fileprivate func _bjs_struct_lower_Outer_Inner_extern(_ objectId: Int32) -> Void
+#else
+fileprivate func _bjs_struct_lower_Outer_Inner_extern(_ objectId: Int32) -> Void {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func _bjs_struct_lower_Outer_Inner(_ objectId: Int32) -> Void {
+    return _bjs_struct_lower_Outer_Inner_extern(objectId)
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "swift_js_struct_lift_Outer_Inner")
+fileprivate func _bjs_struct_lift_Outer_Inner_extern() -> Int32
+#else
+fileprivate func _bjs_struct_lift_Outer_Inner_extern() -> Int32 {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func _bjs_struct_lift_Outer_Inner() -> Int32 {
+    return _bjs_struct_lift_Outer_Inner_extern()
+}
+
+@_expose(wasm, "bjs_Outer_Inner_init")
+@_cdecl("bjs_Outer_Inner_init")
+public func _bjs_Outer_Inner_init() -> Void {
+    #if arch(wasm32)
+    let ret = Outer.Inner()
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_Outer_Inner_marker")
+@_cdecl("bjs_Outer_Inner_marker")
+public func _bjs_Outer_Inner_marker() -> Int32 {
+    #if arch(wasm32)
+    let ret = Outer.Inner.bridgeJSLiftParameter().marker()
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+extension Outer.Inner.Outer: _BridgedSwiftStruct {
+    @_spi(BridgeJS) @_transparent public static func bridgeJSStackPop() -> Outer.Inner.Outer {
+        return Outer.Inner.Outer()
+    }
+
+    @_spi(BridgeJS) @_transparent public consuming func bridgeJSStackPush() {
+    }
+
+    init(unsafelyCopying jsObject: JSObject) {
+        _bjs_struct_lower_Outer_Inner_Outer(jsObject.bridgeJSLowerParameter())
+        self = Self.bridgeJSStackPop()
+    }
+
+    func toJSObject() -> JSObject {
+        let __bjs_self = self
+        __bjs_self.bridgeJSStackPush()
+        return JSObject(id: UInt32(bitPattern: _bjs_struct_lift_Outer_Inner_Outer()))
+    }
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "swift_js_struct_lower_Outer_Inner_Outer")
+fileprivate func _bjs_struct_lower_Outer_Inner_Outer_extern(_ objectId: Int32) -> Void
+#else
+fileprivate func _bjs_struct_lower_Outer_Inner_Outer_extern(_ objectId: Int32) -> Void {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func _bjs_struct_lower_Outer_Inner_Outer(_ objectId: Int32) -> Void {
+    return _bjs_struct_lower_Outer_Inner_Outer_extern(objectId)
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "swift_js_struct_lift_Outer_Inner_Outer")
+fileprivate func _bjs_struct_lift_Outer_Inner_Outer_extern() -> Int32
+#else
+fileprivate func _bjs_struct_lift_Outer_Inner_Outer_extern() -> Int32 {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func _bjs_struct_lift_Outer_Inner_Outer() -> Int32 {
+    return _bjs_struct_lift_Outer_Inner_Outer_extern()
+}
+
+extension Outer.Inner.Outer.Inner: _BridgedSwiftStruct {
+    @_spi(BridgeJS) @_transparent public static func bridgeJSStackPop() -> Outer.Inner.Outer.Inner {
+        return Outer.Inner.Outer.Inner()
+    }
+
+    @_spi(BridgeJS) @_transparent public consuming func bridgeJSStackPush() {
+    }
+
+    init(unsafelyCopying jsObject: JSObject) {
+        _bjs_struct_lower_Outer_Inner_Outer_Inner(jsObject.bridgeJSLowerParameter())
+        self = Self.bridgeJSStackPop()
+    }
+
+    func toJSObject() -> JSObject {
+        let __bjs_self = self
+        __bjs_self.bridgeJSStackPush()
+        return JSObject(id: UInt32(bitPattern: _bjs_struct_lift_Outer_Inner_Outer_Inner()))
+    }
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "swift_js_struct_lower_Outer_Inner_Outer_Inner")
+fileprivate func _bjs_struct_lower_Outer_Inner_Outer_Inner_extern(_ objectId: Int32) -> Void
+#else
+fileprivate func _bjs_struct_lower_Outer_Inner_Outer_Inner_extern(_ objectId: Int32) -> Void {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func _bjs_struct_lower_Outer_Inner_Outer_Inner(_ objectId: Int32) -> Void {
+    return _bjs_struct_lower_Outer_Inner_Outer_Inner_extern(objectId)
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "swift_js_struct_lift_Outer_Inner_Outer_Inner")
+fileprivate func _bjs_struct_lift_Outer_Inner_Outer_Inner_extern() -> Int32
+#else
+fileprivate func _bjs_struct_lift_Outer_Inner_Outer_Inner_extern() -> Int32 {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func _bjs_struct_lift_Outer_Inner_Outer_Inner() -> Int32 {
+    return _bjs_struct_lift_Outer_Inner_Outer_Inner_extern()
+}
+
+@_expose(wasm, "bjs_Outer_Inner_Outer_Inner_init")
+@_cdecl("bjs_Outer_Inner_Outer_Inner_init")
+public func _bjs_Outer_Inner_Outer_Inner_init() -> Void {
+    #if arch(wasm32)
+    let ret = Outer.Inner.Outer.Inner()
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_Library_init")
+@_cdecl("bjs_Library_init")
+public func _bjs_Library_init() -> UnsafeMutableRawPointer {
+    #if arch(wasm32)
+    let ret = Library()
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_Library_divider")
+@_cdecl("bjs_Library_divider")
+public func _bjs_Library_divider(_ _self: UnsafeMutableRawPointer) -> Void {
+    #if arch(wasm32)
+    let ret = Library.bridgeJSLiftParameter(_self).divider(_: Library.Shelf.Divider.bridgeJSLiftParameter())
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_Library_deinit")
+@_cdecl("bjs_Library_deinit")
+public func _bjs_Library_deinit(_ pointer: UnsafeMutableRawPointer) -> Void {
+    #if arch(wasm32)
+    Unmanaged<Library>.fromOpaque(pointer).release()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+extension Library: ConvertibleToJSValue, _BridgedSwiftHeapObject, _BridgedSwiftProtocolExportable {
+    var jsValue: JSValue {
+        return .object(JSObject(id: UInt32(bitPattern: _bjs_Library_wrap(Unmanaged.passRetained(self).toOpaque()))))
+    }
+    consuming func bridgeJSLowerAsProtocolReturn() -> Int32 {
+        _bjs_Library_wrap(Unmanaged.passRetained(self).toOpaque())
+    }
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "TestModule", name: "bjs_Library_wrap")
+fileprivate func _bjs_Library_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32
+#else
+fileprivate func _bjs_Library_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func _bjs_Library_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 {
+    return _bjs_Library_wrap_extern(pointer)
+}
+
+@_expose(wasm, "bjs_Outer_init")
+@_cdecl("bjs_Outer_init")
+public func _bjs_Outer_init() -> UnsafeMutableRawPointer {
+    #if arch(wasm32)
+    let ret = Outer()
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_Outer_deinit")
+@_cdecl("bjs_Outer_deinit")
+public func _bjs_Outer_deinit(_ pointer: UnsafeMutableRawPointer) -> Void {
+    #if arch(wasm32)
+    Unmanaged<Outer>.fromOpaque(pointer).release()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+extension Outer: ConvertibleToJSValue, _BridgedSwiftHeapObject, _BridgedSwiftProtocolExportable {
+    var jsValue: JSValue {
+        return .object(JSObject(id: UInt32(bitPattern: _bjs_Outer_wrap(Unmanaged.passRetained(self).toOpaque()))))
+    }
+    consuming func bridgeJSLowerAsProtocolReturn() -> Int32 {
+        _bjs_Outer_wrap(Unmanaged.passRetained(self).toOpaque())
+    }
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "TestModule", name: "bjs_Outer_wrap")
+fileprivate func _bjs_Outer_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32
+#else
+fileprivate func _bjs_Outer_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func _bjs_Outer_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 {
+    return _bjs_Outer_wrap_extern(pointer)
+}
+
+extension Library.Shelf: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = Library.Shelf.bridgeJSMakeTypeHandle()
+}
+
+extension Library.Shelf.Divider: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = Library.Shelf.Divider.bridgeJSMakeTypeHandle()
+}
+
+extension Outer.Inner: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = Outer.Inner.bridgeJSMakeTypeHandle()
+}
+
+extension Outer.Inner.Outer: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = Outer.Inner.Outer.bridgeJSMakeTypeHandle()
+}
+
+extension Outer.Inner.Outer.Inner: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = Outer.Inner.Outer.Inner.bridgeJSMakeTypeHandle()
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "bjs_TestModule_register_type_handles")
+fileprivate func _bjs_TestModule_register_type_handles_extern(_ base: UnsafePointer<Int32>?, _ count: Int32)
+
+@_expose(wasm, "bjs_TestModule_register_type_handles")
+public func _bjs_TestModule_register_type_handles() {
+    let typeIds: [Int32] = [
+        Library.Shelf.bridgeJSTypeID,
+        Library.Shelf.Divider.bridgeJSTypeID,
+        Outer.Inner.bridgeJSTypeID,
+        Outer.Inner.Outer.bridgeJSTypeID,
+        Outer.Inner.Outer.Inner.bridgeJSTypeID,
+    ]
+    typeIds.withUnsafeBufferPointer { buffer in
+        _bjs_TestModule_register_type_handles_extern(buffer.baseAddress, Int32(buffer.count))
+    }
+}
+#endif
\ No newline at end of file
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/StaticFunctions.Global.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/StaticFunctions.Global.json
index 800018440..c023fd8ab 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/StaticFunctions.Global.json
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/StaticFunctions.Global.json
@@ -1,5 +1,8 @@
 {
   "exported" : {
+    "aliases" : [
+
+    ],
     "classes" : [
       {
         "constructor" : {
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/StaticFunctions.Global.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/StaticFunctions.Global.swift
index 896258915..2d5a93c54 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/StaticFunctions.Global.swift
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/StaticFunctions.Global.swift
@@ -207,4 +207,28 @@ fileprivate func _bjs_MathUtils_wrap_extern(_ pointer: UnsafeMutableRawPointer)
 #endif
 @inline(never) fileprivate func _bjs_MathUtils_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 {
     return _bjs_MathUtils_wrap_extern(pointer)
-}
\ No newline at end of file
+}
+
+extension Calculator: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = Calculator.bridgeJSMakeTypeHandle()
+}
+
+extension APIResult: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = APIResult.bridgeJSMakeTypeHandle()
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "bjs_TestModule_register_type_handles")
+fileprivate func _bjs_TestModule_register_type_handles_extern(_ base: UnsafePointer<Int32>?, _ count: Int32)
+
+@_expose(wasm, "bjs_TestModule_register_type_handles")
+public func _bjs_TestModule_register_type_handles() {
+    let typeIds: [Int32] = [
+        Calculator.bridgeJSTypeID,
+        APIResult.bridgeJSTypeID,
+    ]
+    typeIds.withUnsafeBufferPointer { buffer in
+        _bjs_TestModule_register_type_handles_extern(buffer.baseAddress, Int32(buffer.count))
+    }
+}
+#endif
\ No newline at end of file
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/StaticFunctions.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/StaticFunctions.json
index 36110488c..c80a6bb3e 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/StaticFunctions.json
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/StaticFunctions.json
@@ -1,5 +1,8 @@
 {
   "exported" : {
+    "aliases" : [
+
+    ],
     "classes" : [
       {
         "constructor" : {
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/StaticFunctions.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/StaticFunctions.swift
index 896258915..2d5a93c54 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/StaticFunctions.swift
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/StaticFunctions.swift
@@ -207,4 +207,28 @@ fileprivate func _bjs_MathUtils_wrap_extern(_ pointer: UnsafeMutableRawPointer)
 #endif
 @inline(never) fileprivate func _bjs_MathUtils_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 {
     return _bjs_MathUtils_wrap_extern(pointer)
-}
\ No newline at end of file
+}
+
+extension Calculator: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = Calculator.bridgeJSMakeTypeHandle()
+}
+
+extension APIResult: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = APIResult.bridgeJSMakeTypeHandle()
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "bjs_TestModule_register_type_handles")
+fileprivate func _bjs_TestModule_register_type_handles_extern(_ base: UnsafePointer<Int32>?, _ count: Int32)
+
+@_expose(wasm, "bjs_TestModule_register_type_handles")
+public func _bjs_TestModule_register_type_handles() {
+    let typeIds: [Int32] = [
+        Calculator.bridgeJSTypeID,
+        APIResult.bridgeJSTypeID,
+    ]
+    typeIds.withUnsafeBufferPointer { buffer in
+        _bjs_TestModule_register_type_handles_extern(buffer.baseAddress, Int32(buffer.count))
+    }
+}
+#endif
\ No newline at end of file
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/StaticProperties.Global.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/StaticProperties.Global.json
index 1cbe44619..7935c2aa1 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/StaticProperties.Global.json
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/StaticProperties.Global.json
@@ -1,5 +1,8 @@
 {
   "exported" : {
+    "aliases" : [
+
+    ],
     "classes" : [
       {
         "constructor" : {
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/StaticProperties.Global.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/StaticProperties.Global.swift
index ded55dbd4..721c5335a 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/StaticProperties.Global.swift
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/StaticProperties.Global.swift
@@ -338,4 +338,23 @@ fileprivate func _bjs_PropertyClass_wrap_extern(_ pointer: UnsafeMutableRawPoint
 #endif
 @inline(never) fileprivate func _bjs_PropertyClass_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 {
     return _bjs_PropertyClass_wrap_extern(pointer)
-}
\ No newline at end of file
+}
+
+extension PropertyEnum: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = PropertyEnum.bridgeJSMakeTypeHandle()
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "bjs_TestModule_register_type_handles")
+fileprivate func _bjs_TestModule_register_type_handles_extern(_ base: UnsafePointer<Int32>?, _ count: Int32)
+
+@_expose(wasm, "bjs_TestModule_register_type_handles")
+public func _bjs_TestModule_register_type_handles() {
+    let typeIds: [Int32] = [
+        PropertyEnum.bridgeJSTypeID,
+    ]
+    typeIds.withUnsafeBufferPointer { buffer in
+        _bjs_TestModule_register_type_handles_extern(buffer.baseAddress, Int32(buffer.count))
+    }
+}
+#endif
\ No newline at end of file
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/StaticProperties.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/StaticProperties.json
index 8fc0667b0..35a94cddd 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/StaticProperties.json
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/StaticProperties.json
@@ -1,5 +1,8 @@
 {
   "exported" : {
+    "aliases" : [
+
+    ],
     "classes" : [
       {
         "constructor" : {
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/StaticProperties.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/StaticProperties.swift
index ded55dbd4..721c5335a 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/StaticProperties.swift
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/StaticProperties.swift
@@ -338,4 +338,23 @@ fileprivate func _bjs_PropertyClass_wrap_extern(_ pointer: UnsafeMutableRawPoint
 #endif
 @inline(never) fileprivate func _bjs_PropertyClass_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 {
     return _bjs_PropertyClass_wrap_extern(pointer)
-}
\ No newline at end of file
+}
+
+extension PropertyEnum: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = PropertyEnum.bridgeJSMakeTypeHandle()
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "bjs_TestModule_register_type_handles")
+fileprivate func _bjs_TestModule_register_type_handles_extern(_ base: UnsafePointer<Int32>?, _ count: Int32)
+
+@_expose(wasm, "bjs_TestModule_register_type_handles")
+public func _bjs_TestModule_register_type_handles() {
+    let typeIds: [Int32] = [
+        PropertyEnum.bridgeJSTypeID,
+    ]
+    typeIds.withUnsafeBufferPointer { buffer in
+        _bjs_TestModule_register_type_handles_extern(buffer.baseAddress, Int32(buffer.count))
+    }
+}
+#endif
\ No newline at end of file
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/StringParameter.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/StringParameter.json
index d9dc0ec43..68b13c0b0 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/StringParameter.json
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/StringParameter.json
@@ -1,5 +1,8 @@
 {
   "exported" : {
+    "aliases" : [
+
+    ],
     "classes" : [
 
     ],
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/StringReturn.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/StringReturn.json
index e2cf9ffac..f1e2ccbfd 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/StringReturn.json
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/StringReturn.json
@@ -1,5 +1,8 @@
 {
   "exported" : {
+    "aliases" : [
+
+    ],
     "classes" : [
 
     ],
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/StructWithNestedTypes.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/StructWithNestedTypes.json
new file mode 100644
index 000000000..ec470b65f
--- /dev/null
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/StructWithNestedTypes.json
@@ -0,0 +1,337 @@
+{
+  "exported" : {
+    "aliases" : [
+
+    ],
+    "classes" : [
+
+    ],
+    "enums" : [
+      {
+        "cases" : [
+          {
+            "associatedValues" : [
+
+            ],
+            "name" : "circle"
+          },
+          {
+            "associatedValues" : [
+
+            ],
+            "name" : "square"
+          }
+        ],
+        "emitStyle" : "const",
+        "name" : "Kind",
+        "namespace" : [
+          "Shape"
+        ],
+        "rawType" : "String",
+        "staticMethods" : [
+
+        ],
+        "staticProperties" : [
+
+        ],
+        "swiftCallName" : "Shape.Kind",
+        "tsFullPath" : "Shape.Kind"
+      },
+      {
+        "cases" : [
+          {
+            "associatedValues" : [
+
+            ],
+            "name" : "button"
+          },
+          {
+            "associatedValues" : [
+
+            ],
+            "name" : "slider"
+          }
+        ],
+        "emitStyle" : "const",
+        "name" : "Variant",
+        "namespace" : [
+          "Widget"
+        ],
+        "rawType" : "String",
+        "staticMethods" : [
+
+        ],
+        "staticProperties" : [
+
+        ],
+        "swiftCallName" : "Widget.Variant",
+        "tsFullPath" : "Widget.Variant"
+      },
+      {
+        "cases" : [
+          {
+            "associatedValues" : [
+
+            ],
+            "name" : "leading"
+          },
+          {
+            "associatedValues" : [
+
+            ],
+            "name" : "trailing"
+          }
+        ],
+        "emitStyle" : "const",
+        "name" : "Alignment",
+        "namespace" : [
+          "Widget",
+          "Layout"
+        ],
+        "rawType" : "String",
+        "staticMethods" : [
+
+        ],
+        "staticProperties" : [
+
+        ],
+        "swiftCallName" : "Widget.Layout.Alignment",
+        "tsFullPath" : "Widget.Layout.Alignment"
+      }
+    ],
+    "exposeToGlobal" : false,
+    "functions" : [
+
+    ],
+    "protocols" : [
+
+    ],
+    "structs" : [
+      {
+        "constructor" : {
+          "abiName" : "bjs_Shape_init",
+          "effects" : {
+            "isAsync" : false,
+            "isStatic" : false,
+            "isThrows" : false
+          },
+          "parameters" : [
+            {
+              "label" : "label",
+              "name" : "label",
+              "type" : {
+                "string" : {
+
+                }
+              }
+            }
+          ]
+        },
+        "methods" : [
+
+        ],
+        "name" : "Shape",
+        "properties" : [
+          {
+            "isReadonly" : true,
+            "isStatic" : false,
+            "name" : "label",
+            "type" : {
+              "string" : {
+
+              }
+            }
+          }
+        ],
+        "swiftCallName" : "Shape"
+      },
+      {
+        "constructor" : {
+          "abiName" : "bjs_Widget_init",
+          "effects" : {
+            "isAsync" : false,
+            "isStatic" : false,
+            "isThrows" : false
+          },
+          "parameters" : [
+            {
+              "label" : "name",
+              "name" : "name",
+              "type" : {
+                "string" : {
+
+                }
+              }
+            }
+          ]
+        },
+        "methods" : [
+
+        ],
+        "name" : "Widget",
+        "properties" : [
+          {
+            "isReadonly" : true,
+            "isStatic" : false,
+            "name" : "name",
+            "type" : {
+              "string" : {
+
+              }
+            }
+          }
+        ],
+        "swiftCallName" : "Widget"
+      },
+      {
+        "methods" : [
+
+        ],
+        "name" : "Layout",
+        "namespace" : [
+          "Widget"
+        ],
+        "properties" : [
+          {
+            "isReadonly" : true,
+            "isStatic" : false,
+            "name" : "padding",
+            "namespace" : [
+              "Widget"
+            ],
+            "type" : {
+              "integer" : {
+                "_0" : {
+                  "isSigned" : true,
+                  "width" : "word"
+                }
+              }
+            }
+          }
+        ],
+        "swiftCallName" : "Widget.Layout"
+      },
+      {
+        "constructor" : {
+          "abiName" : "bjs_Widget_Bounds_init",
+          "effects" : {
+            "isAsync" : false,
+            "isStatic" : false,
+            "isThrows" : false
+          },
+          "parameters" : [
+            {
+              "label" : "width",
+              "name" : "width",
+              "type" : {
+                "integer" : {
+                  "_0" : {
+                    "isSigned" : true,
+                    "width" : "word"
+                  }
+                }
+              }
+            },
+            {
+              "label" : "height",
+              "name" : "height",
+              "type" : {
+                "integer" : {
+                  "_0" : {
+                    "isSigned" : true,
+                    "width" : "word"
+                  }
+                }
+              }
+            }
+          ]
+        },
+        "methods" : [
+          {
+            "abiName" : "bjs_Widget_Bounds_static_zero",
+            "effects" : {
+              "isAsync" : false,
+              "isStatic" : true,
+              "isThrows" : false
+            },
+            "name" : "zero",
+            "parameters" : [
+
+            ],
+            "returnType" : {
+              "swiftStruct" : {
+                "_0" : "Widget.Bounds"
+              }
+            },
+            "staticContext" : {
+              "structName" : {
+                "_0" : "Widget_Bounds"
+              }
+            }
+          }
+        ],
+        "name" : "Bounds",
+        "namespace" : [
+          "Widget"
+        ],
+        "properties" : [
+          {
+            "isReadonly" : true,
+            "isStatic" : false,
+            "name" : "width",
+            "namespace" : [
+              "Widget"
+            ],
+            "type" : {
+              "integer" : {
+                "_0" : {
+                  "isSigned" : true,
+                  "width" : "word"
+                }
+              }
+            }
+          },
+          {
+            "isReadonly" : true,
+            "isStatic" : false,
+            "name" : "height",
+            "namespace" : [
+              "Widget"
+            ],
+            "type" : {
+              "integer" : {
+                "_0" : {
+                  "isSigned" : true,
+                  "width" : "word"
+                }
+              }
+            }
+          },
+          {
+            "isReadonly" : true,
+            "isStatic" : true,
+            "name" : "dimensions",
+            "staticContext" : {
+              "structName" : {
+                "_0" : "Widget_Bounds"
+              }
+            },
+            "type" : {
+              "integer" : {
+                "_0" : {
+                  "isSigned" : true,
+                  "width" : "word"
+                }
+              }
+            }
+          }
+        ],
+        "swiftCallName" : "Widget.Bounds"
+      }
+    ]
+  },
+  "moduleName" : "TestModule",
+  "usedExternalModules" : [
+
+  ]
+}
\ No newline at end of file
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/StructWithNestedTypes.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/StructWithNestedTypes.swift
new file mode 100644
index 000000000..8fc6db1a7
--- /dev/null
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/StructWithNestedTypes.swift
@@ -0,0 +1,298 @@
+extension Shape.Kind: _BridgedSwiftEnumNoPayload, _BridgedSwiftRawValueEnum {
+}
+
+extension Widget.Variant: _BridgedSwiftEnumNoPayload, _BridgedSwiftRawValueEnum {
+}
+
+extension Widget.Layout.Alignment: _BridgedSwiftEnumNoPayload, _BridgedSwiftRawValueEnum {
+}
+
+extension Shape: _BridgedSwiftStruct {
+    @_spi(BridgeJS) @_transparent public static func bridgeJSStackPop() -> Shape {
+        let label = String.bridgeJSStackPop()
+        return Shape(label: label)
+    }
+
+    @_spi(BridgeJS) @_transparent public consuming func bridgeJSStackPush() {
+        self.label.bridgeJSStackPush()
+    }
+
+    init(unsafelyCopying jsObject: JSObject) {
+        _bjs_struct_lower_Shape(jsObject.bridgeJSLowerParameter())
+        self = Self.bridgeJSStackPop()
+    }
+
+    func toJSObject() -> JSObject {
+        let __bjs_self = self
+        __bjs_self.bridgeJSStackPush()
+        return JSObject(id: UInt32(bitPattern: _bjs_struct_lift_Shape()))
+    }
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "swift_js_struct_lower_Shape")
+fileprivate func _bjs_struct_lower_Shape_extern(_ objectId: Int32) -> Void
+#else
+fileprivate func _bjs_struct_lower_Shape_extern(_ objectId: Int32) -> Void {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func _bjs_struct_lower_Shape(_ objectId: Int32) -> Void {
+    return _bjs_struct_lower_Shape_extern(objectId)
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "swift_js_struct_lift_Shape")
+fileprivate func _bjs_struct_lift_Shape_extern() -> Int32
+#else
+fileprivate func _bjs_struct_lift_Shape_extern() -> Int32 {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func _bjs_struct_lift_Shape() -> Int32 {
+    return _bjs_struct_lift_Shape_extern()
+}
+
+@_expose(wasm, "bjs_Shape_init")
+@_cdecl("bjs_Shape_init")
+public func _bjs_Shape_init(_ labelBytes: Int32, _ labelLength: Int32) -> Void {
+    #if arch(wasm32)
+    let ret = Shape(label: String.bridgeJSLiftParameter(labelBytes, labelLength))
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+extension Widget: _BridgedSwiftStruct {
+    @_spi(BridgeJS) @_transparent public static func bridgeJSStackPop() -> Widget {
+        let name = String.bridgeJSStackPop()
+        return Widget(name: name)
+    }
+
+    @_spi(BridgeJS) @_transparent public consuming func bridgeJSStackPush() {
+        self.name.bridgeJSStackPush()
+    }
+
+    init(unsafelyCopying jsObject: JSObject) {
+        _bjs_struct_lower_Widget(jsObject.bridgeJSLowerParameter())
+        self = Self.bridgeJSStackPop()
+    }
+
+    func toJSObject() -> JSObject {
+        let __bjs_self = self
+        __bjs_self.bridgeJSStackPush()
+        return JSObject(id: UInt32(bitPattern: _bjs_struct_lift_Widget()))
+    }
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "swift_js_struct_lower_Widget")
+fileprivate func _bjs_struct_lower_Widget_extern(_ objectId: Int32) -> Void
+#else
+fileprivate func _bjs_struct_lower_Widget_extern(_ objectId: Int32) -> Void {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func _bjs_struct_lower_Widget(_ objectId: Int32) -> Void {
+    return _bjs_struct_lower_Widget_extern(objectId)
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "swift_js_struct_lift_Widget")
+fileprivate func _bjs_struct_lift_Widget_extern() -> Int32
+#else
+fileprivate func _bjs_struct_lift_Widget_extern() -> Int32 {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func _bjs_struct_lift_Widget() -> Int32 {
+    return _bjs_struct_lift_Widget_extern()
+}
+
+@_expose(wasm, "bjs_Widget_init")
+@_cdecl("bjs_Widget_init")
+public func _bjs_Widget_init(_ nameBytes: Int32, _ nameLength: Int32) -> Void {
+    #if arch(wasm32)
+    let ret = Widget(name: String.bridgeJSLiftParameter(nameBytes, nameLength))
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+extension Widget.Layout: _BridgedSwiftStruct {
+    @_spi(BridgeJS) @_transparent public static func bridgeJSStackPop() -> Widget.Layout {
+        let padding = Int.bridgeJSStackPop()
+        return Widget.Layout(padding: padding)
+    }
+
+    @_spi(BridgeJS) @_transparent public consuming func bridgeJSStackPush() {
+        self.padding.bridgeJSStackPush()
+    }
+
+    init(unsafelyCopying jsObject: JSObject) {
+        _bjs_struct_lower_Widget_Layout(jsObject.bridgeJSLowerParameter())
+        self = Self.bridgeJSStackPop()
+    }
+
+    func toJSObject() -> JSObject {
+        let __bjs_self = self
+        __bjs_self.bridgeJSStackPush()
+        return JSObject(id: UInt32(bitPattern: _bjs_struct_lift_Widget_Layout()))
+    }
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "swift_js_struct_lower_Widget_Layout")
+fileprivate func _bjs_struct_lower_Widget_Layout_extern(_ objectId: Int32) -> Void
+#else
+fileprivate func _bjs_struct_lower_Widget_Layout_extern(_ objectId: Int32) -> Void {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func _bjs_struct_lower_Widget_Layout(_ objectId: Int32) -> Void {
+    return _bjs_struct_lower_Widget_Layout_extern(objectId)
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "swift_js_struct_lift_Widget_Layout")
+fileprivate func _bjs_struct_lift_Widget_Layout_extern() -> Int32
+#else
+fileprivate func _bjs_struct_lift_Widget_Layout_extern() -> Int32 {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func _bjs_struct_lift_Widget_Layout() -> Int32 {
+    return _bjs_struct_lift_Widget_Layout_extern()
+}
+
+extension Widget.Bounds: _BridgedSwiftStruct {
+    @_spi(BridgeJS) @_transparent public static func bridgeJSStackPop() -> Widget.Bounds {
+        let height = Int.bridgeJSStackPop()
+        let width = Int.bridgeJSStackPop()
+        return Widget.Bounds(width: width, height: height)
+    }
+
+    @_spi(BridgeJS) @_transparent public consuming func bridgeJSStackPush() {
+        self.width.bridgeJSStackPush()
+        self.height.bridgeJSStackPush()
+    }
+
+    init(unsafelyCopying jsObject: JSObject) {
+        _bjs_struct_lower_Widget_Bounds(jsObject.bridgeJSLowerParameter())
+        self = Self.bridgeJSStackPop()
+    }
+
+    func toJSObject() -> JSObject {
+        let __bjs_self = self
+        __bjs_self.bridgeJSStackPush()
+        return JSObject(id: UInt32(bitPattern: _bjs_struct_lift_Widget_Bounds()))
+    }
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "swift_js_struct_lower_Widget_Bounds")
+fileprivate func _bjs_struct_lower_Widget_Bounds_extern(_ objectId: Int32) -> Void
+#else
+fileprivate func _bjs_struct_lower_Widget_Bounds_extern(_ objectId: Int32) -> Void {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func _bjs_struct_lower_Widget_Bounds(_ objectId: Int32) -> Void {
+    return _bjs_struct_lower_Widget_Bounds_extern(objectId)
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "swift_js_struct_lift_Widget_Bounds")
+fileprivate func _bjs_struct_lift_Widget_Bounds_extern() -> Int32
+#else
+fileprivate func _bjs_struct_lift_Widget_Bounds_extern() -> Int32 {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func _bjs_struct_lift_Widget_Bounds() -> Int32 {
+    return _bjs_struct_lift_Widget_Bounds_extern()
+}
+
+@_expose(wasm, "bjs_Widget_Bounds_init")
+@_cdecl("bjs_Widget_Bounds_init")
+public func _bjs_Widget_Bounds_init(_ width: Int32, _ height: Int32) -> Void {
+    #if arch(wasm32)
+    let ret = Widget.Bounds(width: Int.bridgeJSLiftParameter(width), height: Int.bridgeJSLiftParameter(height))
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_Widget_Bounds_static_dimensions_get")
+@_cdecl("bjs_Widget_Bounds_static_dimensions_get")
+public func _bjs_Widget_Bounds_static_dimensions_get() -> Int32 {
+    #if arch(wasm32)
+    let ret = Widget.Bounds.dimensions
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_Widget_Bounds_static_zero")
+@_cdecl("bjs_Widget_Bounds_static_zero")
+public func _bjs_Widget_Bounds_static_zero() -> Void {
+    #if arch(wasm32)
+    let ret = Widget.Bounds.zero()
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+extension Shape: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = Shape.bridgeJSMakeTypeHandle()
+}
+
+extension Widget: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = Widget.bridgeJSMakeTypeHandle()
+}
+
+extension Widget.Layout: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = Widget.Layout.bridgeJSMakeTypeHandle()
+}
+
+extension Widget.Bounds: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = Widget.Bounds.bridgeJSMakeTypeHandle()
+}
+
+extension Shape.Kind: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = Shape.Kind.bridgeJSMakeTypeHandle()
+}
+
+extension Widget.Variant: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = Widget.Variant.bridgeJSMakeTypeHandle()
+}
+
+extension Widget.Layout.Alignment: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = Widget.Layout.Alignment.bridgeJSMakeTypeHandle()
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "bjs_TestModule_register_type_handles")
+fileprivate func _bjs_TestModule_register_type_handles_extern(_ base: UnsafePointer<Int32>?, _ count: Int32)
+
+@_expose(wasm, "bjs_TestModule_register_type_handles")
+public func _bjs_TestModule_register_type_handles() {
+    let typeIds: [Int32] = [
+        Shape.bridgeJSTypeID,
+        Widget.bridgeJSTypeID,
+        Widget.Layout.bridgeJSTypeID,
+        Widget.Bounds.bridgeJSTypeID,
+        Shape.Kind.bridgeJSTypeID,
+        Widget.Variant.bridgeJSTypeID,
+        Widget.Layout.Alignment.bridgeJSTypeID,
+    ]
+    typeIds.withUnsafeBufferPointer { buffer in
+        _bjs_TestModule_register_type_handles_extern(buffer.baseAddress, Int32(buffer.count))
+    }
+}
+#endif
\ No newline at end of file
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftClass.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftClass.json
index a3ddab63e..e1bb767c1 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftClass.json
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftClass.json
@@ -1,5 +1,8 @@
 {
   "exported" : {
+    "aliases" : [
+
+    ],
     "classes" : [
       {
         "constructor" : {
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftClosure.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftClosure.json
index ac18f6dc2..0085dd6c4 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftClosure.json
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftClosure.json
@@ -1,5 +1,8 @@
 {
   "exported" : {
+    "aliases" : [
+
+    ],
     "classes" : [
       {
         "constructor" : {
@@ -1330,6 +1333,233 @@
           }
         }
       },
+      {
+        "abiName" : "bjs_makeThrowingParser",
+        "effects" : {
+          "isAsync" : false,
+          "isStatic" : false,
+          "isThrows" : false
+        },
+        "name" : "makeThrowingParser",
+        "parameters" : [
+
+        ],
+        "returnType" : {
+          "closure" : {
+            "_0" : {
+              "isAsync" : false,
+              "isThrows" : true,
+              "mangleName" : "10TestModuleKSS_Si",
+              "moduleName" : "TestModule",
+              "parameters" : [
+                {
+                  "string" : {
+
+                  }
+                }
+              ],
+              "returnType" : {
+                "integer" : {
+                  "_0" : {
+                    "isSigned" : true,
+                    "width" : "word"
+                  }
+                }
+              },
+              "sendingParameters" : false
+            },
+            "useJSTypedClosure" : true
+          }
+        }
+      },
+      {
+        "abiName" : "bjs_validateWith",
+        "effects" : {
+          "isAsync" : false,
+          "isStatic" : false,
+          "isThrows" : false
+        },
+        "name" : "validateWith",
+        "parameters" : [
+          {
+            "label" : "_",
+            "name" : "validate",
+            "type" : {
+              "closure" : {
+                "_0" : {
+                  "isAsync" : false,
+                  "isThrows" : true,
+                  "mangleName" : "10TestModuleKSS_Sb",
+                  "moduleName" : "TestModule",
+                  "parameters" : [
+                    {
+                      "string" : {
+
+                      }
+                    }
+                  ],
+                  "returnType" : {
+                    "bool" : {
+
+                    }
+                  },
+                  "sendingParameters" : false
+                },
+                "useJSTypedClosure" : false
+              }
+            }
+          }
+        ],
+        "returnType" : {
+          "void" : {
+
+          }
+        }
+      },
+      {
+        "abiName" : "bjs_makeFetcher",
+        "effects" : {
+          "isAsync" : false,
+          "isStatic" : false,
+          "isThrows" : false
+        },
+        "name" : "makeFetcher",
+        "parameters" : [
+
+        ],
+        "returnType" : {
+          "closure" : {
+            "_0" : {
+              "isAsync" : true,
+              "isThrows" : true,
+              "mangleName" : "10TestModuleYaKSS_SS",
+              "moduleName" : "TestModule",
+              "parameters" : [
+                {
+                  "string" : {
+
+                  }
+                }
+              ],
+              "returnType" : {
+                "string" : {
+
+                }
+              },
+              "sendingParameters" : false
+            },
+            "useJSTypedClosure" : true
+          }
+        }
+      },
+      {
+        "abiName" : "bjs_makeAsyncEcho",
+        "effects" : {
+          "isAsync" : false,
+          "isStatic" : false,
+          "isThrows" : false
+        },
+        "name" : "makeAsyncEcho",
+        "parameters" : [
+
+        ],
+        "returnType" : {
+          "closure" : {
+            "_0" : {
+              "isAsync" : true,
+              "isThrows" : false,
+              "mangleName" : "10TestModuleYaSS_SS",
+              "moduleName" : "TestModule",
+              "parameters" : [
+                {
+                  "string" : {
+
+                  }
+                }
+              ],
+              "returnType" : {
+                "string" : {
+
+                }
+              },
+              "sendingParameters" : false
+            },
+            "useJSTypedClosure" : true
+          }
+        }
+      },
+      {
+        "abiName" : "bjs_makeAnimalLoader",
+        "effects" : {
+          "isAsync" : false,
+          "isStatic" : false,
+          "isThrows" : false
+        },
+        "name" : "makeAnimalLoader",
+        "parameters" : [
+
+        ],
+        "returnType" : {
+          "closure" : {
+            "_0" : {
+              "isAsync" : true,
+              "isThrows" : false,
+              "mangleName" : "10TestModuleYaSS_6AnimalV",
+              "moduleName" : "TestModule",
+              "parameters" : [
+                {
+                  "string" : {
+
+                  }
+                }
+              ],
+              "returnType" : {
+                "swiftStruct" : {
+                  "_0" : "Animal"
+                }
+              },
+              "sendingParameters" : false
+            },
+            "useJSTypedClosure" : true
+          }
+        }
+      },
+      {
+        "abiName" : "bjs_makeResultLoader",
+        "effects" : {
+          "isAsync" : false,
+          "isStatic" : false,
+          "isThrows" : false
+        },
+        "name" : "makeResultLoader",
+        "parameters" : [
+
+        ],
+        "returnType" : {
+          "closure" : {
+            "_0" : {
+              "isAsync" : true,
+              "isThrows" : true,
+              "mangleName" : "10TestModuleYaKSb_9APIResultO",
+              "moduleName" : "TestModule",
+              "parameters" : [
+                {
+                  "bool" : {
+
+                  }
+                }
+              ],
+              "returnType" : {
+                "associatedValueEnum" : {
+                  "_0" : "APIResult"
+                }
+              },
+              "sendingParameters" : false
+            },
+            "useJSTypedClosure" : true
+          }
+        }
+      },
       {
         "abiName" : "bjs_roundtripDirection",
         "effects" : {
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftClosure.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftClosure.swift
index 4eb7c8da4..c2844aa9c 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftClosure.swift
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftClosure.swift
@@ -27,8 +27,8 @@ private enum _BJS_Closure_10TestModule10HttpStatusO_10HttpStatusO {
         let callback = JSObject.bridgeJSLiftParameter(callbackId)
         return { [callback] param0 in
             #if arch(wasm32)
-            let callbackValue = callback.bridgeJSLowerParameter()
             let param0Value = param0.bridgeJSLowerParameter()
+            let callbackValue = callback.bridgeJSLowerParameter()
             let ret = invoke_js_callback_TestModule_10TestModule10HttpStatusO_10HttpStatusO(callbackValue, param0Value)
             return HttpStatus.bridgeJSLiftReturn(ret)
             #else
@@ -90,8 +90,8 @@ private enum _BJS_Closure_10TestModule5ThemeO_5ThemeO {
         let callback = JSObject.bridgeJSLiftParameter(callbackId)
         return { [callback] param0 in
             #if arch(wasm32)
-            let callbackValue = callback.bridgeJSLowerParameter()
             let ret0 = param0.bridgeJSWithLoweredParameter { (param0Bytes, param0Length) in
+                let callbackValue = callback.bridgeJSLowerParameter()
                 let ret = invoke_js_callback_TestModule_10TestModule5ThemeO_5ThemeO(callbackValue, param0Bytes, param0Length)
                 return ret
             }
@@ -156,8 +156,8 @@ private enum _BJS_Closure_10TestModule6AnimalV_6AnimalV {
         let callback = JSObject.bridgeJSLiftParameter(callbackId)
         return { [callback] param0 in
             #if arch(wasm32)
-            let callbackValue = callback.bridgeJSLowerParameter()
             let _ = param0.bridgeJSLowerParameter()
+            let callbackValue = callback.bridgeJSLowerParameter()
             invoke_js_callback_TestModule_10TestModule6AnimalV_6AnimalV(callbackValue)
             return Animal.bridgeJSLiftReturn()
             #else
@@ -219,8 +219,8 @@ private enum _BJS_Closure_10TestModule6PersonC_6PersonC {
         let callback = JSObject.bridgeJSLiftParameter(callbackId)
         return { [callback] param0 in
             #if arch(wasm32)
-            let callbackValue = callback.bridgeJSLowerParameter()
             let param0Pointer = param0.bridgeJSLowerParameter()
+            let callbackValue = callback.bridgeJSLowerParameter()
             let ret = invoke_js_callback_TestModule_10TestModule6PersonC_6PersonC(callbackValue, param0Pointer)
             return Person.bridgeJSLiftReturn(ret)
             #else
@@ -282,8 +282,8 @@ private enum _BJS_Closure_10TestModule9APIResultO_9APIResultO {
         let callback = JSObject.bridgeJSLiftParameter(callbackId)
         return { [callback] param0 in
             #if arch(wasm32)
-            let callbackValue = callback.bridgeJSLowerParameter()
             let param0CaseId = param0.bridgeJSLowerParameter()
+            let callbackValue = callback.bridgeJSLowerParameter()
             let ret = invoke_js_callback_TestModule_10TestModule9APIResultO_9APIResultO(callbackValue, param0CaseId)
             return APIResult.bridgeJSLiftReturn(ret)
             #else
@@ -345,8 +345,8 @@ private enum _BJS_Closure_10TestModule9DirectionO_9DirectionO {
         let callback = JSObject.bridgeJSLiftParameter(callbackId)
         return { [callback] param0 in
             #if arch(wasm32)
-            let callbackValue = callback.bridgeJSLowerParameter()
             let param0Value = param0.bridgeJSLowerParameter()
+            let callbackValue = callback.bridgeJSLowerParameter()
             let ret = invoke_js_callback_TestModule_10TestModule9DirectionO_9DirectionO(callbackValue, param0Value)
             return Direction.bridgeJSLiftReturn(ret)
             #else
@@ -379,6 +379,172 @@ public func _invoke_swift_closure_TestModule_10TestModule9DirectionO_9DirectionO
     #endif
 }
 
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "invoke_js_callback_TestModule_10TestModuleKSS_Sb")
+fileprivate func invoke_js_callback_TestModule_10TestModuleKSS_Sb_extern(_ callback: Int32, _ param0Bytes: Int32, _ param0Length: Int32) -> Int32
+#else
+fileprivate func invoke_js_callback_TestModule_10TestModuleKSS_Sb_extern(_ callback: Int32, _ param0Bytes: Int32, _ param0Length: Int32) -> Int32 {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func invoke_js_callback_TestModule_10TestModuleKSS_Sb(_ callback: Int32, _ param0Bytes: Int32, _ param0Length: Int32) -> Int32 {
+    return invoke_js_callback_TestModule_10TestModuleKSS_Sb_extern(callback, param0Bytes, param0Length)
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "make_swift_closure_TestModule_10TestModuleKSS_Sb")
+fileprivate func make_swift_closure_TestModule_10TestModuleKSS_Sb_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer<UInt8>, _ line: UInt32) -> Int32
+#else
+fileprivate func make_swift_closure_TestModule_10TestModuleKSS_Sb_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer<UInt8>, _ line: UInt32) -> Int32 {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func make_swift_closure_TestModule_10TestModuleKSS_Sb(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer<UInt8>, _ line: UInt32) -> Int32 {
+    return make_swift_closure_TestModule_10TestModuleKSS_Sb_extern(boxPtr, file, line)
+}
+
+private enum _BJS_Closure_10TestModuleKSS_Sb {
+    static func bridgeJSLift(_ callbackId: Int32) -> (String) throws(JSException) -> Bool {
+        let callback = JSObject.bridgeJSLiftParameter(callbackId)
+        return { [callback] (param0: String) throws(JSException) -> Bool in
+            #if arch(wasm32)
+            let ret0 = param0.bridgeJSWithLoweredParameter { (param0Bytes, param0Length) in
+                let callbackValue = callback.bridgeJSLowerParameter()
+                let ret = invoke_js_callback_TestModule_10TestModuleKSS_Sb(callbackValue, param0Bytes, param0Length)
+                return ret
+            }
+            let ret = ret0
+            if let error = _swift_js_take_exception() {
+                throw error
+            }
+            return Bool.bridgeJSLiftReturn(ret)
+            #else
+            fatalError("Only available on WebAssembly")
+            #endif
+        }
+    }
+}
+
+extension JSTypedClosure where Signature == (String) throws(JSException) -> Bool {
+    init(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping (String) throws(JSException) -> Bool) {
+        self.init(
+            makeClosure: make_swift_closure_TestModule_10TestModuleKSS_Sb,
+            body: body,
+            fileID: fileID,
+            line: line
+        )
+    }
+}
+
+@_expose(wasm, "invoke_swift_closure_TestModule_10TestModuleKSS_Sb")
+@_cdecl("invoke_swift_closure_TestModule_10TestModuleKSS_Sb")
+public func _invoke_swift_closure_TestModule_10TestModuleKSS_Sb(_ boxPtr: UnsafeMutableRawPointer, _ param0Bytes: Int32, _ param0Length: Int32) -> Int32 {
+    #if arch(wasm32)
+    let closure = Unmanaged<_BridgeJSTypedClosureBox<(String) throws(JSException) -> Bool>>.fromOpaque(boxPtr).takeUnretainedValue().closure
+    do {
+        let result = try closure(String.bridgeJSLiftParameter(param0Bytes, param0Length))
+        return result.bridgeJSLowerReturn()
+    } catch let error {
+        if let error = error.thrownValue.object {
+            withExtendedLifetime(error) {
+                _swift_js_throw(Int32(bitPattern: $0.id))
+            }
+        } else {
+            let jsError = JSError(message: error.description)
+            withExtendedLifetime(jsError.jsObject) {
+                _swift_js_throw(Int32(bitPattern: $0.id))
+            }
+        }
+        return 0
+    }
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "invoke_js_callback_TestModule_10TestModuleKSS_Si")
+fileprivate func invoke_js_callback_TestModule_10TestModuleKSS_Si_extern(_ callback: Int32, _ param0Bytes: Int32, _ param0Length: Int32) -> Int32
+#else
+fileprivate func invoke_js_callback_TestModule_10TestModuleKSS_Si_extern(_ callback: Int32, _ param0Bytes: Int32, _ param0Length: Int32) -> Int32 {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func invoke_js_callback_TestModule_10TestModuleKSS_Si(_ callback: Int32, _ param0Bytes: Int32, _ param0Length: Int32) -> Int32 {
+    return invoke_js_callback_TestModule_10TestModuleKSS_Si_extern(callback, param0Bytes, param0Length)
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "make_swift_closure_TestModule_10TestModuleKSS_Si")
+fileprivate func make_swift_closure_TestModule_10TestModuleKSS_Si_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer<UInt8>, _ line: UInt32) -> Int32
+#else
+fileprivate func make_swift_closure_TestModule_10TestModuleKSS_Si_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer<UInt8>, _ line: UInt32) -> Int32 {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func make_swift_closure_TestModule_10TestModuleKSS_Si(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer<UInt8>, _ line: UInt32) -> Int32 {
+    return make_swift_closure_TestModule_10TestModuleKSS_Si_extern(boxPtr, file, line)
+}
+
+private enum _BJS_Closure_10TestModuleKSS_Si {
+    static func bridgeJSLift(_ callbackId: Int32) -> (String) throws(JSException) -> Int {
+        let callback = JSObject.bridgeJSLiftParameter(callbackId)
+        return { [callback] (param0: String) throws(JSException) -> Int in
+            #if arch(wasm32)
+            let ret0 = param0.bridgeJSWithLoweredParameter { (param0Bytes, param0Length) in
+                let callbackValue = callback.bridgeJSLowerParameter()
+                let ret = invoke_js_callback_TestModule_10TestModuleKSS_Si(callbackValue, param0Bytes, param0Length)
+                return ret
+            }
+            let ret = ret0
+            if let error = _swift_js_take_exception() {
+                throw error
+            }
+            return Int.bridgeJSLiftReturn(ret)
+            #else
+            fatalError("Only available on WebAssembly")
+            #endif
+        }
+    }
+}
+
+extension JSTypedClosure where Signature == (String) throws(JSException) -> Int {
+    init(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping (String) throws(JSException) -> Int) {
+        self.init(
+            makeClosure: make_swift_closure_TestModule_10TestModuleKSS_Si,
+            body: body,
+            fileID: fileID,
+            line: line
+        )
+    }
+}
+
+@_expose(wasm, "invoke_swift_closure_TestModule_10TestModuleKSS_Si")
+@_cdecl("invoke_swift_closure_TestModule_10TestModuleKSS_Si")
+public func _invoke_swift_closure_TestModule_10TestModuleKSS_Si(_ boxPtr: UnsafeMutableRawPointer, _ param0Bytes: Int32, _ param0Length: Int32) -> Int32 {
+    #if arch(wasm32)
+    let closure = Unmanaged<_BridgeJSTypedClosureBox<(String) throws(JSException) -> Int>>.fromOpaque(boxPtr).takeUnretainedValue().closure
+    do {
+        let result = try closure(String.bridgeJSLiftParameter(param0Bytes, param0Length))
+        return result.bridgeJSLowerReturn()
+    } catch let error {
+        if let error = error.thrownValue.object {
+            withExtendedLifetime(error) {
+                _swift_js_throw(Int32(bitPattern: $0.id))
+            }
+        } else {
+            let jsError = JSError(message: error.description)
+            withExtendedLifetime(jsError.jsObject) {
+                _swift_js_throw(Int32(bitPattern: $0.id))
+            }
+        }
+        return 0
+    }
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
 #if arch(wasm32)
 @_extern(wasm, module: "bjs", name: "invoke_js_callback_TestModule_10TestModuleSS_SS")
 fileprivate func invoke_js_callback_TestModule_10TestModuleSS_SS_extern(_ callback: Int32, _ param0Bytes: Int32, _ param0Length: Int32) -> Int32
@@ -408,8 +574,8 @@ private enum _BJS_Closure_10TestModuleSS_SS {
         let callback = JSObject.bridgeJSLiftParameter(callbackId)
         return { [callback] param0 in
             #if arch(wasm32)
-            let callbackValue = callback.bridgeJSLowerParameter()
             let ret0 = param0.bridgeJSWithLoweredParameter { (param0Bytes, param0Length) in
+                let callbackValue = callback.bridgeJSLowerParameter()
                 let ret = invoke_js_callback_TestModule_10TestModuleSS_SS(callbackValue, param0Bytes, param0Length)
                 return ret
             }
@@ -474,8 +640,8 @@ private enum _BJS_Closure_10TestModuleSb_Sb {
         let callback = JSObject.bridgeJSLiftParameter(callbackId)
         return { [callback] param0 in
             #if arch(wasm32)
-            let callbackValue = callback.bridgeJSLowerParameter()
             let param0Value = param0.bridgeJSLowerParameter()
+            let callbackValue = callback.bridgeJSLowerParameter()
             let ret = invoke_js_callback_TestModule_10TestModuleSb_Sb(callbackValue, param0Value)
             return Bool.bridgeJSLiftReturn(ret)
             #else
@@ -537,8 +703,8 @@ private enum _BJS_Closure_10TestModuleSd_Sd {
         let callback = JSObject.bridgeJSLiftParameter(callbackId)
         return { [callback] param0 in
             #if arch(wasm32)
-            let callbackValue = callback.bridgeJSLowerParameter()
             let param0Value = param0.bridgeJSLowerParameter()
+            let callbackValue = callback.bridgeJSLowerParameter()
             let ret = invoke_js_callback_TestModule_10TestModuleSd_Sd(callbackValue, param0Value)
             return Double.bridgeJSLiftReturn(ret)
             #else
@@ -600,8 +766,8 @@ private enum _BJS_Closure_10TestModuleSf_Sf {
         let callback = JSObject.bridgeJSLiftParameter(callbackId)
         return { [callback] param0 in
             #if arch(wasm32)
-            let callbackValue = callback.bridgeJSLowerParameter()
             let param0Value = param0.bridgeJSLowerParameter()
+            let callbackValue = callback.bridgeJSLowerParameter()
             let ret = invoke_js_callback_TestModule_10TestModuleSf_Sf(callbackValue, param0Value)
             return Float.bridgeJSLiftReturn(ret)
             #else
@@ -663,8 +829,8 @@ private enum _BJS_Closure_10TestModuleSi_Si {
         let callback = JSObject.bridgeJSLiftParameter(callbackId)
         return { [callback] param0 in
             #if arch(wasm32)
-            let callbackValue = callback.bridgeJSLowerParameter()
             let param0Value = param0.bridgeJSLowerParameter()
+            let callbackValue = callback.bridgeJSLowerParameter()
             let ret = invoke_js_callback_TestModule_10TestModuleSi_Si(callbackValue, param0Value)
             return Int.bridgeJSLiftReturn(ret)
             #else
@@ -726,8 +892,8 @@ private enum _BJS_Closure_10TestModuleSq10HttpStatusO_Sq10HttpStatusO {
         let callback = JSObject.bridgeJSLiftParameter(callbackId)
         return { [callback] param0 in
             #if arch(wasm32)
-            let callbackValue = callback.bridgeJSLowerParameter()
             let (param0IsSome, param0Value) = param0.bridgeJSLowerParameter()
+            let callbackValue = callback.bridgeJSLowerParameter()
             invoke_js_callback_TestModule_10TestModuleSq10HttpStatusO_Sq10HttpStatusO(callbackValue, param0IsSome, param0Value)
             return Optional<HttpStatus>.bridgeJSLiftReturnFromSideChannel()
             #else
@@ -789,8 +955,8 @@ private enum _BJS_Closure_10TestModuleSq5ThemeO_Sq5ThemeO {
         let callback = JSObject.bridgeJSLiftParameter(callbackId)
         return { [callback] param0 in
             #if arch(wasm32)
-            let callbackValue = callback.bridgeJSLowerParameter()
             param0.bridgeJSWithLoweredParameter { (param0IsSome, param0Bytes, param0Length) in
+                let callbackValue = callback.bridgeJSLowerParameter()
                 invoke_js_callback_TestModule_10TestModuleSq5ThemeO_Sq5ThemeO(callbackValue, param0IsSome, param0Bytes, param0Length)
             }
             return Optional<Theme>.bridgeJSLiftReturnFromSideChannel()
@@ -826,14 +992,14 @@ public func _invoke_swift_closure_TestModule_10TestModuleSq5ThemeO_Sq5ThemeO(_ b
 
 #if arch(wasm32)
 @_extern(wasm, module: "bjs", name: "invoke_js_callback_TestModule_10TestModuleSq6AnimalV_Sq6AnimalV")
-fileprivate func invoke_js_callback_TestModule_10TestModuleSq6AnimalV_Sq6AnimalV_extern(_ callback: Int32, _ param0: Int32) -> Void
+fileprivate func invoke_js_callback_TestModule_10TestModuleSq6AnimalV_Sq6AnimalV_extern(_ callback: Int32) -> Void
 #else
-fileprivate func invoke_js_callback_TestModule_10TestModuleSq6AnimalV_Sq6AnimalV_extern(_ callback: Int32, _ param0: Int32) -> Void {
+fileprivate func invoke_js_callback_TestModule_10TestModuleSq6AnimalV_Sq6AnimalV_extern(_ callback: Int32) -> Void {
     fatalError("Only available on WebAssembly")
 }
 #endif
-@inline(never) fileprivate func invoke_js_callback_TestModule_10TestModuleSq6AnimalV_Sq6AnimalV(_ callback: Int32, _ param0: Int32) -> Void {
-    return invoke_js_callback_TestModule_10TestModuleSq6AnimalV_Sq6AnimalV_extern(callback, param0)
+@inline(never) fileprivate func invoke_js_callback_TestModule_10TestModuleSq6AnimalV_Sq6AnimalV(_ callback: Int32) -> Void {
+    return invoke_js_callback_TestModule_10TestModuleSq6AnimalV_Sq6AnimalV_extern(callback)
 }
 
 #if arch(wasm32)
@@ -853,9 +1019,9 @@ private enum _BJS_Closure_10TestModuleSq6AnimalV_Sq6AnimalV {
         let callback = JSObject.bridgeJSLiftParameter(callbackId)
         return { [callback] param0 in
             #if arch(wasm32)
+            let _ = param0.bridgeJSLowerParameter()
             let callbackValue = callback.bridgeJSLowerParameter()
-            let param0IsSome = param0.bridgeJSLowerParameter()
-            invoke_js_callback_TestModule_10TestModuleSq6AnimalV_Sq6AnimalV(callbackValue, param0IsSome)
+            invoke_js_callback_TestModule_10TestModuleSq6AnimalV_Sq6AnimalV(callbackValue)
             return Optional<Animal>.bridgeJSLiftReturn()
             #else
             fatalError("Only available on WebAssembly")
@@ -916,8 +1082,8 @@ private enum _BJS_Closure_10TestModuleSq6PersonC_Sq6PersonC {
         let callback = JSObject.bridgeJSLiftParameter(callbackId)
         return { [callback] param0 in
             #if arch(wasm32)
-            let callbackValue = callback.bridgeJSLowerParameter()
             let (param0IsSome, param0Pointer) = param0.bridgeJSLowerParameter()
+            let callbackValue = callback.bridgeJSLowerParameter()
             let ret = invoke_js_callback_TestModule_10TestModuleSq6PersonC_Sq6PersonC(callbackValue, param0IsSome, param0Pointer)
             return Optional<Person>.bridgeJSLiftReturn(ret)
             #else
@@ -979,8 +1145,8 @@ private enum _BJS_Closure_10TestModuleSq9APIResultO_Sq9APIResultO {
         let callback = JSObject.bridgeJSLiftParameter(callbackId)
         return { [callback] param0 in
             #if arch(wasm32)
-            let callbackValue = callback.bridgeJSLowerParameter()
             let (param0IsSome, param0CaseId) = param0.bridgeJSLowerParameter()
+            let callbackValue = callback.bridgeJSLowerParameter()
             let ret = invoke_js_callback_TestModule_10TestModuleSq9APIResultO_Sq9APIResultO(callbackValue, param0IsSome, param0CaseId)
             return Optional<APIResult>.bridgeJSLiftReturn(ret)
             #else
@@ -1042,8 +1208,8 @@ private enum _BJS_Closure_10TestModuleSq9DirectionO_Sq9DirectionO {
         let callback = JSObject.bridgeJSLiftParameter(callbackId)
         return { [callback] param0 in
             #if arch(wasm32)
-            let callbackValue = callback.bridgeJSLowerParameter()
             let (param0IsSome, param0Value) = param0.bridgeJSLowerParameter()
+            let callbackValue = callback.bridgeJSLowerParameter()
             let ret = invoke_js_callback_TestModule_10TestModuleSq9DirectionO_Sq9DirectionO(callbackValue, param0IsSome, param0Value)
             return Optional<Direction>.bridgeJSLiftReturn(ret)
             #else
@@ -1105,8 +1271,8 @@ private enum _BJS_Closure_10TestModuleSqSS_SqSS {
         let callback = JSObject.bridgeJSLiftParameter(callbackId)
         return { [callback] param0 in
             #if arch(wasm32)
-            let callbackValue = callback.bridgeJSLowerParameter()
             param0.bridgeJSWithLoweredParameter { (param0IsSome, param0Bytes, param0Length) in
+                let callbackValue = callback.bridgeJSLowerParameter()
                 invoke_js_callback_TestModule_10TestModuleSqSS_SqSS(callbackValue, param0IsSome, param0Bytes, param0Length)
             }
             return Optional<String>.bridgeJSLiftReturnFromSideChannel()
@@ -1169,8 +1335,8 @@ private enum _BJS_Closure_10TestModuleSqSb_SqSb {
         let callback = JSObject.bridgeJSLiftParameter(callbackId)
         return { [callback] param0 in
             #if arch(wasm32)
-            let callbackValue = callback.bridgeJSLowerParameter()
             let (param0IsSome, param0Value) = param0.bridgeJSLowerParameter()
+            let callbackValue = callback.bridgeJSLowerParameter()
             let ret = invoke_js_callback_TestModule_10TestModuleSqSb_SqSb(callbackValue, param0IsSome, param0Value)
             return Optional<Bool>.bridgeJSLiftReturn(ret)
             #else
@@ -1232,8 +1398,8 @@ private enum _BJS_Closure_10TestModuleSqSd_SqSd {
         let callback = JSObject.bridgeJSLiftParameter(callbackId)
         return { [callback] param0 in
             #if arch(wasm32)
-            let callbackValue = callback.bridgeJSLowerParameter()
             let (param0IsSome, param0Value) = param0.bridgeJSLowerParameter()
+            let callbackValue = callback.bridgeJSLowerParameter()
             invoke_js_callback_TestModule_10TestModuleSqSd_SqSd(callbackValue, param0IsSome, param0Value)
             return Optional<Double>.bridgeJSLiftReturnFromSideChannel()
             #else
@@ -1295,8 +1461,8 @@ private enum _BJS_Closure_10TestModuleSqSf_SqSf {
         let callback = JSObject.bridgeJSLiftParameter(callbackId)
         return { [callback] param0 in
             #if arch(wasm32)
-            let callbackValue = callback.bridgeJSLowerParameter()
             let (param0IsSome, param0Value) = param0.bridgeJSLowerParameter()
+            let callbackValue = callback.bridgeJSLowerParameter()
             invoke_js_callback_TestModule_10TestModuleSqSf_SqSf(callbackValue, param0IsSome, param0Value)
             return Optional<Float>.bridgeJSLiftReturnFromSideChannel()
             #else
@@ -1358,8 +1524,8 @@ private enum _BJS_Closure_10TestModuleSqSi_SqSi {
         let callback = JSObject.bridgeJSLiftParameter(callbackId)
         return { [callback] param0 in
             #if arch(wasm32)
-            let callbackValue = callback.bridgeJSLowerParameter()
             let (param0IsSome, param0Value) = param0.bridgeJSLowerParameter()
+            let callbackValue = callback.bridgeJSLowerParameter()
             invoke_js_callback_TestModule_10TestModuleSqSi_SqSi(callbackValue, param0IsSome, param0Value)
             return Optional<Int>.bridgeJSLiftReturnFromSideChannel()
             #else
@@ -1392,94 +1558,622 @@ public func _invoke_swift_closure_TestModule_10TestModuleSqSi_SqSi(_ boxPtr: Uns
     #endif
 }
 
-extension Direction: _BridgedSwiftCaseEnum {
-    @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameter() -> Int32 {
-        return bridgeJSRawValue
-    }
-    @_spi(BridgeJS) @_transparent public static func bridgeJSLiftReturn(_ value: Int32) -> Direction {
-        return bridgeJSLiftParameter(value)
-    }
-    @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter(_ value: Int32) -> Direction {
-        return Direction(bridgeJSRawValue: value)!
-    }
-    @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() -> Int32 {
-        return bridgeJSLowerParameter()
-    }
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "invoke_js_callback_TestModule_10TestModuleYaKSS_SS")
+fileprivate func invoke_js_callback_TestModule_10TestModuleYaKSS_SS_extern(_ resolveRef: Int32, _ rejectRef: Int32, _ callback: Int32, _ param0Bytes: Int32, _ param0Length: Int32) -> Void
+#else
+fileprivate func invoke_js_callback_TestModule_10TestModuleYaKSS_SS_extern(_ resolveRef: Int32, _ rejectRef: Int32, _ callback: Int32, _ param0Bytes: Int32, _ param0Length: Int32) -> Void {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func invoke_js_callback_TestModule_10TestModuleYaKSS_SS(_ resolveRef: Int32, _ rejectRef: Int32, _ callback: Int32, _ param0Bytes: Int32, _ param0Length: Int32) -> Void {
+    return invoke_js_callback_TestModule_10TestModuleYaKSS_SS_extern(resolveRef, rejectRef, callback, param0Bytes, param0Length)
+}
 
-    @_spi(BridgeJS) @usableFromInline init?(bridgeJSRawValue: Int32) {
-        switch bridgeJSRawValue {
-        case 0:
-            self = .north
-        case 1:
-            self = .south
-        case 2:
-            self = .east
-        case 3:
-            self = .west
-        default:
-            return nil
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "make_swift_closure_TestModule_10TestModuleYaKSS_SS")
+fileprivate func make_swift_closure_TestModule_10TestModuleYaKSS_SS_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer<UInt8>, _ line: UInt32) -> Int32
+#else
+fileprivate func make_swift_closure_TestModule_10TestModuleYaKSS_SS_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer<UInt8>, _ line: UInt32) -> Int32 {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func make_swift_closure_TestModule_10TestModuleYaKSS_SS(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer<UInt8>, _ line: UInt32) -> Int32 {
+    return make_swift_closure_TestModule_10TestModuleYaKSS_SS_extern(boxPtr, file, line)
+}
+
+private enum _BJS_Closure_10TestModuleYaKSS_SS {
+    static func bridgeJSLift(_ callbackId: Int32) -> (String) async throws(JSException) -> String {
+        let callback = JSObject.bridgeJSLiftParameter(callbackId)
+        return { [callback] (param0: String) async throws(JSException) -> String in
+            #if arch(wasm32)
+            let resolved = try await _bjs_awaitPromise(makeResolveClosure: {
+                    JSTypedClosure<(sending String) -> Void>($0)
+                }, makeRejectClosure: {
+                    JSTypedClosure<(sending JSValue) -> Void>($0)
+                }) { resolveRef, rejectRef in
+                param0.bridgeJSWithLoweredParameter { (param0Bytes, param0Length) in
+                    let callbackValue = callback.bridgeJSLowerParameter()
+                    invoke_js_callback_TestModule_10TestModuleYaKSS_SS(resolveRef, rejectRef, callbackValue, param0Bytes, param0Length)
+                }
+            }
+            return resolved
+            #else
+            fatalError("Only available on WebAssembly")
+            #endif
         }
     }
+}
 
-    @_spi(BridgeJS) @usableFromInline var bridgeJSRawValue: Int32 {
-        switch self {
-        case .north:
-            return 0
-        case .south:
-            return 1
-        case .east:
-            return 2
-        case .west:
-            return 3
-        }
+extension JSTypedClosure where Signature == (String) async throws(JSException) -> String {
+    init(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping (String) async throws(JSException) -> String) {
+        self.init(
+            makeClosure: make_swift_closure_TestModule_10TestModuleYaKSS_SS,
+            body: body,
+            fileID: fileID,
+            line: line
+        )
     }
 }
 
-extension Theme: _BridgedSwiftEnumNoPayload, _BridgedSwiftRawValueEnum {
+@_expose(wasm, "invoke_swift_closure_TestModule_10TestModuleYaKSS_SS")
+@_cdecl("invoke_swift_closure_TestModule_10TestModuleYaKSS_SS")
+public func _invoke_swift_closure_TestModule_10TestModuleYaKSS_SS(_ boxPtr: UnsafeMutableRawPointer, _ param0Bytes: Int32, _ param0Length: Int32) -> Int32 {
+    #if arch(wasm32)
+    let closure = Unmanaged<_BridgeJSTypedClosureBox<(String) async throws(JSException) -> String>>.fromOpaque(boxPtr).takeUnretainedValue().closure
+    return _bjs_makePromise(resolve: Promise_resolve_SS, reject: Promise_reject) { () async throws(JSException) -> String in
+        return try await closure(String.bridgeJSLiftParameter(param0Bytes, param0Length))
+    }
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
 }
 
-extension HttpStatus: _BridgedSwiftEnumNoPayload, _BridgedSwiftRawValueEnum {
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "invoke_js_callback_TestModule_10TestModuleYaKSb_9APIResultO")
+fileprivate func invoke_js_callback_TestModule_10TestModuleYaKSb_9APIResultO_extern(_ resolveRef: Int32, _ rejectRef: Int32, _ callback: Int32, _ param0: Int32) -> Void
+#else
+fileprivate func invoke_js_callback_TestModule_10TestModuleYaKSb_9APIResultO_extern(_ resolveRef: Int32, _ rejectRef: Int32, _ callback: Int32, _ param0: Int32) -> Void {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func invoke_js_callback_TestModule_10TestModuleYaKSb_9APIResultO(_ resolveRef: Int32, _ rejectRef: Int32, _ callback: Int32, _ param0: Int32) -> Void {
+    return invoke_js_callback_TestModule_10TestModuleYaKSb_9APIResultO_extern(resolveRef, rejectRef, callback, param0)
 }
 
-extension APIResult: _BridgedSwiftAssociatedValueEnum {
-    @_spi(BridgeJS) @_transparent public static func bridgeJSStackPopPayload(_ caseId: Int32) -> APIResult {
-        switch caseId {
-        case 0:
-            return .success(String.bridgeJSStackPop())
-        case 1:
-            return .failure(Int.bridgeJSStackPop())
-        case 2:
-            return .flag(Bool.bridgeJSStackPop())
-        case 3:
-            return .rate(Float.bridgeJSStackPop())
-        case 4:
-            return .precise(Double.bridgeJSStackPop())
-        case 5:
-            return .info
-        default:
-            fatalError("Unknown APIResult case ID: \(caseId)")
-        }
-    }
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "make_swift_closure_TestModule_10TestModuleYaKSb_9APIResultO")
+fileprivate func make_swift_closure_TestModule_10TestModuleYaKSb_9APIResultO_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer<UInt8>, _ line: UInt32) -> Int32
+#else
+fileprivate func make_swift_closure_TestModule_10TestModuleYaKSb_9APIResultO_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer<UInt8>, _ line: UInt32) -> Int32 {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func make_swift_closure_TestModule_10TestModuleYaKSb_9APIResultO(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer<UInt8>, _ line: UInt32) -> Int32 {
+    return make_swift_closure_TestModule_10TestModuleYaKSb_9APIResultO_extern(boxPtr, file, line)
+}
 
-    @_spi(BridgeJS) @_transparent public consuming func bridgeJSStackPushPayload() -> Int32 {
-        switch self {
-        case .success(let param0):
-            param0.bridgeJSStackPush()
-            return Int32(0)
-        case .failure(let param0):
-            param0.bridgeJSStackPush()
-            return Int32(1)
-        case .flag(let param0):
-            param0.bridgeJSStackPush()
-            return Int32(2)
-        case .rate(let param0):
-            param0.bridgeJSStackPush()
-            return Int32(3)
-        case .precise(let param0):
-            param0.bridgeJSStackPush()
-            return Int32(4)
-        case .info:
-            return Int32(5)
+private enum _BJS_Closure_10TestModuleYaKSb_9APIResultO {
+    static func bridgeJSLift(_ callbackId: Int32) -> (Bool) async throws(JSException) -> APIResult {
+        let callback = JSObject.bridgeJSLiftParameter(callbackId)
+        return { [callback] (param0: Bool) async throws(JSException) -> APIResult in
+            #if arch(wasm32)
+            let resolved = try await _bjs_awaitPromise(makeResolveClosure: {
+                    JSTypedClosure<(sending APIResult) -> Void>($0)
+                }, makeRejectClosure: {
+                    JSTypedClosure<(sending JSValue) -> Void>($0)
+                }) { resolveRef, rejectRef in
+                let param0Value = param0.bridgeJSLowerParameter()
+                let callbackValue = callback.bridgeJSLowerParameter()
+                invoke_js_callback_TestModule_10TestModuleYaKSb_9APIResultO(resolveRef, rejectRef, callbackValue, param0Value)
+            }
+            return resolved
+            #else
+            fatalError("Only available on WebAssembly")
+            #endif
+        }
+    }
+}
+
+extension JSTypedClosure where Signature == (Bool) async throws(JSException) -> APIResult {
+    init(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping (Bool) async throws(JSException) -> APIResult) {
+        self.init(
+            makeClosure: make_swift_closure_TestModule_10TestModuleYaKSb_9APIResultO,
+            body: body,
+            fileID: fileID,
+            line: line
+        )
+    }
+}
+
+@_expose(wasm, "invoke_swift_closure_TestModule_10TestModuleYaKSb_9APIResultO")
+@_cdecl("invoke_swift_closure_TestModule_10TestModuleYaKSb_9APIResultO")
+public func _invoke_swift_closure_TestModule_10TestModuleYaKSb_9APIResultO(_ boxPtr: UnsafeMutableRawPointer, _ param0: Int32) -> Int32 {
+    #if arch(wasm32)
+    let closure = Unmanaged<_BridgeJSTypedClosureBox<(Bool) async throws(JSException) -> APIResult>>.fromOpaque(boxPtr).takeUnretainedValue().closure
+    return _bjs_makePromise(resolve: Promise_resolve_9APIResultO, reject: Promise_reject) { () async throws(JSException) -> APIResult in
+        return try await closure(Bool.bridgeJSLiftParameter(param0))
+    }
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "invoke_js_callback_TestModule_10TestModuleYaSS_6AnimalV")
+fileprivate func invoke_js_callback_TestModule_10TestModuleYaSS_6AnimalV_extern(_ resolveRef: Int32, _ rejectRef: Int32, _ callback: Int32, _ param0Bytes: Int32, _ param0Length: Int32) -> Void
+#else
+fileprivate func invoke_js_callback_TestModule_10TestModuleYaSS_6AnimalV_extern(_ resolveRef: Int32, _ rejectRef: Int32, _ callback: Int32, _ param0Bytes: Int32, _ param0Length: Int32) -> Void {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func invoke_js_callback_TestModule_10TestModuleYaSS_6AnimalV(_ resolveRef: Int32, _ rejectRef: Int32, _ callback: Int32, _ param0Bytes: Int32, _ param0Length: Int32) -> Void {
+    return invoke_js_callback_TestModule_10TestModuleYaSS_6AnimalV_extern(resolveRef, rejectRef, callback, param0Bytes, param0Length)
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "make_swift_closure_TestModule_10TestModuleYaSS_6AnimalV")
+fileprivate func make_swift_closure_TestModule_10TestModuleYaSS_6AnimalV_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer<UInt8>, _ line: UInt32) -> Int32
+#else
+fileprivate func make_swift_closure_TestModule_10TestModuleYaSS_6AnimalV_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer<UInt8>, _ line: UInt32) -> Int32 {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func make_swift_closure_TestModule_10TestModuleYaSS_6AnimalV(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer<UInt8>, _ line: UInt32) -> Int32 {
+    return make_swift_closure_TestModule_10TestModuleYaSS_6AnimalV_extern(boxPtr, file, line)
+}
+
+private enum _BJS_Closure_10TestModuleYaSS_6AnimalV {
+    static func bridgeJSLift(_ callbackId: Int32) -> (String) async -> Animal {
+        let callback = JSObject.bridgeJSLiftParameter(callbackId)
+        return { [callback] (param0: String) async -> Animal in
+            #if arch(wasm32)
+            let resolved = try! await _bjs_awaitPromise(makeResolveClosure: {
+                    JSTypedClosure<(sending Animal) -> Void>($0)
+                }, makeRejectClosure: {
+                    JSTypedClosure<(sending JSValue) -> Void>($0)
+                }) { resolveRef, rejectRef in
+                param0.bridgeJSWithLoweredParameter { (param0Bytes, param0Length) in
+                    let callbackValue = callback.bridgeJSLowerParameter()
+                    invoke_js_callback_TestModule_10TestModuleYaSS_6AnimalV(resolveRef, rejectRef, callbackValue, param0Bytes, param0Length)
+                }
+            }
+            return resolved
+            #else
+            fatalError("Only available on WebAssembly")
+            #endif
+        }
+    }
+}
+
+extension JSTypedClosure where Signature == (String) async -> Animal {
+    init(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping (String) async -> Animal) {
+        self.init(
+            makeClosure: make_swift_closure_TestModule_10TestModuleYaSS_6AnimalV,
+            body: body,
+            fileID: fileID,
+            line: line
+        )
+    }
+}
+
+@_expose(wasm, "invoke_swift_closure_TestModule_10TestModuleYaSS_6AnimalV")
+@_cdecl("invoke_swift_closure_TestModule_10TestModuleYaSS_6AnimalV")
+public func _invoke_swift_closure_TestModule_10TestModuleYaSS_6AnimalV(_ boxPtr: UnsafeMutableRawPointer, _ param0Bytes: Int32, _ param0Length: Int32) -> Int32 {
+    #if arch(wasm32)
+    let closure = Unmanaged<_BridgeJSTypedClosureBox<(String) async -> Animal>>.fromOpaque(boxPtr).takeUnretainedValue().closure
+    return _bjs_makePromise(resolve: Promise_resolve_6AnimalV, reject: Promise_reject) {
+        return await closure(String.bridgeJSLiftParameter(param0Bytes, param0Length))
+    }
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "invoke_js_callback_TestModule_10TestModuleYaSS_SS")
+fileprivate func invoke_js_callback_TestModule_10TestModuleYaSS_SS_extern(_ resolveRef: Int32, _ rejectRef: Int32, _ callback: Int32, _ param0Bytes: Int32, _ param0Length: Int32) -> Void
+#else
+fileprivate func invoke_js_callback_TestModule_10TestModuleYaSS_SS_extern(_ resolveRef: Int32, _ rejectRef: Int32, _ callback: Int32, _ param0Bytes: Int32, _ param0Length: Int32) -> Void {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func invoke_js_callback_TestModule_10TestModuleYaSS_SS(_ resolveRef: Int32, _ rejectRef: Int32, _ callback: Int32, _ param0Bytes: Int32, _ param0Length: Int32) -> Void {
+    return invoke_js_callback_TestModule_10TestModuleYaSS_SS_extern(resolveRef, rejectRef, callback, param0Bytes, param0Length)
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "make_swift_closure_TestModule_10TestModuleYaSS_SS")
+fileprivate func make_swift_closure_TestModule_10TestModuleYaSS_SS_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer<UInt8>, _ line: UInt32) -> Int32
+#else
+fileprivate func make_swift_closure_TestModule_10TestModuleYaSS_SS_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer<UInt8>, _ line: UInt32) -> Int32 {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func make_swift_closure_TestModule_10TestModuleYaSS_SS(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer<UInt8>, _ line: UInt32) -> Int32 {
+    return make_swift_closure_TestModule_10TestModuleYaSS_SS_extern(boxPtr, file, line)
+}
+
+private enum _BJS_Closure_10TestModuleYaSS_SS {
+    static func bridgeJSLift(_ callbackId: Int32) -> (String) async -> String {
+        let callback = JSObject.bridgeJSLiftParameter(callbackId)
+        return { [callback] (param0: String) async -> String in
+            #if arch(wasm32)
+            let resolved = try! await _bjs_awaitPromise(makeResolveClosure: {
+                    JSTypedClosure<(sending String) -> Void>($0)
+                }, makeRejectClosure: {
+                    JSTypedClosure<(sending JSValue) -> Void>($0)
+                }) { resolveRef, rejectRef in
+                param0.bridgeJSWithLoweredParameter { (param0Bytes, param0Length) in
+                    let callbackValue = callback.bridgeJSLowerParameter()
+                    invoke_js_callback_TestModule_10TestModuleYaSS_SS(resolveRef, rejectRef, callbackValue, param0Bytes, param0Length)
+                }
+            }
+            return resolved
+            #else
+            fatalError("Only available on WebAssembly")
+            #endif
+        }
+    }
+}
+
+extension JSTypedClosure where Signature == (String) async -> String {
+    init(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping (String) async -> String) {
+        self.init(
+            makeClosure: make_swift_closure_TestModule_10TestModuleYaSS_SS,
+            body: body,
+            fileID: fileID,
+            line: line
+        )
+    }
+}
+
+@_expose(wasm, "invoke_swift_closure_TestModule_10TestModuleYaSS_SS")
+@_cdecl("invoke_swift_closure_TestModule_10TestModuleYaSS_SS")
+public func _invoke_swift_closure_TestModule_10TestModuleYaSS_SS(_ boxPtr: UnsafeMutableRawPointer, _ param0Bytes: Int32, _ param0Length: Int32) -> Int32 {
+    #if arch(wasm32)
+    let closure = Unmanaged<_BridgeJSTypedClosureBox<(String) async -> String>>.fromOpaque(boxPtr).takeUnretainedValue().closure
+    return _bjs_makePromise(resolve: Promise_resolve_SS, reject: Promise_reject) {
+        return await closure(String.bridgeJSLiftParameter(param0Bytes, param0Length))
+    }
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "invoke_js_callback_TestModule_10TestModules6AnimalV_y")
+fileprivate func invoke_js_callback_TestModule_10TestModules6AnimalV_y_extern(_ callback: Int32) -> Void
+#else
+fileprivate func invoke_js_callback_TestModule_10TestModules6AnimalV_y_extern(_ callback: Int32) -> Void {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func invoke_js_callback_TestModule_10TestModules6AnimalV_y(_ callback: Int32) -> Void {
+    return invoke_js_callback_TestModule_10TestModules6AnimalV_y_extern(callback)
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "make_swift_closure_TestModule_10TestModules6AnimalV_y")
+fileprivate func make_swift_closure_TestModule_10TestModules6AnimalV_y_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer<UInt8>, _ line: UInt32) -> Int32
+#else
+fileprivate func make_swift_closure_TestModule_10TestModules6AnimalV_y_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer<UInt8>, _ line: UInt32) -> Int32 {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func make_swift_closure_TestModule_10TestModules6AnimalV_y(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer<UInt8>, _ line: UInt32) -> Int32 {
+    return make_swift_closure_TestModule_10TestModules6AnimalV_y_extern(boxPtr, file, line)
+}
+
+private enum _BJS_Closure_10TestModules6AnimalV_y {
+    static func bridgeJSLift(_ callbackId: Int32) -> (sending Animal) -> Void {
+        let callback = JSObject.bridgeJSLiftParameter(callbackId)
+        return { [callback] param0 in
+            #if arch(wasm32)
+            let _ = param0.bridgeJSLowerParameter()
+            let callbackValue = callback.bridgeJSLowerParameter()
+            invoke_js_callback_TestModule_10TestModules6AnimalV_y(callbackValue)
+            #else
+            fatalError("Only available on WebAssembly")
+            #endif
+        }
+    }
+}
+
+extension JSTypedClosure where Signature == (sending Animal) -> Void {
+    init(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping (sending Animal) -> Void) {
+        self.init(
+            makeClosure: make_swift_closure_TestModule_10TestModules6AnimalV_y,
+            body: body,
+            fileID: fileID,
+            line: line
+        )
+    }
+}
+
+@_expose(wasm, "invoke_swift_closure_TestModule_10TestModules6AnimalV_y")
+@_cdecl("invoke_swift_closure_TestModule_10TestModules6AnimalV_y")
+public func _invoke_swift_closure_TestModule_10TestModules6AnimalV_y(_ boxPtr: UnsafeMutableRawPointer) -> Void {
+    #if arch(wasm32)
+    let closure = Unmanaged<_BridgeJSTypedClosureBox<(sending Animal) -> Void>>.fromOpaque(boxPtr).takeUnretainedValue().closure
+    closure(Animal.bridgeJSLiftParameter())
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "invoke_js_callback_TestModule_10TestModules7JSValueV_y")
+fileprivate func invoke_js_callback_TestModule_10TestModules7JSValueV_y_extern(_ callback: Int32, _ param0Kind: Int32, _ param0Payload1: Int32, _ param0Payload2: Float64) -> Void
+#else
+fileprivate func invoke_js_callback_TestModule_10TestModules7JSValueV_y_extern(_ callback: Int32, _ param0Kind: Int32, _ param0Payload1: Int32, _ param0Payload2: Float64) -> Void {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func invoke_js_callback_TestModule_10TestModules7JSValueV_y(_ callback: Int32, _ param0Kind: Int32, _ param0Payload1: Int32, _ param0Payload2: Float64) -> Void {
+    return invoke_js_callback_TestModule_10TestModules7JSValueV_y_extern(callback, param0Kind, param0Payload1, param0Payload2)
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "make_swift_closure_TestModule_10TestModules7JSValueV_y")
+fileprivate func make_swift_closure_TestModule_10TestModules7JSValueV_y_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer<UInt8>, _ line: UInt32) -> Int32
+#else
+fileprivate func make_swift_closure_TestModule_10TestModules7JSValueV_y_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer<UInt8>, _ line: UInt32) -> Int32 {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func make_swift_closure_TestModule_10TestModules7JSValueV_y(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer<UInt8>, _ line: UInt32) -> Int32 {
+    return make_swift_closure_TestModule_10TestModules7JSValueV_y_extern(boxPtr, file, line)
+}
+
+private enum _BJS_Closure_10TestModules7JSValueV_y {
+    static func bridgeJSLift(_ callbackId: Int32) -> (sending JSValue) -> Void {
+        let callback = JSObject.bridgeJSLiftParameter(callbackId)
+        return { [callback] param0 in
+            #if arch(wasm32)
+            let (param0Kind, param0Payload1, param0Payload2) = param0.bridgeJSLowerParameter()
+            let callbackValue = callback.bridgeJSLowerParameter()
+            invoke_js_callback_TestModule_10TestModules7JSValueV_y(callbackValue, param0Kind, param0Payload1, param0Payload2)
+            #else
+            fatalError("Only available on WebAssembly")
+            #endif
+        }
+    }
+}
+
+extension JSTypedClosure where Signature == (sending JSValue) -> Void {
+    init(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping (sending JSValue) -> Void) {
+        self.init(
+            makeClosure: make_swift_closure_TestModule_10TestModules7JSValueV_y,
+            body: body,
+            fileID: fileID,
+            line: line
+        )
+    }
+}
+
+@_expose(wasm, "invoke_swift_closure_TestModule_10TestModules7JSValueV_y")
+@_cdecl("invoke_swift_closure_TestModule_10TestModules7JSValueV_y")
+public func _invoke_swift_closure_TestModule_10TestModules7JSValueV_y(_ boxPtr: UnsafeMutableRawPointer, _ param0Kind: Int32, _ param0Payload1: Int32, _ param0Payload2: Float64) -> Void {
+    #if arch(wasm32)
+    let closure = Unmanaged<_BridgeJSTypedClosureBox<(sending JSValue) -> Void>>.fromOpaque(boxPtr).takeUnretainedValue().closure
+    closure(JSValue.bridgeJSLiftParameter(param0Kind, param0Payload1, param0Payload2))
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "invoke_js_callback_TestModule_10TestModules9APIResultO_y")
+fileprivate func invoke_js_callback_TestModule_10TestModules9APIResultO_y_extern(_ callback: Int32, _ param0: Int32) -> Void
+#else
+fileprivate func invoke_js_callback_TestModule_10TestModules9APIResultO_y_extern(_ callback: Int32, _ param0: Int32) -> Void {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func invoke_js_callback_TestModule_10TestModules9APIResultO_y(_ callback: Int32, _ param0: Int32) -> Void {
+    return invoke_js_callback_TestModule_10TestModules9APIResultO_y_extern(callback, param0)
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "make_swift_closure_TestModule_10TestModules9APIResultO_y")
+fileprivate func make_swift_closure_TestModule_10TestModules9APIResultO_y_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer<UInt8>, _ line: UInt32) -> Int32
+#else
+fileprivate func make_swift_closure_TestModule_10TestModules9APIResultO_y_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer<UInt8>, _ line: UInt32) -> Int32 {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func make_swift_closure_TestModule_10TestModules9APIResultO_y(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer<UInt8>, _ line: UInt32) -> Int32 {
+    return make_swift_closure_TestModule_10TestModules9APIResultO_y_extern(boxPtr, file, line)
+}
+
+private enum _BJS_Closure_10TestModules9APIResultO_y {
+    static func bridgeJSLift(_ callbackId: Int32) -> (sending APIResult) -> Void {
+        let callback = JSObject.bridgeJSLiftParameter(callbackId)
+        return { [callback] param0 in
+            #if arch(wasm32)
+            let param0CaseId = param0.bridgeJSLowerParameter()
+            let callbackValue = callback.bridgeJSLowerParameter()
+            invoke_js_callback_TestModule_10TestModules9APIResultO_y(callbackValue, param0CaseId)
+            #else
+            fatalError("Only available on WebAssembly")
+            #endif
+        }
+    }
+}
+
+extension JSTypedClosure where Signature == (sending APIResult) -> Void {
+    init(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping (sending APIResult) -> Void) {
+        self.init(
+            makeClosure: make_swift_closure_TestModule_10TestModules9APIResultO_y,
+            body: body,
+            fileID: fileID,
+            line: line
+        )
+    }
+}
+
+@_expose(wasm, "invoke_swift_closure_TestModule_10TestModules9APIResultO_y")
+@_cdecl("invoke_swift_closure_TestModule_10TestModules9APIResultO_y")
+public func _invoke_swift_closure_TestModule_10TestModules9APIResultO_y(_ boxPtr: UnsafeMutableRawPointer, _ param0: Int32) -> Void {
+    #if arch(wasm32)
+    let closure = Unmanaged<_BridgeJSTypedClosureBox<(sending APIResult) -> Void>>.fromOpaque(boxPtr).takeUnretainedValue().closure
+    closure(APIResult.bridgeJSLiftParameter(param0))
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "invoke_js_callback_TestModule_10TestModulesSS_y")
+fileprivate func invoke_js_callback_TestModule_10TestModulesSS_y_extern(_ callback: Int32, _ param0Bytes: Int32, _ param0Length: Int32) -> Void
+#else
+fileprivate func invoke_js_callback_TestModule_10TestModulesSS_y_extern(_ callback: Int32, _ param0Bytes: Int32, _ param0Length: Int32) -> Void {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func invoke_js_callback_TestModule_10TestModulesSS_y(_ callback: Int32, _ param0Bytes: Int32, _ param0Length: Int32) -> Void {
+    return invoke_js_callback_TestModule_10TestModulesSS_y_extern(callback, param0Bytes, param0Length)
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "make_swift_closure_TestModule_10TestModulesSS_y")
+fileprivate func make_swift_closure_TestModule_10TestModulesSS_y_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer<UInt8>, _ line: UInt32) -> Int32
+#else
+fileprivate func make_swift_closure_TestModule_10TestModulesSS_y_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer<UInt8>, _ line: UInt32) -> Int32 {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func make_swift_closure_TestModule_10TestModulesSS_y(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer<UInt8>, _ line: UInt32) -> Int32 {
+    return make_swift_closure_TestModule_10TestModulesSS_y_extern(boxPtr, file, line)
+}
+
+private enum _BJS_Closure_10TestModulesSS_y {
+    static func bridgeJSLift(_ callbackId: Int32) -> (sending String) -> Void {
+        let callback = JSObject.bridgeJSLiftParameter(callbackId)
+        return { [callback] param0 in
+            #if arch(wasm32)
+            param0.bridgeJSWithLoweredParameter { (param0Bytes, param0Length) in
+                let callbackValue = callback.bridgeJSLowerParameter()
+                invoke_js_callback_TestModule_10TestModulesSS_y(callbackValue, param0Bytes, param0Length)
+            }
+            #else
+            fatalError("Only available on WebAssembly")
+            #endif
+        }
+    }
+}
+
+extension JSTypedClosure where Signature == (sending String) -> Void {
+    init(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping (sending String) -> Void) {
+        self.init(
+            makeClosure: make_swift_closure_TestModule_10TestModulesSS_y,
+            body: body,
+            fileID: fileID,
+            line: line
+        )
+    }
+}
+
+@_expose(wasm, "invoke_swift_closure_TestModule_10TestModulesSS_y")
+@_cdecl("invoke_swift_closure_TestModule_10TestModulesSS_y")
+public func _invoke_swift_closure_TestModule_10TestModulesSS_y(_ boxPtr: UnsafeMutableRawPointer, _ param0Bytes: Int32, _ param0Length: Int32) -> Void {
+    #if arch(wasm32)
+    let closure = Unmanaged<_BridgeJSTypedClosureBox<(sending String) -> Void>>.fromOpaque(boxPtr).takeUnretainedValue().closure
+    closure(String.bridgeJSLiftParameter(param0Bytes, param0Length))
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+extension Direction: _BridgedSwiftCaseEnum {
+    @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameter() -> Int32 {
+        return bridgeJSRawValue
+    }
+    @_spi(BridgeJS) @_transparent public static func bridgeJSLiftReturn(_ value: Int32) -> Direction {
+        return bridgeJSLiftParameter(value)
+    }
+    @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter(_ value: Int32) -> Direction {
+        return Direction(bridgeJSRawValue: value)!
+    }
+    @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() -> Int32 {
+        return bridgeJSLowerParameter()
+    }
+
+    @_spi(BridgeJS) @usableFromInline init?(bridgeJSRawValue: Int32) {
+        switch bridgeJSRawValue {
+        case 0:
+            self = .north
+        case 1:
+            self = .south
+        case 2:
+            self = .east
+        case 3:
+            self = .west
+        default:
+            return nil
+        }
+    }
+
+    @_spi(BridgeJS) @usableFromInline var bridgeJSRawValue: Int32 {
+        switch self {
+        case .north:
+            return 0
+        case .south:
+            return 1
+        case .east:
+            return 2
+        case .west:
+            return 3
+        }
+    }
+}
+
+extension Theme: _BridgedSwiftEnumNoPayload, _BridgedSwiftRawValueEnum {
+}
+
+extension HttpStatus: _BridgedSwiftEnumNoPayload, _BridgedSwiftRawValueEnum {
+}
+
+extension APIResult: _BridgedSwiftAssociatedValueEnum {
+    @_spi(BridgeJS) @_transparent public static func bridgeJSStackPopPayload(_ caseId: Int32) -> APIResult {
+        switch caseId {
+        case 0:
+            return .success(String.bridgeJSStackPop())
+        case 1:
+            return .failure(Int.bridgeJSStackPop())
+        case 2:
+            return .flag(Bool.bridgeJSStackPop())
+        case 3:
+            return .rate(Float.bridgeJSStackPop())
+        case 4:
+            return .precise(Double.bridgeJSStackPop())
+        case 5:
+            return .info
+        default:
+            fatalError("Unknown APIResult case ID: \(caseId)")
+        }
+    }
+
+    @_spi(BridgeJS) @_transparent public consuming func bridgeJSStackPushPayload() -> Int32 {
+        switch self {
+        case .success(let param0):
+            param0.bridgeJSStackPush()
+            return Int32(0)
+        case .failure(let param0):
+            param0.bridgeJSStackPush()
+            return Int32(1)
+        case .flag(let param0):
+            param0.bridgeJSStackPush()
+            return Int32(2)
+        case .rate(let param0):
+            param0.bridgeJSStackPush()
+            return Int32(3)
+        case .precise(let param0):
+            param0.bridgeJSStackPush()
+            return Int32(4)
+        case .info:
+            return Int32(5)
         }
     }
 }
@@ -1695,6 +2389,71 @@ public func _bjs_roundtripOptionalPerson(_ personClosure: Int32) -> Int32 {
     #endif
 }
 
+@_expose(wasm, "bjs_makeThrowingParser")
+@_cdecl("bjs_makeThrowingParser")
+public func _bjs_makeThrowingParser() -> Int32 {
+    #if arch(wasm32)
+    let ret = makeThrowingParser()
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_validateWith")
+@_cdecl("bjs_validateWith")
+public func _bjs_validateWith(_ validate: Int32) -> Void {
+    #if arch(wasm32)
+    validateWith(_: _BJS_Closure_10TestModuleKSS_Sb.bridgeJSLift(validate))
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_makeFetcher")
+@_cdecl("bjs_makeFetcher")
+public func _bjs_makeFetcher() -> Int32 {
+    #if arch(wasm32)
+    let ret = makeFetcher()
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_makeAsyncEcho")
+@_cdecl("bjs_makeAsyncEcho")
+public func _bjs_makeAsyncEcho() -> Int32 {
+    #if arch(wasm32)
+    let ret = makeAsyncEcho()
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_makeAnimalLoader")
+@_cdecl("bjs_makeAnimalLoader")
+public func _bjs_makeAnimalLoader() -> Int32 {
+    #if arch(wasm32)
+    let ret = makeAnimalLoader()
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_makeResultLoader")
+@_cdecl("bjs_makeResultLoader")
+public func _bjs_makeResultLoader() -> Int32 {
+    #if arch(wasm32)
+    let ret = makeResultLoader()
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
 @_expose(wasm, "bjs_roundtripDirection")
 @_cdecl("bjs_roundtripDirection")
 public func _bjs_roundtripDirection(_ callback: Int32) -> Int32 {
@@ -1876,4 +2635,128 @@ fileprivate func _bjs_TestProcessor_wrap_extern(_ pointer: UnsafeMutableRawPoint
 #endif
 @inline(never) fileprivate func _bjs_TestProcessor_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 {
     return _bjs_TestProcessor_wrap_extern(pointer)
-}
\ No newline at end of file
+}
+
+extension Animal: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = Animal.bridgeJSMakeTypeHandle()
+}
+
+extension Direction: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = Direction.bridgeJSMakeTypeHandle()
+}
+
+extension Theme: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = Theme.bridgeJSMakeTypeHandle()
+}
+
+extension HttpStatus: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = HttpStatus.bridgeJSMakeTypeHandle()
+}
+
+extension APIResult: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = APIResult.bridgeJSMakeTypeHandle()
+}
+
+@JSFunction func Promise_reject(_ promise: JSObject, _ value: JSValue) throws(JSException)
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "promise_reject_TestModule")
+fileprivate func promise_reject_TestModule_extern(_ promise: Int32, _ valueKind: Int32, _ valuePayload1: Int32, _ valuePayload2: Float64) -> Void
+#else
+fileprivate func promise_reject_TestModule_extern(_ promise: Int32, _ valueKind: Int32, _ valuePayload1: Int32, _ valuePayload2: Float64) -> Void {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func promise_reject_TestModule(_ promise: Int32, _ valueKind: Int32, _ valuePayload1: Int32, _ valuePayload2: Float64) -> Void {
+    return promise_reject_TestModule_extern(promise, valueKind, valuePayload1, valuePayload2)
+}
+
+func _$Promise_reject(_ promise: JSObject, _ value: JSValue) throws(JSException) -> Void {
+    let (valueKind, valuePayload1, valuePayload2) = value.bridgeJSLowerParameter()
+    let promiseValue = promise.bridgeJSLowerParameter()
+    promise_reject_TestModule(promiseValue, valueKind, valuePayload1, valuePayload2)
+    if let error = _swift_js_take_exception() { throw error }
+}
+
+@JSFunction func Promise_resolve_SS(_ promise: JSObject, _ value: String) throws(JSException)
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "promise_resolve_TestModule_SS")
+fileprivate func promise_resolve_TestModule_SS_extern(_ promise: Int32, _ valueBytes: Int32, _ valueLength: Int32) -> Void
+#else
+fileprivate func promise_resolve_TestModule_SS_extern(_ promise: Int32, _ valueBytes: Int32, _ valueLength: Int32) -> Void {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func promise_resolve_TestModule_SS(_ promise: Int32, _ valueBytes: Int32, _ valueLength: Int32) -> Void {
+    return promise_resolve_TestModule_SS_extern(promise, valueBytes, valueLength)
+}
+
+func _$Promise_resolve_SS(_ promise: JSObject, _ value: String) throws(JSException) -> Void {
+    value.bridgeJSWithLoweredParameter { (valueBytes, valueLength) in
+        let promiseValue = promise.bridgeJSLowerParameter()
+        promise_resolve_TestModule_SS(promiseValue, valueBytes, valueLength)
+    }
+    if let error = _swift_js_take_exception() { throw error }
+}
+
+@JSFunction func Promise_resolve_6AnimalV(_ promise: JSObject, _ value: Animal) throws(JSException)
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "promise_resolve_TestModule_6AnimalV")
+fileprivate func promise_resolve_TestModule_6AnimalV_extern(_ promise: Int32) -> Void
+#else
+fileprivate func promise_resolve_TestModule_6AnimalV_extern(_ promise: Int32) -> Void {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func promise_resolve_TestModule_6AnimalV(_ promise: Int32) -> Void {
+    return promise_resolve_TestModule_6AnimalV_extern(promise)
+}
+
+func _$Promise_resolve_6AnimalV(_ promise: JSObject, _ value: Animal) throws(JSException) -> Void {
+    let _ = value.bridgeJSLowerParameter()
+    let promiseValue = promise.bridgeJSLowerParameter()
+    promise_resolve_TestModule_6AnimalV(promiseValue)
+    if let error = _swift_js_take_exception() { throw error }
+}
+
+@JSFunction func Promise_resolve_9APIResultO(_ promise: JSObject, _ value: APIResult) throws(JSException)
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "promise_resolve_TestModule_9APIResultO")
+fileprivate func promise_resolve_TestModule_9APIResultO_extern(_ promise: Int32, _ value: Int32) -> Void
+#else
+fileprivate func promise_resolve_TestModule_9APIResultO_extern(_ promise: Int32, _ value: Int32) -> Void {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func promise_resolve_TestModule_9APIResultO(_ promise: Int32, _ value: Int32) -> Void {
+    return promise_resolve_TestModule_9APIResultO_extern(promise, value)
+}
+
+func _$Promise_resolve_9APIResultO(_ promise: JSObject, _ value: APIResult) throws(JSException) -> Void {
+    let valueCaseId = value.bridgeJSLowerParameter()
+    let promiseValue = promise.bridgeJSLowerParameter()
+    promise_resolve_TestModule_9APIResultO(promiseValue, valueCaseId)
+    if let error = _swift_js_take_exception() { throw error }
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "bjs_TestModule_register_type_handles")
+fileprivate func _bjs_TestModule_register_type_handles_extern(_ base: UnsafePointer<Int32>?, _ count: Int32)
+
+@_expose(wasm, "bjs_TestModule_register_type_handles")
+public func _bjs_TestModule_register_type_handles() {
+    let typeIds: [Int32] = [
+        Animal.bridgeJSTypeID,
+        Direction.bridgeJSTypeID,
+        Theme.bridgeJSTypeID,
+        HttpStatus.bridgeJSTypeID,
+        APIResult.bridgeJSTypeID,
+    ]
+    typeIds.withUnsafeBufferPointer { buffer in
+        _bjs_TestModule_register_type_handles_extern(buffer.baseAddress, Int32(buffer.count))
+    }
+}
+#endif
\ No newline at end of file
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftClosureImports.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftClosureImports.json
index a84441bb4..0d93a993f 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftClosureImports.json
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftClosureImports.json
@@ -1,4 +1,112 @@
 {
+  "exported" : {
+    "aliases" : [
+
+    ],
+    "classes" : [
+
+    ],
+    "enums" : [
+
+    ],
+    "exposeToGlobal" : false,
+    "functions" : [
+      {
+        "abiName" : "bjs_runValidator",
+        "effects" : {
+          "isAsync" : false,
+          "isStatic" : false,
+          "isThrows" : false
+        },
+        "name" : "runValidator",
+        "parameters" : [
+          {
+            "label" : "_",
+            "name" : "cb",
+            "type" : {
+              "closure" : {
+                "_0" : {
+                  "isAsync" : false,
+                  "isThrows" : true,
+                  "mangleName" : "10TestModuleKSS_Sb",
+                  "moduleName" : "TestModule",
+                  "parameters" : [
+                    {
+                      "string" : {
+
+                      }
+                    }
+                  ],
+                  "returnType" : {
+                    "bool" : {
+
+                    }
+                  },
+                  "sendingParameters" : false
+                },
+                "useJSTypedClosure" : false
+              }
+            }
+          }
+        ],
+        "returnType" : {
+          "void" : {
+
+          }
+        }
+      },
+      {
+        "abiName" : "bjs_loadEach",
+        "effects" : {
+          "isAsync" : false,
+          "isStatic" : false,
+          "isThrows" : false
+        },
+        "name" : "loadEach",
+        "parameters" : [
+          {
+            "label" : "_",
+            "name" : "fetch",
+            "type" : {
+              "closure" : {
+                "_0" : {
+                  "isAsync" : true,
+                  "isThrows" : true,
+                  "mangleName" : "10TestModuleYaKSS_SS",
+                  "moduleName" : "TestModule",
+                  "parameters" : [
+                    {
+                      "string" : {
+
+                      }
+                    }
+                  ],
+                  "returnType" : {
+                    "string" : {
+
+                    }
+                  },
+                  "sendingParameters" : false
+                },
+                "useJSTypedClosure" : false
+              }
+            }
+          }
+        ],
+        "returnType" : {
+          "void" : {
+
+          }
+        }
+      }
+    ],
+    "protocols" : [
+
+    ],
+    "structs" : [
+
+    ]
+  },
   "imported" : {
     "children" : [
       {
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftClosureImports.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftClosureImports.swift
index f87c8ecca..6f133d748 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftClosureImports.swift
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftClosureImports.swift
@@ -1,3 +1,86 @@
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "invoke_js_callback_TestModule_10TestModuleKSS_Sb")
+fileprivate func invoke_js_callback_TestModule_10TestModuleKSS_Sb_extern(_ callback: Int32, _ param0Bytes: Int32, _ param0Length: Int32) -> Int32
+#else
+fileprivate func invoke_js_callback_TestModule_10TestModuleKSS_Sb_extern(_ callback: Int32, _ param0Bytes: Int32, _ param0Length: Int32) -> Int32 {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func invoke_js_callback_TestModule_10TestModuleKSS_Sb(_ callback: Int32, _ param0Bytes: Int32, _ param0Length: Int32) -> Int32 {
+    return invoke_js_callback_TestModule_10TestModuleKSS_Sb_extern(callback, param0Bytes, param0Length)
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "make_swift_closure_TestModule_10TestModuleKSS_Sb")
+fileprivate func make_swift_closure_TestModule_10TestModuleKSS_Sb_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer<UInt8>, _ line: UInt32) -> Int32
+#else
+fileprivate func make_swift_closure_TestModule_10TestModuleKSS_Sb_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer<UInt8>, _ line: UInt32) -> Int32 {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func make_swift_closure_TestModule_10TestModuleKSS_Sb(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer<UInt8>, _ line: UInt32) -> Int32 {
+    return make_swift_closure_TestModule_10TestModuleKSS_Sb_extern(boxPtr, file, line)
+}
+
+private enum _BJS_Closure_10TestModuleKSS_Sb {
+    static func bridgeJSLift(_ callbackId: Int32) -> (String) throws(JSException) -> Bool {
+        let callback = JSObject.bridgeJSLiftParameter(callbackId)
+        return { [callback] (param0: String) throws(JSException) -> Bool in
+            #if arch(wasm32)
+            let ret0 = param0.bridgeJSWithLoweredParameter { (param0Bytes, param0Length) in
+                let callbackValue = callback.bridgeJSLowerParameter()
+                let ret = invoke_js_callback_TestModule_10TestModuleKSS_Sb(callbackValue, param0Bytes, param0Length)
+                return ret
+            }
+            let ret = ret0
+            if let error = _swift_js_take_exception() {
+                throw error
+            }
+            return Bool.bridgeJSLiftReturn(ret)
+            #else
+            fatalError("Only available on WebAssembly")
+            #endif
+        }
+    }
+}
+
+extension JSTypedClosure where Signature == (String) throws(JSException) -> Bool {
+    init(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping (String) throws(JSException) -> Bool) {
+        self.init(
+            makeClosure: make_swift_closure_TestModule_10TestModuleKSS_Sb,
+            body: body,
+            fileID: fileID,
+            line: line
+        )
+    }
+}
+
+@_expose(wasm, "invoke_swift_closure_TestModule_10TestModuleKSS_Sb")
+@_cdecl("invoke_swift_closure_TestModule_10TestModuleKSS_Sb")
+public func _invoke_swift_closure_TestModule_10TestModuleKSS_Sb(_ boxPtr: UnsafeMutableRawPointer, _ param0Bytes: Int32, _ param0Length: Int32) -> Int32 {
+    #if arch(wasm32)
+    let closure = Unmanaged<_BridgeJSTypedClosureBox<(String) throws(JSException) -> Bool>>.fromOpaque(boxPtr).takeUnretainedValue().closure
+    do {
+        let result = try closure(String.bridgeJSLiftParameter(param0Bytes, param0Length))
+        return result.bridgeJSLowerReturn()
+    } catch let error {
+        if let error = error.thrownValue.object {
+            withExtendedLifetime(error) {
+                _swift_js_throw(Int32(bitPattern: $0.id))
+            }
+        } else {
+            let jsError = JSError(message: error.description)
+            withExtendedLifetime(jsError.jsObject) {
+                _swift_js_throw(Int32(bitPattern: $0.id))
+            }
+        }
+        return 0
+    }
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
 #if arch(wasm32)
 @_extern(wasm, module: "bjs", name: "invoke_js_callback_TestModule_10TestModuleSi_Si")
 fileprivate func invoke_js_callback_TestModule_10TestModuleSi_Si_extern(_ callback: Int32, _ param0: Int32) -> Int32
@@ -27,8 +110,8 @@ private enum _BJS_Closure_10TestModuleSi_Si {
         let callback = JSObject.bridgeJSLiftParameter(callbackId)
         return { [callback] param0 in
             #if arch(wasm32)
-            let callbackValue = callback.bridgeJSLowerParameter()
             let param0Value = param0.bridgeJSLowerParameter()
+            let callbackValue = callback.bridgeJSLowerParameter()
             let ret = invoke_js_callback_TestModule_10TestModuleSi_Si(callbackValue, param0Value)
             return Int.bridgeJSLiftReturn(ret)
             #else
@@ -61,6 +144,263 @@ public func _invoke_swift_closure_TestModule_10TestModuleSi_Si(_ boxPtr: UnsafeM
     #endif
 }
 
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "invoke_js_callback_TestModule_10TestModuleYaKSS_SS")
+fileprivate func invoke_js_callback_TestModule_10TestModuleYaKSS_SS_extern(_ resolveRef: Int32, _ rejectRef: Int32, _ callback: Int32, _ param0Bytes: Int32, _ param0Length: Int32) -> Void
+#else
+fileprivate func invoke_js_callback_TestModule_10TestModuleYaKSS_SS_extern(_ resolveRef: Int32, _ rejectRef: Int32, _ callback: Int32, _ param0Bytes: Int32, _ param0Length: Int32) -> Void {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func invoke_js_callback_TestModule_10TestModuleYaKSS_SS(_ resolveRef: Int32, _ rejectRef: Int32, _ callback: Int32, _ param0Bytes: Int32, _ param0Length: Int32) -> Void {
+    return invoke_js_callback_TestModule_10TestModuleYaKSS_SS_extern(resolveRef, rejectRef, callback, param0Bytes, param0Length)
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "make_swift_closure_TestModule_10TestModuleYaKSS_SS")
+fileprivate func make_swift_closure_TestModule_10TestModuleYaKSS_SS_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer<UInt8>, _ line: UInt32) -> Int32
+#else
+fileprivate func make_swift_closure_TestModule_10TestModuleYaKSS_SS_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer<UInt8>, _ line: UInt32) -> Int32 {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func make_swift_closure_TestModule_10TestModuleYaKSS_SS(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer<UInt8>, _ line: UInt32) -> Int32 {
+    return make_swift_closure_TestModule_10TestModuleYaKSS_SS_extern(boxPtr, file, line)
+}
+
+private enum _BJS_Closure_10TestModuleYaKSS_SS {
+    static func bridgeJSLift(_ callbackId: Int32) -> (String) async throws(JSException) -> String {
+        let callback = JSObject.bridgeJSLiftParameter(callbackId)
+        return { [callback] (param0: String) async throws(JSException) -> String in
+            #if arch(wasm32)
+            let resolved = try await _bjs_awaitPromise(makeResolveClosure: {
+                    JSTypedClosure<(sending String) -> Void>($0)
+                }, makeRejectClosure: {
+                    JSTypedClosure<(sending JSValue) -> Void>($0)
+                }) { resolveRef, rejectRef in
+                param0.bridgeJSWithLoweredParameter { (param0Bytes, param0Length) in
+                    let callbackValue = callback.bridgeJSLowerParameter()
+                    invoke_js_callback_TestModule_10TestModuleYaKSS_SS(resolveRef, rejectRef, callbackValue, param0Bytes, param0Length)
+                }
+            }
+            return resolved
+            #else
+            fatalError("Only available on WebAssembly")
+            #endif
+        }
+    }
+}
+
+extension JSTypedClosure where Signature == (String) async throws(JSException) -> String {
+    init(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping (String) async throws(JSException) -> String) {
+        self.init(
+            makeClosure: make_swift_closure_TestModule_10TestModuleYaKSS_SS,
+            body: body,
+            fileID: fileID,
+            line: line
+        )
+    }
+}
+
+@_expose(wasm, "invoke_swift_closure_TestModule_10TestModuleYaKSS_SS")
+@_cdecl("invoke_swift_closure_TestModule_10TestModuleYaKSS_SS")
+public func _invoke_swift_closure_TestModule_10TestModuleYaKSS_SS(_ boxPtr: UnsafeMutableRawPointer, _ param0Bytes: Int32, _ param0Length: Int32) -> Int32 {
+    #if arch(wasm32)
+    let closure = Unmanaged<_BridgeJSTypedClosureBox<(String) async throws(JSException) -> String>>.fromOpaque(boxPtr).takeUnretainedValue().closure
+    return _bjs_makePromise(resolve: Promise_resolve_SS, reject: Promise_reject) { () async throws(JSException) -> String in
+        return try await closure(String.bridgeJSLiftParameter(param0Bytes, param0Length))
+    }
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "invoke_js_callback_TestModule_10TestModules7JSValueV_y")
+fileprivate func invoke_js_callback_TestModule_10TestModules7JSValueV_y_extern(_ callback: Int32, _ param0Kind: Int32, _ param0Payload1: Int32, _ param0Payload2: Float64) -> Void
+#else
+fileprivate func invoke_js_callback_TestModule_10TestModules7JSValueV_y_extern(_ callback: Int32, _ param0Kind: Int32, _ param0Payload1: Int32, _ param0Payload2: Float64) -> Void {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func invoke_js_callback_TestModule_10TestModules7JSValueV_y(_ callback: Int32, _ param0Kind: Int32, _ param0Payload1: Int32, _ param0Payload2: Float64) -> Void {
+    return invoke_js_callback_TestModule_10TestModules7JSValueV_y_extern(callback, param0Kind, param0Payload1, param0Payload2)
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "make_swift_closure_TestModule_10TestModules7JSValueV_y")
+fileprivate func make_swift_closure_TestModule_10TestModules7JSValueV_y_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer<UInt8>, _ line: UInt32) -> Int32
+#else
+fileprivate func make_swift_closure_TestModule_10TestModules7JSValueV_y_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer<UInt8>, _ line: UInt32) -> Int32 {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func make_swift_closure_TestModule_10TestModules7JSValueV_y(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer<UInt8>, _ line: UInt32) -> Int32 {
+    return make_swift_closure_TestModule_10TestModules7JSValueV_y_extern(boxPtr, file, line)
+}
+
+private enum _BJS_Closure_10TestModules7JSValueV_y {
+    static func bridgeJSLift(_ callbackId: Int32) -> (sending JSValue) -> Void {
+        let callback = JSObject.bridgeJSLiftParameter(callbackId)
+        return { [callback] param0 in
+            #if arch(wasm32)
+            let (param0Kind, param0Payload1, param0Payload2) = param0.bridgeJSLowerParameter()
+            let callbackValue = callback.bridgeJSLowerParameter()
+            invoke_js_callback_TestModule_10TestModules7JSValueV_y(callbackValue, param0Kind, param0Payload1, param0Payload2)
+            #else
+            fatalError("Only available on WebAssembly")
+            #endif
+        }
+    }
+}
+
+extension JSTypedClosure where Signature == (sending JSValue) -> Void {
+    init(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping (sending JSValue) -> Void) {
+        self.init(
+            makeClosure: make_swift_closure_TestModule_10TestModules7JSValueV_y,
+            body: body,
+            fileID: fileID,
+            line: line
+        )
+    }
+}
+
+@_expose(wasm, "invoke_swift_closure_TestModule_10TestModules7JSValueV_y")
+@_cdecl("invoke_swift_closure_TestModule_10TestModules7JSValueV_y")
+public func _invoke_swift_closure_TestModule_10TestModules7JSValueV_y(_ boxPtr: UnsafeMutableRawPointer, _ param0Kind: Int32, _ param0Payload1: Int32, _ param0Payload2: Float64) -> Void {
+    #if arch(wasm32)
+    let closure = Unmanaged<_BridgeJSTypedClosureBox<(sending JSValue) -> Void>>.fromOpaque(boxPtr).takeUnretainedValue().closure
+    closure(JSValue.bridgeJSLiftParameter(param0Kind, param0Payload1, param0Payload2))
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "invoke_js_callback_TestModule_10TestModulesSS_y")
+fileprivate func invoke_js_callback_TestModule_10TestModulesSS_y_extern(_ callback: Int32, _ param0Bytes: Int32, _ param0Length: Int32) -> Void
+#else
+fileprivate func invoke_js_callback_TestModule_10TestModulesSS_y_extern(_ callback: Int32, _ param0Bytes: Int32, _ param0Length: Int32) -> Void {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func invoke_js_callback_TestModule_10TestModulesSS_y(_ callback: Int32, _ param0Bytes: Int32, _ param0Length: Int32) -> Void {
+    return invoke_js_callback_TestModule_10TestModulesSS_y_extern(callback, param0Bytes, param0Length)
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "make_swift_closure_TestModule_10TestModulesSS_y")
+fileprivate func make_swift_closure_TestModule_10TestModulesSS_y_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer<UInt8>, _ line: UInt32) -> Int32
+#else
+fileprivate func make_swift_closure_TestModule_10TestModulesSS_y_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer<UInt8>, _ line: UInt32) -> Int32 {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func make_swift_closure_TestModule_10TestModulesSS_y(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer<UInt8>, _ line: UInt32) -> Int32 {
+    return make_swift_closure_TestModule_10TestModulesSS_y_extern(boxPtr, file, line)
+}
+
+private enum _BJS_Closure_10TestModulesSS_y {
+    static func bridgeJSLift(_ callbackId: Int32) -> (sending String) -> Void {
+        let callback = JSObject.bridgeJSLiftParameter(callbackId)
+        return { [callback] param0 in
+            #if arch(wasm32)
+            param0.bridgeJSWithLoweredParameter { (param0Bytes, param0Length) in
+                let callbackValue = callback.bridgeJSLowerParameter()
+                invoke_js_callback_TestModule_10TestModulesSS_y(callbackValue, param0Bytes, param0Length)
+            }
+            #else
+            fatalError("Only available on WebAssembly")
+            #endif
+        }
+    }
+}
+
+extension JSTypedClosure where Signature == (sending String) -> Void {
+    init(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping (sending String) -> Void) {
+        self.init(
+            makeClosure: make_swift_closure_TestModule_10TestModulesSS_y,
+            body: body,
+            fileID: fileID,
+            line: line
+        )
+    }
+}
+
+@_expose(wasm, "invoke_swift_closure_TestModule_10TestModulesSS_y")
+@_cdecl("invoke_swift_closure_TestModule_10TestModulesSS_y")
+public func _invoke_swift_closure_TestModule_10TestModulesSS_y(_ boxPtr: UnsafeMutableRawPointer, _ param0Bytes: Int32, _ param0Length: Int32) -> Void {
+    #if arch(wasm32)
+    let closure = Unmanaged<_BridgeJSTypedClosureBox<(sending String) -> Void>>.fromOpaque(boxPtr).takeUnretainedValue().closure
+    closure(String.bridgeJSLiftParameter(param0Bytes, param0Length))
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_runValidator")
+@_cdecl("bjs_runValidator")
+public func _bjs_runValidator(_ cb: Int32) -> Void {
+    #if arch(wasm32)
+    runValidator(_: _BJS_Closure_10TestModuleKSS_Sb.bridgeJSLift(cb))
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_loadEach")
+@_cdecl("bjs_loadEach")
+public func _bjs_loadEach(_ fetch: Int32) -> Void {
+    #if arch(wasm32)
+    loadEach(_: _BJS_Closure_10TestModuleYaKSS_SS.bridgeJSLift(fetch))
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@JSFunction func Promise_reject(_ promise: JSObject, _ value: JSValue) throws(JSException)
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "promise_reject_TestModule")
+fileprivate func promise_reject_TestModule_extern(_ promise: Int32, _ valueKind: Int32, _ valuePayload1: Int32, _ valuePayload2: Float64) -> Void
+#else
+fileprivate func promise_reject_TestModule_extern(_ promise: Int32, _ valueKind: Int32, _ valuePayload1: Int32, _ valuePayload2: Float64) -> Void {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func promise_reject_TestModule(_ promise: Int32, _ valueKind: Int32, _ valuePayload1: Int32, _ valuePayload2: Float64) -> Void {
+    return promise_reject_TestModule_extern(promise, valueKind, valuePayload1, valuePayload2)
+}
+
+func _$Promise_reject(_ promise: JSObject, _ value: JSValue) throws(JSException) -> Void {
+    let (valueKind, valuePayload1, valuePayload2) = value.bridgeJSLowerParameter()
+    let promiseValue = promise.bridgeJSLowerParameter()
+    promise_reject_TestModule(promiseValue, valueKind, valuePayload1, valuePayload2)
+    if let error = _swift_js_take_exception() { throw error }
+}
+
+@JSFunction func Promise_resolve_SS(_ promise: JSObject, _ value: String) throws(JSException)
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "promise_resolve_TestModule_SS")
+fileprivate func promise_resolve_TestModule_SS_extern(_ promise: Int32, _ valueBytes: Int32, _ valueLength: Int32) -> Void
+#else
+fileprivate func promise_resolve_TestModule_SS_extern(_ promise: Int32, _ valueBytes: Int32, _ valueLength: Int32) -> Void {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func promise_resolve_TestModule_SS(_ promise: Int32, _ valueBytes: Int32, _ valueLength: Int32) -> Void {
+    return promise_resolve_TestModule_SS_extern(promise, valueBytes, valueLength)
+}
+
+func _$Promise_resolve_SS(_ promise: JSObject, _ value: String) throws(JSException) -> Void {
+    value.bridgeJSWithLoweredParameter { (valueBytes, valueLength) in
+        let promiseValue = promise.bridgeJSLowerParameter()
+        promise_resolve_TestModule_SS(promiseValue, valueBytes, valueLength)
+    }
+    if let error = _swift_js_take_exception() { throw error }
+}
+
 #if arch(wasm32)
 @_extern(wasm, module: "TestModule", name: "bjs_applyInt")
 fileprivate func bjs_applyInt_extern(_ value: Int32, _ transform: Int32) -> Int32
@@ -74,9 +414,9 @@ fileprivate func bjs_applyInt_extern(_ value: Int32, _ transform: Int32) -> Int3
 }
 
 func _$applyInt(_ value: Int, _ transform: @escaping (Int) -> Int) throws(JSException) -> Int {
-    let valueValue = value.bridgeJSLowerParameter()
     let transform = JSTypedClosure<(Int) -> Int>(transform)
     let transformFuncRef = transform.bridgeJSLowerParameter()
+    let valueValue = value.bridgeJSLowerParameter()
     let ret = withExtendedLifetime((transform)) {
         bjs_applyInt(valueValue, transformFuncRef)
     }
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftStruct.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftStruct.json
index bfde01318..2fcab7cb0 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftStruct.json
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftStruct.json
@@ -1,5 +1,8 @@
 {
   "exported" : {
+    "aliases" : [
+
+    ],
     "classes" : [
       {
         "constructor" : {
@@ -683,6 +686,23 @@
                 "_0" : "Vector2D"
               }
             }
+          },
+          {
+            "abiName" : "bjs_Vector2D_describe",
+            "effects" : {
+              "isAsync" : false,
+              "isStatic" : false,
+              "isThrows" : false
+            },
+            "name" : "describe",
+            "parameters" : [
+
+            ],
+            "returnType" : {
+              "string" : {
+
+              }
+            }
           }
         ],
         "name" : "Vector2D",
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftStruct.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftStruct.swift
index 9f671c711..b4e54961c 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftStruct.swift
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftStruct.swift
@@ -525,6 +525,17 @@ public func _bjs_Vector2D_scaled(_ factor: Float64) -> Void {
     #endif
 }
 
+@_expose(wasm, "bjs_Vector2D_describe")
+@_cdecl("bjs_Vector2D_describe")
+public func _bjs_Vector2D_describe() -> Void {
+    #if arch(wasm32)
+    let ret = Vector2D.bridgeJSLiftParameter().describe()
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
 @_expose(wasm, "bjs_roundtrip")
 @_cdecl("bjs_roundtrip")
 public func _bjs_roundtrip() -> Void {
@@ -619,4 +630,63 @@ fileprivate func _bjs_Greeter_wrap_extern(_ pointer: UnsafeMutableRawPointer) ->
 #endif
 @inline(never) fileprivate func _bjs_Greeter_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 {
     return _bjs_Greeter_wrap_extern(pointer)
-}
\ No newline at end of file
+}
+
+extension DataPoint: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = DataPoint.bridgeJSMakeTypeHandle()
+}
+
+extension Address: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = Address.bridgeJSMakeTypeHandle()
+}
+
+extension Person: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = Person.bridgeJSMakeTypeHandle()
+}
+
+extension Session: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = Session.bridgeJSMakeTypeHandle()
+}
+
+extension Measurement: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = Measurement.bridgeJSMakeTypeHandle()
+}
+
+extension ConfigStruct: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = ConfigStruct.bridgeJSMakeTypeHandle()
+}
+
+extension Container: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = Container.bridgeJSMakeTypeHandle()
+}
+
+extension Vector2D: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = Vector2D.bridgeJSMakeTypeHandle()
+}
+
+extension Precision: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = Precision.bridgeJSMakeTypeHandle()
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "bjs_TestModule_register_type_handles")
+fileprivate func _bjs_TestModule_register_type_handles_extern(_ base: UnsafePointer<Int32>?, _ count: Int32)
+
+@_expose(wasm, "bjs_TestModule_register_type_handles")
+public func _bjs_TestModule_register_type_handles() {
+    let typeIds: [Int32] = [
+        DataPoint.bridgeJSTypeID,
+        Address.bridgeJSTypeID,
+        Person.bridgeJSTypeID,
+        Session.bridgeJSTypeID,
+        Measurement.bridgeJSTypeID,
+        ConfigStruct.bridgeJSTypeID,
+        Container.bridgeJSTypeID,
+        Vector2D.bridgeJSTypeID,
+        Precision.bridgeJSTypeID,
+    ]
+    typeIds.withUnsafeBufferPointer { buffer in
+        _bjs_TestModule_register_type_handles_extern(buffer.baseAddress, Int32(buffer.count))
+    }
+}
+#endif
\ No newline at end of file
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftStructImports.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftStructImports.json
index fc59471bb..ba5aa11de 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftStructImports.json
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftStructImports.json
@@ -1,5 +1,8 @@
 {
   "exported" : {
+    "aliases" : [
+
+    ],
     "classes" : [
 
     ],
@@ -100,6 +103,40 @@
                 "_0" : "Point"
               }
             }
+          },
+          {
+            "accessLevel" : "internal",
+            "effects" : {
+              "isAsync" : false,
+              "isStatic" : false,
+              "isThrows" : true
+            },
+            "name" : "roundTripOptional",
+            "parameters" : [
+              {
+                "name" : "point",
+                "type" : {
+                  "nullable" : {
+                    "_0" : {
+                      "swiftStruct" : {
+                        "_0" : "Point"
+                      }
+                    },
+                    "_1" : "null"
+                  }
+                }
+              }
+            ],
+            "returnType" : {
+              "nullable" : {
+                "_0" : {
+                  "swiftStruct" : {
+                    "_0" : "Point"
+                  }
+                },
+                "_1" : "null"
+              }
+            }
           }
         ],
         "types" : [
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftStructImports.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftStructImports.swift
index fe79f786c..0d77ebe47 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftStructImports.swift
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftStructImports.swift
@@ -46,25 +46,65 @@ fileprivate func _bjs_struct_lift_Point_extern() -> Int32 {
     return _bjs_struct_lift_Point_extern()
 }
 
+extension Point: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = Point.bridgeJSMakeTypeHandle()
+}
+
 #if arch(wasm32)
 @_extern(wasm, module: "TestModule", name: "bjs_translate")
-fileprivate func bjs_translate_extern(_ point: Int32, _ dx: Int32, _ dy: Int32) -> Int32
+fileprivate func bjs_translate_extern(_ dx: Int32, _ dy: Int32) -> Void
 #else
-fileprivate func bjs_translate_extern(_ point: Int32, _ dx: Int32, _ dy: Int32) -> Int32 {
+fileprivate func bjs_translate_extern(_ dx: Int32, _ dy: Int32) -> Void {
     fatalError("Only available on WebAssembly")
 }
 #endif
-@inline(never) fileprivate func bjs_translate(_ point: Int32, _ dx: Int32, _ dy: Int32) -> Int32 {
-    return bjs_translate_extern(point, dx, dy)
+@inline(never) fileprivate func bjs_translate(_ dx: Int32, _ dy: Int32) -> Void {
+    return bjs_translate_extern(dx, dy)
 }
 
 func _$translate(_ point: Point, _ dx: Int, _ dy: Int) throws(JSException) -> Point {
-    let pointObjectId = point.bridgeJSLowerParameter()
-    let dxValue = dx.bridgeJSLowerParameter()
     let dyValue = dy.bridgeJSLowerParameter()
-    let ret = bjs_translate(pointObjectId, dxValue, dyValue)
+    let dxValue = dx.bridgeJSLowerParameter()
+    let _ = point.bridgeJSLowerParameter()
+    bjs_translate(dxValue, dyValue)
+    if let error = _swift_js_take_exception() {
+        throw error
+    }
+    return Point.bridgeJSLiftReturn()
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "TestModule", name: "bjs_roundTripOptional")
+fileprivate func bjs_roundTripOptional_extern() -> Void
+#else
+fileprivate func bjs_roundTripOptional_extern() -> Void {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func bjs_roundTripOptional() -> Void {
+    return bjs_roundTripOptional_extern()
+}
+
+func _$roundTripOptional(_ point: Optional<Point>) throws(JSException) -> Optional<Point> {
+    let _ = point.bridgeJSLowerParameter()
+    bjs_roundTripOptional()
     if let error = _swift_js_take_exception() {
         throw error
     }
-    return Point.bridgeJSLiftReturn(ret)
-}
\ No newline at end of file
+    return Optional<Point>.bridgeJSLiftReturn()
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "bjs_TestModule_register_type_handles")
+fileprivate func _bjs_TestModule_register_type_handles_extern(_ base: UnsafePointer<Int32>?, _ count: Int32)
+
+@_expose(wasm, "bjs_TestModule_register_type_handles")
+public func _bjs_TestModule_register_type_handles() {
+    let typeIds: [Int32] = [
+        Point.bridgeJSTypeID,
+    ]
+    typeIds.withUnsafeBufferPointer { buffer in
+        _bjs_TestModule_register_type_handles_extern(buffer.baseAddress, Int32(buffer.count))
+    }
+}
+#endif
\ No newline at end of file
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftTypedClosureAccess.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftTypedClosureAccess.swift
index fbd181fcc..c86b122a1 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftTypedClosureAccess.swift
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftTypedClosureAccess.swift
@@ -27,8 +27,8 @@ private enum _BJS_Closure_10TestModule13JSPublicEventC_y {
         let callback = JSObject.bridgeJSLiftParameter(callbackId)
         return { [callback] param0 in
             #if arch(wasm32)
-            let callbackValue = callback.bridgeJSLowerParameter()
             let param0Value = param0.bridgeJSLowerParameter()
+            let callbackValue = callback.bridgeJSLowerParameter()
             invoke_js_callback_TestModule_10TestModule13JSPublicEventC_y(callbackValue, param0Value)
             #else
             fatalError("Only available on WebAssembly")
@@ -88,8 +88,8 @@ private enum _BJS_Closure_10TestModule14JSPackageEventC_y {
         let callback = JSObject.bridgeJSLiftParameter(callbackId)
         return { [callback] param0 in
             #if arch(wasm32)
-            let callbackValue = callback.bridgeJSLowerParameter()
             let param0Value = param0.bridgeJSLowerParameter()
+            let callbackValue = callback.bridgeJSLowerParameter()
             invoke_js_callback_TestModule_10TestModule14JSPackageEventC_y(callbackValue, param0Value)
             #else
             fatalError("Only available on WebAssembly")
@@ -149,8 +149,8 @@ private enum _BJS_Closure_10TestModule15JSInternalEventC_y {
         let callback = JSObject.bridgeJSLiftParameter(callbackId)
         return { [callback] param0 in
             #if arch(wasm32)
-            let callbackValue = callback.bridgeJSLowerParameter()
             let param0Value = param0.bridgeJSLowerParameter()
+            let callbackValue = callback.bridgeJSLowerParameter()
             invoke_js_callback_TestModule_10TestModule15JSInternalEventC_y(callbackValue, param0Value)
             #else
             fatalError("Only available on WebAssembly")
@@ -206,8 +206,8 @@ fileprivate func bjs_JSPublicTarget_addInternalListener_extern(_ self: Int32, _
 }
 
 func _$JSPublicTarget_addPublicListener(_ self: JSObject, _ handler: JSTypedClosure<(JSPublicEvent) -> Void>) throws(JSException) -> Void {
-    let selfValue = self.bridgeJSLowerParameter()
     let handlerFuncRef = handler.bridgeJSLowerParameter()
+    let selfValue = self.bridgeJSLowerParameter()
     bjs_JSPublicTarget_addPublicListener(selfValue, handlerFuncRef)
     if let error = _swift_js_take_exception() {
         throw error
@@ -215,8 +215,8 @@ func _$JSPublicTarget_addPublicListener(_ self: JSObject, _ handler: JSTypedClos
 }
 
 func _$JSPublicTarget_addInternalListener(_ self: JSObject, _ handler: JSTypedClosure<(JSPublicEvent) -> Void>) throws(JSException) -> Void {
-    let selfValue = self.bridgeJSLowerParameter()
     let handlerFuncRef = handler.bridgeJSLowerParameter()
+    let selfValue = self.bridgeJSLowerParameter()
     bjs_JSPublicTarget_addInternalListener(selfValue, handlerFuncRef)
     if let error = _swift_js_take_exception() {
         throw error
@@ -236,8 +236,8 @@ fileprivate func bjs_JSPackageTarget_addPackageListener_extern(_ self: Int32, _
 }
 
 func _$JSPackageTarget_addPackageListener(_ self: JSObject, _ handler: JSTypedClosure<(JSPackageEvent) -> Void>) throws(JSException) -> Void {
-    let selfValue = self.bridgeJSLowerParameter()
     let handlerFuncRef = handler.bridgeJSLowerParameter()
+    let selfValue = self.bridgeJSLowerParameter()
     bjs_JSPackageTarget_addPackageListener(selfValue, handlerFuncRef)
     if let error = _swift_js_take_exception() {
         throw error
@@ -257,8 +257,8 @@ fileprivate func bjs_JSInternalTarget_addInternalListener_extern(_ self: Int32,
 }
 
 func _$JSInternalTarget_addInternalListener(_ self: JSObject, _ handler: JSTypedClosure<(JSInternalEvent) -> Void>) throws(JSException) -> Void {
-    let selfValue = self.bridgeJSLowerParameter()
     let handlerFuncRef = handler.bridgeJSLowerParameter()
+    let selfValue = self.bridgeJSLowerParameter()
     bjs_JSInternalTarget_addInternalListener(selfValue, handlerFuncRef)
     if let error = _swift_js_take_exception() {
         throw error
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Throws.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Throws.json
index 942e5fb45..0e45eefca 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Throws.json
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Throws.json
@@ -1,5 +1,8 @@
 {
   "exported" : {
+    "aliases" : [
+
+    ],
     "classes" : [
 
     ],
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Throws.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Throws.swift
index 37f6d9c96..91787a642 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Throws.swift
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Throws.swift
@@ -10,7 +10,7 @@ public func _bjs_throwsSomething() -> Void {
                 _swift_js_throw(Int32(bitPattern: $0.id))
             }
         } else {
-            let jsError = JSError(message: String(describing: error))
+            let jsError = JSError(message: error.description)
             withExtendedLifetime(jsError.jsObject) {
                 _swift_js_throw(Int32(bitPattern: $0.id))
             }
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/UnsafePointer.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/UnsafePointer.json
index a382778e9..1b1a1088b 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/UnsafePointer.json
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/UnsafePointer.json
@@ -1,5 +1,8 @@
 {
   "exported" : {
+    "aliases" : [
+
+    ],
     "classes" : [
 
     ],
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/UnsafePointer.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/UnsafePointer.swift
index b97729084..69011da18 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/UnsafePointer.swift
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/UnsafePointer.swift
@@ -177,4 +177,23 @@ public func _bjs_roundTripPointerFields() -> Void {
     #else
     fatalError("Only available on WebAssembly")
     #endif
-}
\ No newline at end of file
+}
+
+extension PointerFields: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = PointerFields.bridgeJSMakeTypeHandle()
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "bjs_TestModule_register_type_handles")
+fileprivate func _bjs_TestModule_register_type_handles_extern(_ base: UnsafePointer<Int32>?, _ count: Int32)
+
+@_expose(wasm, "bjs_TestModule_register_type_handles")
+public func _bjs_TestModule_register_type_handles() {
+    let typeIds: [Int32] = [
+        PointerFields.bridgeJSTypeID,
+    ]
+    typeIds.withUnsafeBufferPointer { buffer in
+        _bjs_TestModule_register_type_handles_extern(buffer.baseAddress, Int32(buffer.count))
+    }
+}
+#endif
\ No newline at end of file
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/VoidParameterVoidReturn.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/VoidParameterVoidReturn.json
index d31f775fb..4fef14d6a 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/VoidParameterVoidReturn.json
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/VoidParameterVoidReturn.json
@@ -1,5 +1,8 @@
 {
   "exported" : {
+    "aliases" : [
+
+    ],
     "classes" : [
 
     ],
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Alias.d.ts b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Alias.d.ts
new file mode 100644
index 000000000..e3092afb3
--- /dev/null
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Alias.d.ts
@@ -0,0 +1,71 @@
+// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit,
+// DO NOT EDIT.
+//
+// To update this file, just rebuild your project or run
+// `swift package bridge-js`.
+
+export interface HasOptionalUserId {
+    readonly userId: number | null;
+}
+
+export const InnerTagValues: {
+    readonly Tag: {
+        readonly Payload: 0;
+        readonly Empty: 1;
+    };
+};
+
+export type InnerTagTag =
+  { tag: typeof InnerTagValues.Tag.Payload; param0: number } | { tag: typeof InnerTagValues.Tag.Empty }
+
+export type InnerTagObject = typeof InnerTagValues;
+
+/// Represents a Swift heap object like a class instance or an actor instance.
+export interface SwiftHeapObject {
+    /// Release the heap object.
+    ///
+    /// Note: Calling this method will release the heap object and it will no longer be accessible.
+    release(): void;
+}
+export interface PolygonReference extends SwiftHeapObject {
+    snapshot(): PolygonReference;
+    merge(other: PolygonReference): PolygonReference;
+}
+export interface TagReference extends SwiftHeapObject {
+}
+export interface Surface {
+    readonly label: string;
+}
+export type Exports = {
+    roundtripPolygon(polygon: PolygonReference): PolygonReference;
+    optionalPolygon(polygon: PolygonReference | null): PolygonReference | null;
+    polygonArray(polygons: PolygonReference[]): PolygonReference[];
+    validatePolygon(polygon: PolygonReference): PolygonReference;
+    makeTag(name: string): TagReference;
+    roundtripTags(xs: (InnerTagTag | null)[]): (InnerTagTag | null)[];
+    describeUser(owner: HasOptionalUserId): HasOptionalUserId;
+    InnerTag: InnerTagObject
+    PolygonReference: {
+        new(underlying: PolygonReference): PolygonReference;
+        origin(): PolygonReference;
+    },
+    TagReference: {
+        new(underlying: TagReference): TagReference;
+    },
+}
+export type Imports = {
+    acceptTagged(tagged: string): void;
+    acceptOptionalTagged(tagged: string | null): void;
+    roundtripTagged(tagged: string): string;
+    produceOptionalCanvas(): Surface | null;
+    Surface: {
+        new(): Surface;
+    }
+}
+export function createInstantiator(options: {
+    imports: Imports;
+}, swift: any): Promise<{
+    addImports: (importObject: WebAssembly.Imports) => void;
+    setInstance: (instance: WebAssembly.Instance) => void;
+    createExports: (instance: WebAssembly.Instance) => Exports;
+}>;
\ No newline at end of file
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Alias.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Alias.js
new file mode 100644
index 000000000..b1cfb68aa
--- /dev/null
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Alias.js
@@ -0,0 +1,841 @@
+// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit,
+// DO NOT EDIT.
+//
+// To update this file, just rebuild your project or run
+// `swift package bridge-js`.
+
+export const InnerTagValues = {
+    Tag: {
+        Payload: 0,
+        Empty: 1,
+    },
+};
+export async function createInstantiator(options, swift) {
+    let instance;
+    let memory;
+    let setException;
+    let decodeString;
+    const textDecoder = new TextDecoder("utf-8");
+    const textEncoder = new TextEncoder("utf-8");
+    let tmpRetString;
+    let tmpRetBytes;
+    let tmpRetException;
+    let tmpRetOptionalBool;
+    let tmpRetOptionalInt;
+    let tmpRetOptionalFloat;
+    let tmpRetOptionalDouble;
+    let tmpRetOptionalHeapObject;
+    let strStack = [];
+    let i32Stack = [];
+    let i64Stack = [];
+    let f32Stack = [];
+    let f64Stack = [];
+    let ptrStack = [];
+    let taStack = [];
+    const enumHelpers = {};
+    const structHelpers = {};
+
+    let _exports = null;
+    let bjs = null;
+    const __bjs_arrayCodecCache = new WeakMap();
+    function __bjs_arrayCodec(elementCodec) {
+        let codec = __bjs_arrayCodecCache.get(elementCodec);
+        if (codec !== undefined) {
+            return codec;
+        }
+        codec = {
+            lower(value) {
+                for (let i = 0; i < value.length; i++) {
+                    elementCodec.lower(value[i]);
+                }
+                i32Stack.push(value.length);
+            },
+            lift() {
+                const count = i32Stack.pop();
+                if (count === -1) {
+                    return taStack.pop();
+                }
+                const result = new Array(count);
+                for (let i = count - 1; i >= 0; i--) {
+                    result[i] = elementCodec.lift();
+                }
+                return result;
+            },
+        };
+        __bjs_arrayCodecCache.set(elementCodec, codec);
+        return codec;
+    }
+    const __bjs_optionalCodecCache = new WeakMap();
+    const __bjs_optionalCodecUndefinedOrCache = new WeakMap();
+    function __bjs_optionalCodec(elementCodec, isUndefinedOr = false) {
+        const cache = isUndefinedOr ? __bjs_optionalCodecUndefinedOrCache : __bjs_optionalCodecCache;
+        let codec = cache.get(elementCodec);
+        if (codec !== undefined) {
+            return codec;
+        }
+        codec = {
+            lower(value) {
+                const isSome = isUndefinedOr ? value !== undefined : value != null;
+                if (isSome) {
+                    elementCodec.lower(value);
+                    i32Stack.push(1);
+                } else {
+                    i32Stack.push(0);
+                }
+            },
+            lift() {
+                if (i32Stack.pop() === 0) {
+                    return isUndefinedOr ? undefined : null;
+                }
+                return elementCodec.lift();
+            },
+        };
+        cache.set(elementCodec, codec);
+        return codec;
+    }
+    const __bjs_dictCodecCache = new WeakMap();
+    function __bjs_dictCodec(valueCodec) {
+        let codec = __bjs_dictCodecCache.get(valueCodec);
+        if (codec !== undefined) {
+            return codec;
+        }
+        codec = {
+            lower(value) {
+                const keys = Object.keys(value);
+                for (let i = 0; i < keys.length; i++) {
+                    __bjs_stringCodec.lower(keys[i]);
+                    valueCodec.lower(value[keys[i]]);
+                }
+                i32Stack.push(keys.length);
+            },
+            lift() {
+                const count = i32Stack.pop();
+                const result = {};
+                for (let i = 0; i < count; i++) {
+                    const value = valueCodec.lift();
+                    const key = __bjs_stringCodec.lift();
+                    result[key] = value;
+                }
+                return result;
+            },
+        };
+        __bjs_dictCodecCache.set(valueCodec, codec);
+        return codec;
+    }
+
+    const __bjs_stringCodec = {
+        lower: (v) => {
+            const bytes = textEncoder.encode(v);
+            const id = swift.memory.retain(bytes);
+            i32Stack.push(bytes.length);
+            i32Stack.push(id);
+        },
+        lift: () => {
+            const string = strStack.pop();
+            return string;
+        },
+    };
+    const __bjs_primitiveCodecs = {
+        Bool: {
+            lower: (v) => {
+                i32Stack.push(v ? 1 : 0);
+            },
+            lift: () => {
+                const bool = i32Stack.pop() !== 0;
+                return bool;
+            },
+        },
+        Int: {
+            lower: (v) => {
+                i32Stack.push((v | 0));
+            },
+            lift: () => {
+                const int = i32Stack.pop();
+                return int;
+            },
+        },
+        Int8: {
+            lower: (v) => {
+                i32Stack.push((v | 0));
+            },
+            lift: () => {
+                const int = i32Stack.pop();
+                return int;
+            },
+        },
+        UInt8: {
+            lower: (v) => {
+                i32Stack.push((v | 0));
+            },
+            lift: () => {
+                const int = i32Stack.pop() >>> 0;
+                return int;
+            },
+        },
+        Int16: {
+            lower: (v) => {
+                i32Stack.push((v | 0));
+            },
+            lift: () => {
+                const int = i32Stack.pop();
+                return int;
+            },
+        },
+        UInt16: {
+            lower: (v) => {
+                i32Stack.push((v | 0));
+            },
+            lift: () => {
+                const int = i32Stack.pop() >>> 0;
+                return int;
+            },
+        },
+        Int32: {
+            lower: (v) => {
+                i32Stack.push((v | 0));
+            },
+            lift: () => {
+                const int = i32Stack.pop();
+                return int;
+            },
+        },
+        UInt32: {
+            lower: (v) => {
+                i32Stack.push((v | 0));
+            },
+            lift: () => {
+                const int = i32Stack.pop() >>> 0;
+                return int;
+            },
+        },
+        UInt: {
+            lower: (v) => {
+                i32Stack.push((v | 0));
+            },
+            lift: () => {
+                const int = i32Stack.pop() >>> 0;
+                return int;
+            },
+        },
+        Int64: {
+            lower: (v) => {
+                i64Stack.push(v);
+            },
+            lift: () => {
+                const int = i64Stack.pop();
+                return int;
+            },
+        },
+        UInt64: {
+            lower: (v) => {
+                i64Stack.push(v);
+            },
+            lift: () => {
+                const int = i64Stack.pop();
+                return int;
+            },
+        },
+        Float: {
+            lower: (v) => {
+                f32Stack.push(Math.fround(v));
+            },
+            lift: () => {
+                const f32 = f32Stack.pop();
+                return f32;
+            },
+        },
+        Double: {
+            lower: (v) => {
+                f64Stack.push(v);
+            },
+            lift: () => {
+                const f64 = f64Stack.pop();
+                return f64;
+            },
+        },
+        String: __bjs_stringCodec,
+        JSValue: {
+            lower: (v) => {
+                const [vKind, vPayload1, vPayload2] = __bjs_jsValueLower(v);
+                i32Stack.push(vKind);
+                i32Stack.push(vPayload1);
+                f64Stack.push(vPayload2);
+            },
+            lift: () => {
+                const jsValuePayload2 = f64Stack.pop();
+                const jsValuePayload1 = i32Stack.pop();
+                const jsValueKind = i32Stack.pop();
+                const jsValue = __bjs_jsValueLift(jsValueKind, jsValuePayload1, jsValuePayload2);
+                return jsValue;
+            },
+        },
+    };
+
+    function __bjs_jsValueLower(value) {
+        let kind;
+        let payload1;
+        let payload2;
+        if (value === null) {
+            kind = 4;
+            payload1 = 0;
+            payload2 = 0;
+        } else {
+            switch (typeof value) {
+                case "boolean":
+                    kind = 0;
+                    payload1 = value ? 1 : 0;
+                    payload2 = 0;
+                    break;
+                case "number":
+                    kind = 2;
+                    payload1 = 0;
+                    payload2 = value;
+                    break;
+                case "string":
+                    kind = 1;
+                    payload1 = swift.memory.retain(value);
+                    payload2 = 0;
+                    break;
+                case "undefined":
+                    kind = 5;
+                    payload1 = 0;
+                    payload2 = 0;
+                    break;
+                case "object":
+                    kind = 3;
+                    payload1 = swift.memory.retain(value);
+                    payload2 = 0;
+                    break;
+                case "function":
+                    kind = 3;
+                    payload1 = swift.memory.retain(value);
+                    payload2 = 0;
+                    break;
+                case "symbol":
+                    kind = 7;
+                    payload1 = swift.memory.retain(value);
+                    payload2 = 0;
+                    break;
+                case "bigint":
+                    kind = 8;
+                    payload1 = swift.memory.retain(value);
+                    payload2 = 0;
+                    break;
+                default:
+                    throw new TypeError("Unsupported JSValue type");
+            }
+        }
+        return [kind, payload1, payload2];
+    }
+    function __bjs_jsValueLift(kind, payload1, payload2) {
+        let jsValue;
+        switch (kind) {
+            case 0:
+                jsValue = payload1 !== 0;
+                break;
+            case 1:
+                jsValue = swift.memory.getObject(payload1);
+                break;
+            case 2:
+                jsValue = payload2;
+                break;
+            case 3:
+                jsValue = swift.memory.getObject(payload1);
+                break;
+            case 4:
+                jsValue = null;
+                break;
+            case 5:
+                jsValue = undefined;
+                break;
+            case 7:
+                jsValue = swift.memory.getObject(payload1);
+                break;
+            case 8:
+                jsValue = swift.memory.getObject(payload1);
+                break;
+            default:
+                throw new TypeError("Unsupported JSValue kind " + kind);
+        }
+        return jsValue;
+    }
+
+    const __bjs_codec_M10TestModuleT16PolygonReference = {
+        lower: (v) => {
+            ptrStack.push(v.pointer);
+        },
+        lift: () => {
+            const ptr = ptrStack.pop();
+            const obj = _exports['PolygonReference'].__construct(ptr);
+            return obj;
+        },
+    };
+    const __bjs_codec_Array_M10TestModuleT16PolygonReference = __bjs_arrayCodec(__bjs_codec_M10TestModuleT16PolygonReference);
+    const __bjs_codec_M10TestModuleT8InnerTag = {
+        lower: (v) => {
+            const caseId = enumHelpers.M10TestModuleT8InnerTag.lower(v);
+            i32Stack.push(caseId);
+        },
+        lift: () => {
+            const enumValue = enumHelpers.M10TestModuleT8InnerTag.lift(i32Stack.pop());
+            return enumValue;
+        },
+    };
+    const __bjs_codec_Optional_M10TestModuleT8InnerTag = __bjs_optionalCodec(__bjs_codec_M10TestModuleT8InnerTag);
+    const __bjs_codec_Array_Optional_M10TestModuleT8InnerTag = __bjs_arrayCodec(__bjs_codec_Optional_M10TestModuleT8InnerTag);
+    const __bjs_codec_Surface = {
+        lower: (v) => {
+            const objId = swift.memory.retain(v);
+            i32Stack.push(objId);
+        },
+        lift: () => {
+            const objId = i32Stack.pop();
+            const obj = swift.memory.getObject(objId);
+            swift.memory.release(objId);
+            return obj;
+        },
+    };
+    const __bjs_codec_Optional_Surface = __bjs_optionalCodec(__bjs_codec_Surface);
+
+    const __bjs_createEnumHelpers_M10TestModuleT8InnerTag = () => ({
+        lower: (value) => {
+            const enumTag = value.tag;
+            switch (enumTag) {
+                case InnerTagValues.Tag.Payload: {
+                    i32Stack.push((value.param0 | 0));
+                    return InnerTagValues.Tag.Payload;
+                }
+                case InnerTagValues.Tag.Empty: {
+                    return InnerTagValues.Tag.Empty;
+                }
+                default: throw new Error("Unknown InnerTagValues tag: " + String(enumTag));
+            }
+        },
+        lift: (tag) => {
+            tag = tag | 0;
+            switch (tag) {
+                case InnerTagValues.Tag.Payload: {
+                    const int = i32Stack.pop();
+                    return { tag: InnerTagValues.Tag.Payload, param0: int };
+                }
+                case InnerTagValues.Tag.Empty: return { tag: InnerTagValues.Tag.Empty };
+                default: throw new Error("Unknown InnerTagValues tag returned from Swift: " + String(tag));
+            }
+        }
+    });
+
+    return {
+        /**
+         * @param {WebAssembly.Imports} importObject
+         */
+        addImports: (importObject, importsContext) => {
+            bjs = {};
+            importObject["bjs"] = bjs;
+            const imports = options.getImports(importsContext);
+            bjs["swift_js_return_string"] = function(ptr, len) {
+                tmpRetString = decodeString(ptr, len);
+            }
+            bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) {
+                const source = swift.memory.getObject(sourceId);
+                swift.memory.release(sourceId);
+                const bytes = new Uint8Array(memory.buffer, bytesPtr >>> 0);
+                bytes.set(source);
+            }
+            bjs["swift_js_make_js_string"] = function(ptr, len) {
+                return swift.memory.retain(decodeString(ptr, len));
+            }
+            bjs["swift_js_init_memory_with_result"] = function(ptr, len) {
+                const target = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0);
+                target.set(tmpRetBytes);
+                tmpRetBytes = undefined;
+            }
+            bjs["swift_js_throw"] = function(id) {
+                tmpRetException = swift.memory.retainByRef(id);
+            }
+            bjs["swift_js_retain"] = function(id) {
+                return swift.memory.retainByRef(id);
+            }
+            bjs["swift_js_release"] = function(id) {
+                swift.memory.release(id);
+            }
+            bjs["swift_js_push_i32"] = function(v) {
+                i32Stack.push(v | 0);
+            }
+            bjs["swift_js_push_f32"] = function(v) {
+                f32Stack.push(Math.fround(v));
+            }
+            bjs["swift_js_push_f64"] = function(v) {
+                f64Stack.push(v);
+            }
+            bjs["swift_js_push_string"] = function(ptr, len) {
+                const value = decodeString(ptr, len);
+                strStack.push(value);
+            }
+            bjs["swift_js_pop_i32"] = function() {
+                return i32Stack.pop();
+            }
+            bjs["swift_js_pop_f32"] = function() {
+                return f32Stack.pop();
+            }
+            bjs["swift_js_pop_f64"] = function() {
+                return f64Stack.pop();
+            }
+            bjs["swift_js_push_pointer"] = function(pointer) {
+                ptrStack.push(pointer);
+            }
+            bjs["swift_js_pop_pointer"] = function() {
+                return ptrStack.pop();
+            }
+            bjs["swift_js_push_i64"] = function(v) {
+                i64Stack.push(v);
+            }
+            bjs["swift_js_pop_i64"] = function() {
+                return i64Stack.pop();
+            }
+            const taCtors = [Int8Array, Uint8Array, Int16Array, Uint16Array, Int32Array, Uint32Array, Float32Array, Float64Array];
+            bjs["swift_js_push_typed_array"] = function(kind, ptr, count) {
+                const Ctor = taCtors[kind];
+                const byteLen = count * Ctor.BYTES_PER_ELEMENT;
+                const copy = memory.buffer.slice(ptr, ptr + byteLen);
+                taStack.push(Array.from(new Ctor(copy)));
+            }
+            bjs["bjs_core_register_type_handles"] = function() {};
+            bjs["bjs_TestModule_register_type_handles"] = function() {};
+            const __bjs_promiseSettlers = Symbol("JavaScriptKit.promiseSettlers");
+            bjs["swift_js_make_promise"] = function() {
+                let resolve, reject;
+                const promise = new Promise((res, rej) => { resolve = res; reject = rej; });
+                promise[__bjs_promiseSettlers] = { resolve, reject };
+                return swift.memory.retain(promise);
+            }
+            bjs["swift_js_return_optional_bool"] = function(isSome, value) {
+                if (isSome === 0) {
+                    tmpRetOptionalBool = null;
+                } else {
+                    tmpRetOptionalBool = value !== 0;
+                }
+            }
+            bjs["swift_js_return_optional_int"] = function(isSome, value) {
+                if (isSome === 0) {
+                    tmpRetOptionalInt = null;
+                } else {
+                    tmpRetOptionalInt = value | 0;
+                }
+            }
+            bjs["swift_js_return_optional_float"] = function(isSome, value) {
+                if (isSome === 0) {
+                    tmpRetOptionalFloat = null;
+                } else {
+                    tmpRetOptionalFloat = Math.fround(value);
+                }
+            }
+            bjs["swift_js_return_optional_double"] = function(isSome, value) {
+                if (isSome === 0) {
+                    tmpRetOptionalDouble = null;
+                } else {
+                    tmpRetOptionalDouble = value;
+                }
+            }
+            bjs["swift_js_return_optional_string"] = function(isSome, ptr, len) {
+                if (isSome === 0) {
+                    tmpRetString = null;
+                } else {
+                    tmpRetString = decodeString(ptr, len);
+                }
+            }
+            bjs["swift_js_return_optional_object"] = function(isSome, objectId) {
+                if (isSome === 0) {
+                    tmpRetString = null;
+                } else {
+                    tmpRetString = swift.memory.getObject(objectId);
+                }
+            }
+            bjs["swift_js_return_optional_heap_object"] = function(isSome, pointer) {
+                if (isSome === 0) {
+                    tmpRetOptionalHeapObject = null;
+                } else {
+                    tmpRetOptionalHeapObject = pointer;
+                }
+            }
+            bjs["swift_js_get_optional_int_presence"] = function() {
+                return tmpRetOptionalInt != null ? 1 : 0;
+            }
+            bjs["swift_js_get_optional_int_value"] = function() {
+                const value = tmpRetOptionalInt;
+                tmpRetOptionalInt = undefined;
+                return value;
+            }
+            bjs["swift_js_get_optional_string"] = function() {
+                const str = tmpRetString;
+                tmpRetString = undefined;
+                if (str == null) {
+                    return -1;
+                } else {
+                    const bytes = textEncoder.encode(str);
+                    tmpRetBytes = bytes;
+                    return bytes.length;
+                }
+            }
+            bjs["swift_js_get_optional_float_presence"] = function() {
+                return tmpRetOptionalFloat != null ? 1 : 0;
+            }
+            bjs["swift_js_get_optional_float_value"] = function() {
+                const value = tmpRetOptionalFloat;
+                tmpRetOptionalFloat = undefined;
+                return value;
+            }
+            bjs["swift_js_get_optional_double_presence"] = function() {
+                return tmpRetOptionalDouble != null ? 1 : 0;
+            }
+            bjs["swift_js_get_optional_double_value"] = function() {
+                const value = tmpRetOptionalDouble;
+                tmpRetOptionalDouble = undefined;
+                return value;
+            }
+            bjs["swift_js_get_optional_heap_object_pointer"] = function() {
+                const pointer = tmpRetOptionalHeapObject;
+                tmpRetOptionalHeapObject = undefined;
+                return pointer || 0;
+            }
+            bjs["swift_js_closure_unregister"] = function(funcRef) {}
+            // Wrapper functions for module: TestModule
+            if (!importObject["TestModule"]) {
+                importObject["TestModule"] = {};
+            }
+            importObject["TestModule"]["bjs_PolygonReference_wrap"] = function(pointer) {
+                const obj = _exports['PolygonReference'].__construct(pointer);
+                return swift.memory.retain(obj);
+            };
+            importObject["TestModule"]["bjs_TagReference_wrap"] = function(pointer) {
+                const obj = _exports['TagReference'].__construct(pointer);
+                return swift.memory.retain(obj);
+            };
+            const TestModule = importObject["TestModule"] = importObject["TestModule"] || {};
+            TestModule["bjs_acceptTagged"] = function bjs_acceptTagged(taggedBytes, taggedCount) {
+                try {
+                    const string = decodeString(taggedBytes, taggedCount);
+                    imports.acceptTagged(string);
+                } catch (error) {
+                    setException(error);
+                }
+            }
+            TestModule["bjs_acceptOptionalTagged"] = function bjs_acceptOptionalTagged(taggedIsSome, taggedBytes, taggedCount) {
+                try {
+                    let optResult;
+                    if (taggedIsSome) {
+                        const string = decodeString(taggedBytes, taggedCount);
+                        optResult = string;
+                    } else {
+                        optResult = null;
+                    }
+                    imports.acceptOptionalTagged(optResult);
+                } catch (error) {
+                    setException(error);
+                }
+            }
+            TestModule["bjs_roundtripTagged"] = function bjs_roundtripTagged(taggedBytes, taggedCount) {
+                try {
+                    const string = decodeString(taggedBytes, taggedCount);
+                    let ret = imports.roundtripTagged(string);
+                    tmpRetBytes = textEncoder.encode(ret);
+                    return tmpRetBytes.length;
+                } catch (error) {
+                    setException(error);
+                }
+            }
+            TestModule["bjs_produceOptionalCanvas"] = function bjs_produceOptionalCanvas() {
+                try {
+                    let ret = imports.produceOptionalCanvas();
+                    __bjs_codec_Optional_Surface.lower(ret);
+                } catch (error) {
+                    setException(error);
+                }
+            }
+            TestModule["bjs_Surface_init"] = function bjs_Surface_init() {
+                try {
+                    return swift.memory.retain(new imports.Surface());
+                } catch (error) {
+                    setException(error);
+                    return 0
+                }
+            }
+            TestModule["bjs_Surface_label_get"] = function bjs_Surface_label_get(self) {
+                try {
+                    let ret = swift.memory.getObject(self).label;
+                    tmpRetBytes = textEncoder.encode(ret);
+                    return tmpRetBytes.length;
+                } catch (error) {
+                    setException(error);
+                }
+            }
+            TestModule["bjs_HasOptionalUserId_userId_get"] = function bjs_HasOptionalUserId_userId_get(self) {
+                try {
+                    let ret = swift.memory.getObject(self).userId;
+                    tmpRetOptionalInt = ret;
+                } catch (error) {
+                    setException(error);
+                }
+            }
+        },
+        setInstance: (i) => {
+            instance = i;
+            memory = instance.exports.memory;
+
+            decodeString = (ptr, len) => { const bytes = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); return textDecoder.decode(bytes); }
+
+            setException = (error) => {
+                instance.exports._swift_js_exception.value = swift.memory.retain(error)
+            }
+        },
+        /** @param {WebAssembly.Instance} instance */
+        createExports: (instance) => {
+            const js = swift.memory.heap;
+            const swiftHeapObjectFinalizationRegistry = (typeof FinalizationRegistry === "undefined") ? { register: () => {}, unregister: () => {} } : new FinalizationRegistry((state) => {
+                if (state.hasReleased) {
+                    return;
+                }
+                state.hasReleased = true;
+                state.identityMap?.delete(state.pointer);
+                state.deinit(state.pointer);
+            });
+
+            /// Represents a Swift heap object like a class instance or an actor instance.
+            class SwiftHeapObject {
+                static __wrap(pointer, deinit, prototype, identityCache) {
+                    pointer = pointer >>> 0;
+                    const makeFresh = (identityMap) => {
+                        const obj = Object.create(prototype);
+                        const state = { pointer, deinit, hasReleased: false, identityMap };
+                        obj.pointer = pointer;
+                        obj.__swiftHeapObjectState = state;
+                        swiftHeapObjectFinalizationRegistry.register(obj, state, state);
+                        if (identityMap) {
+                            identityMap.set(pointer, new WeakRef(obj));
+                        }
+                        return obj;
+                    };
+
+                    if (!identityCache) {
+                        return makeFresh(null);
+                    }
+
+                    const cached = identityCache.get(pointer)?.deref();
+                    if (cached && !cached.__swiftHeapObjectState.hasReleased) {
+                        deinit(pointer);
+                        return cached;
+                    }
+                    if (identityCache.has(pointer)) {
+                        identityCache.delete(pointer);
+                    }
+
+                    return makeFresh(identityCache);
+                }
+
+                release() {
+                    const state = this.__swiftHeapObjectState;
+                    if (state.hasReleased) {
+                        return;
+                    }
+                    state.hasReleased = true;
+                    swiftHeapObjectFinalizationRegistry.unregister(state);
+                    state.identityMap?.delete(state.pointer);
+                    state.deinit(state.pointer);
+                }
+            }
+            class PolygonReference extends SwiftHeapObject {
+                static __construct(ptr) {
+                    return SwiftHeapObject.__wrap(ptr, instance.exports.bjs_PolygonReference_deinit, PolygonReference.prototype, null);
+                }
+
+                constructor(underlying) {
+                    const ret = instance.exports.bjs_PolygonReference_init(underlying.pointer);
+                    return PolygonReference.__construct(ret);
+                }
+                snapshot() {
+                    const ret = instance.exports.bjs_PolygonReference_snapshot(this.pointer);
+                    return PolygonReference.__construct(ret);
+                }
+                merge(other) {
+                    const ret = instance.exports.bjs_PolygonReference_merge(this.pointer, other.pointer);
+                    return PolygonReference.__construct(ret);
+                }
+                static origin() {
+                    const ret = instance.exports.bjs_PolygonReference_static_origin();
+                    return PolygonReference.__construct(ret);
+                }
+            }
+            class TagReference extends SwiftHeapObject {
+                static __construct(ptr) {
+                    return SwiftHeapObject.__wrap(ptr, instance.exports.bjs_TagReference_deinit, TagReference.prototype, null);
+                }
+
+                constructor(underlying) {
+                    const ret = instance.exports.bjs_TagReference_init(underlying.pointer);
+                    return TagReference.__construct(ret);
+                }
+            }
+            const __bjs_helpers_M10TestModuleT8InnerTag = __bjs_createEnumHelpers_M10TestModuleT8InnerTag();
+            enumHelpers.M10TestModuleT8InnerTag = __bjs_helpers_M10TestModuleT8InnerTag;
+
+            const exports = {
+                roundtripPolygon: function bjs_roundtripPolygon(polygon) {
+                    const ret = instance.exports.bjs_roundtripPolygon(polygon.pointer);
+                    return PolygonReference.__construct(ret);
+                },
+                optionalPolygon: function bjs_optionalPolygon(polygon) {
+                    const isSome = polygon != null;
+                    let result;
+                    if (isSome) {
+                        result = polygon.pointer;
+                    } else {
+                        result = 0;
+                    }
+                    instance.exports.bjs_optionalPolygon(+isSome, result);
+                    const pointer = tmpRetOptionalHeapObject;
+                    tmpRetOptionalHeapObject = undefined;
+                    const optResult = pointer === null ? null : PolygonReference.__construct(pointer);
+                    return optResult;
+                },
+                polygonArray: function bjs_polygonArray(polygons) {
+                    __bjs_codec_Array_M10TestModuleT16PolygonReference.lower(polygons);
+                    instance.exports.bjs_polygonArray();
+                    const arrayResult = __bjs_codec_Array_M10TestModuleT16PolygonReference.lift();
+                    return arrayResult;
+                },
+                validatePolygon: function bjs_validatePolygon(polygon) {
+                    const ret = instance.exports.bjs_validatePolygon(polygon.pointer);
+                    if (tmpRetException) {
+                        const error = swift.memory.getObject(tmpRetException);
+                        swift.memory.release(tmpRetException);
+                        tmpRetException = undefined;
+                        throw error;
+                    }
+                    return PolygonReference.__construct(ret);
+                },
+                makeTag: function bjs_makeTag(name) {
+                    const nameBytes = textEncoder.encode(name);
+                    const nameId = swift.memory.retain(nameBytes);
+                    const ret = instance.exports.bjs_makeTag(nameId, nameBytes.length);
+                    return TagReference.__construct(ret);
+                },
+                roundtripTags: function bjs_roundtripTags(xs) {
+                    __bjs_codec_Array_Optional_M10TestModuleT8InnerTag.lower(xs);
+                    instance.exports.bjs_roundtripTags();
+                    const arrayResult = __bjs_codec_Array_Optional_M10TestModuleT8InnerTag.lift();
+                    return arrayResult;
+                },
+                describeUser: function bjs_describeUser(owner) {
+                    const ret = instance.exports.bjs_describeUser(swift.memory.retain(owner));
+                    const ret1 = swift.memory.getObject(ret);
+                    swift.memory.release(ret);
+                    return ret1;
+                },
+                InnerTag: InnerTagValues,
+                PolygonReference,
+                TagReference,
+            };
+            _exports = exports;
+            return exports;
+        },
+    }
+}
\ No newline at end of file
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/AliasInClosure.d.ts b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/AliasInClosure.d.ts
new file mode 100644
index 000000000..73ea3b570
--- /dev/null
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/AliasInClosure.d.ts
@@ -0,0 +1,31 @@
+// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit,
+// DO NOT EDIT.
+//
+// To update this file, just rebuild your project or run
+// `swift package bridge-js`.
+
+/// Represents a Swift heap object like a class instance or an actor instance.
+export interface SwiftHeapObject {
+    /// Release the heap object.
+    ///
+    /// Note: Calling this method will release the heap object and it will no longer be accessible.
+    release(): void;
+}
+export interface PolygonReference extends SwiftHeapObject {
+}
+export type Exports = {
+    makePolygonFactory(): () => PolygonReference;
+    makePolygonInspector(): (arg0: PolygonReference) => number;
+    PolygonReference: {
+        new(sides: number): PolygonReference;
+    },
+}
+export type Imports = {
+}
+export function createInstantiator(options: {
+    imports: Imports;
+}, swift: any): Promise<{
+    addImports: (importObject: WebAssembly.Imports) => void;
+    setInstance: (instance: WebAssembly.Instance) => void;
+    createExports: (instance: WebAssembly.Instance) => Exports;
+}>;
\ No newline at end of file
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/AliasInClosure.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/AliasInClosure.js
new file mode 100644
index 000000000..fa9095cd8
--- /dev/null
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/AliasInClosure.js
@@ -0,0 +1,382 @@
+// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit,
+// DO NOT EDIT.
+//
+// To update this file, just rebuild your project or run
+// `swift package bridge-js`.
+
+export async function createInstantiator(options, swift) {
+    let instance;
+    let memory;
+    let setException;
+    let decodeString;
+    const textDecoder = new TextDecoder("utf-8");
+    const textEncoder = new TextEncoder("utf-8");
+    let tmpRetString;
+    let tmpRetBytes;
+    let tmpRetException;
+    let tmpRetOptionalBool;
+    let tmpRetOptionalInt;
+    let tmpRetOptionalFloat;
+    let tmpRetOptionalDouble;
+    let tmpRetOptionalHeapObject;
+    let strStack = [];
+    let i32Stack = [];
+    let i64Stack = [];
+    let f32Stack = [];
+    let f64Stack = [];
+    let ptrStack = [];
+    let taStack = [];
+    const enumHelpers = {};
+    const structHelpers = {};
+
+    let _exports = null;
+    let bjs = null;
+    const swiftClosureRegistry = (typeof FinalizationRegistry === "undefined") ? { register: () => {}, unregister: () => {} } : new FinalizationRegistry((state) => {
+        if (state.unregistered) { return; }
+        instance?.exports?.bjs_release_swift_closure(state.pointer);
+    });
+    const makeClosure = (pointer, file, line, func) => {
+        const state = { pointer, file, line, unregistered: false };
+        const real = (...args) => {
+            if (state.unregistered) {
+                const bytes = new Uint8Array(memory.buffer, state.file >>> 0);
+                let length = 0;
+                while (bytes[length] !== 0) { length += 1; }
+                const fileID = decodeString(state.file, length);
+                throw new Error(`Attempted to call a released JSTypedClosure created at ${fileID}:${state.line}`);
+            }
+            return func(...args);
+        };
+        real.__unregister = () => {
+            if (state.unregistered) { return; }
+            state.unregistered = true;
+            swiftClosureRegistry.unregister(state);
+        };
+        swiftClosureRegistry.register(real, state, state);
+        return swift.memory.retain(real);
+    };
+
+
+    return {
+        /**
+         * @param {WebAssembly.Imports} importObject
+         */
+        addImports: (importObject, importsContext) => {
+            bjs = {};
+            importObject["bjs"] = bjs;
+            bjs["swift_js_return_string"] = function(ptr, len) {
+                tmpRetString = decodeString(ptr, len);
+            }
+            bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) {
+                const source = swift.memory.getObject(sourceId);
+                swift.memory.release(sourceId);
+                const bytes = new Uint8Array(memory.buffer, bytesPtr >>> 0);
+                bytes.set(source);
+            }
+            bjs["swift_js_make_js_string"] = function(ptr, len) {
+                return swift.memory.retain(decodeString(ptr, len));
+            }
+            bjs["swift_js_init_memory_with_result"] = function(ptr, len) {
+                const target = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0);
+                target.set(tmpRetBytes);
+                tmpRetBytes = undefined;
+            }
+            bjs["swift_js_throw"] = function(id) {
+                tmpRetException = swift.memory.retainByRef(id);
+            }
+            bjs["swift_js_retain"] = function(id) {
+                return swift.memory.retainByRef(id);
+            }
+            bjs["swift_js_release"] = function(id) {
+                swift.memory.release(id);
+            }
+            bjs["swift_js_push_i32"] = function(v) {
+                i32Stack.push(v | 0);
+            }
+            bjs["swift_js_push_f32"] = function(v) {
+                f32Stack.push(Math.fround(v));
+            }
+            bjs["swift_js_push_f64"] = function(v) {
+                f64Stack.push(v);
+            }
+            bjs["swift_js_push_string"] = function(ptr, len) {
+                const value = decodeString(ptr, len);
+                strStack.push(value);
+            }
+            bjs["swift_js_pop_i32"] = function() {
+                return i32Stack.pop();
+            }
+            bjs["swift_js_pop_f32"] = function() {
+                return f32Stack.pop();
+            }
+            bjs["swift_js_pop_f64"] = function() {
+                return f64Stack.pop();
+            }
+            bjs["swift_js_push_pointer"] = function(pointer) {
+                ptrStack.push(pointer);
+            }
+            bjs["swift_js_pop_pointer"] = function() {
+                return ptrStack.pop();
+            }
+            bjs["swift_js_push_i64"] = function(v) {
+                i64Stack.push(v);
+            }
+            bjs["swift_js_pop_i64"] = function() {
+                return i64Stack.pop();
+            }
+            const taCtors = [Int8Array, Uint8Array, Int16Array, Uint16Array, Int32Array, Uint32Array, Float32Array, Float64Array];
+            bjs["swift_js_push_typed_array"] = function(kind, ptr, count) {
+                const Ctor = taCtors[kind];
+                const byteLen = count * Ctor.BYTES_PER_ELEMENT;
+                const copy = memory.buffer.slice(ptr, ptr + byteLen);
+                taStack.push(Array.from(new Ctor(copy)));
+            }
+            bjs["bjs_core_register_type_handles"] = function() {};
+            bjs["bjs_TestModule_register_type_handles"] = function() {};
+            const __bjs_promiseSettlers = Symbol("JavaScriptKit.promiseSettlers");
+            bjs["swift_js_make_promise"] = function() {
+                let resolve, reject;
+                const promise = new Promise((res, rej) => { resolve = res; reject = rej; });
+                promise[__bjs_promiseSettlers] = { resolve, reject };
+                return swift.memory.retain(promise);
+            }
+            bjs["swift_js_return_optional_bool"] = function(isSome, value) {
+                if (isSome === 0) {
+                    tmpRetOptionalBool = null;
+                } else {
+                    tmpRetOptionalBool = value !== 0;
+                }
+            }
+            bjs["swift_js_return_optional_int"] = function(isSome, value) {
+                if (isSome === 0) {
+                    tmpRetOptionalInt = null;
+                } else {
+                    tmpRetOptionalInt = value | 0;
+                }
+            }
+            bjs["swift_js_return_optional_float"] = function(isSome, value) {
+                if (isSome === 0) {
+                    tmpRetOptionalFloat = null;
+                } else {
+                    tmpRetOptionalFloat = Math.fround(value);
+                }
+            }
+            bjs["swift_js_return_optional_double"] = function(isSome, value) {
+                if (isSome === 0) {
+                    tmpRetOptionalDouble = null;
+                } else {
+                    tmpRetOptionalDouble = value;
+                }
+            }
+            bjs["swift_js_return_optional_string"] = function(isSome, ptr, len) {
+                if (isSome === 0) {
+                    tmpRetString = null;
+                } else {
+                    tmpRetString = decodeString(ptr, len);
+                }
+            }
+            bjs["swift_js_return_optional_object"] = function(isSome, objectId) {
+                if (isSome === 0) {
+                    tmpRetString = null;
+                } else {
+                    tmpRetString = swift.memory.getObject(objectId);
+                }
+            }
+            bjs["swift_js_return_optional_heap_object"] = function(isSome, pointer) {
+                if (isSome === 0) {
+                    tmpRetOptionalHeapObject = null;
+                } else {
+                    tmpRetOptionalHeapObject = pointer;
+                }
+            }
+            bjs["swift_js_get_optional_int_presence"] = function() {
+                return tmpRetOptionalInt != null ? 1 : 0;
+            }
+            bjs["swift_js_get_optional_int_value"] = function() {
+                const value = tmpRetOptionalInt;
+                tmpRetOptionalInt = undefined;
+                return value;
+            }
+            bjs["swift_js_get_optional_string"] = function() {
+                const str = tmpRetString;
+                tmpRetString = undefined;
+                if (str == null) {
+                    return -1;
+                } else {
+                    const bytes = textEncoder.encode(str);
+                    tmpRetBytes = bytes;
+                    return bytes.length;
+                }
+            }
+            bjs["swift_js_get_optional_float_presence"] = function() {
+                return tmpRetOptionalFloat != null ? 1 : 0;
+            }
+            bjs["swift_js_get_optional_float_value"] = function() {
+                const value = tmpRetOptionalFloat;
+                tmpRetOptionalFloat = undefined;
+                return value;
+            }
+            bjs["swift_js_get_optional_double_presence"] = function() {
+                return tmpRetOptionalDouble != null ? 1 : 0;
+            }
+            bjs["swift_js_get_optional_double_value"] = function() {
+                const value = tmpRetOptionalDouble;
+                tmpRetOptionalDouble = undefined;
+                return value;
+            }
+            bjs["swift_js_get_optional_heap_object_pointer"] = function() {
+                const pointer = tmpRetOptionalHeapObject;
+                tmpRetOptionalHeapObject = undefined;
+                return pointer || 0;
+            }
+            bjs["swift_js_closure_unregister"] = function(funcRef) {}
+            bjs["swift_js_closure_unregister"] = function(funcRef) {
+                const func = swift.memory.getObject(funcRef);
+                func.__unregister();
+            }
+            bjs["invoke_js_callback_TestModule_10TestModuleAl7Polygon_Si"] = function(callbackId, param0) {
+                try {
+                    const callback = swift.memory.getObject(callbackId);
+                    let ret = callback(_exports['PolygonReference'].__construct(param0));
+                    return ret;
+                } catch (error) {
+                    setException(error);
+                    return 0
+                }
+            }
+            bjs["make_swift_closure_TestModule_10TestModuleAl7Polygon_Si"] = function(boxPtr, file, line) {
+                const lower_closure_TestModule_10TestModuleAl7Polygon_Si = function(param0) {
+                    const ret = instance.exports.invoke_swift_closure_TestModule_10TestModuleAl7Polygon_Si(boxPtr, param0.pointer);
+                    if (tmpRetException) {
+                        const error = swift.memory.getObject(tmpRetException);
+                        swift.memory.release(tmpRetException);
+                        tmpRetException = undefined;
+                        throw error;
+                    }
+                    return ret;
+                };
+                return makeClosure(boxPtr, file, line, lower_closure_TestModule_10TestModuleAl7Polygon_Si);
+            }
+            bjs["invoke_js_callback_TestModule_10TestModuley_Al7Polygon"] = function(callbackId) {
+                try {
+                    const callback = swift.memory.getObject(callbackId);
+                    let ret = callback();
+                    return ret.pointer;
+                } catch (error) {
+                    setException(error);
+                    return 0
+                }
+            }
+            bjs["make_swift_closure_TestModule_10TestModuley_Al7Polygon"] = function(boxPtr, file, line) {
+                const lower_closure_TestModule_10TestModuley_Al7Polygon = function() {
+                    const ret = instance.exports.invoke_swift_closure_TestModule_10TestModuley_Al7Polygon(boxPtr);
+                    if (tmpRetException) {
+                        const error = swift.memory.getObject(tmpRetException);
+                        swift.memory.release(tmpRetException);
+                        tmpRetException = undefined;
+                        throw error;
+                    }
+                    return _exports['PolygonReference'].__construct(ret);
+                };
+                return makeClosure(boxPtr, file, line, lower_closure_TestModule_10TestModuley_Al7Polygon);
+            }
+            // Wrapper functions for module: TestModule
+            if (!importObject["TestModule"]) {
+                importObject["TestModule"] = {};
+            }
+            importObject["TestModule"]["bjs_PolygonReference_wrap"] = function(pointer) {
+                const obj = _exports['PolygonReference'].__construct(pointer);
+                return swift.memory.retain(obj);
+            };
+        },
+        setInstance: (i) => {
+            instance = i;
+            memory = instance.exports.memory;
+
+            decodeString = (ptr, len) => { const bytes = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); return textDecoder.decode(bytes); }
+
+            setException = (error) => {
+                instance.exports._swift_js_exception.value = swift.memory.retain(error)
+            }
+        },
+        /** @param {WebAssembly.Instance} instance */
+        createExports: (instance) => {
+            const js = swift.memory.heap;
+            const swiftHeapObjectFinalizationRegistry = (typeof FinalizationRegistry === "undefined") ? { register: () => {}, unregister: () => {} } : new FinalizationRegistry((state) => {
+                if (state.hasReleased) {
+                    return;
+                }
+                state.hasReleased = true;
+                state.identityMap?.delete(state.pointer);
+                state.deinit(state.pointer);
+            });
+
+            /// Represents a Swift heap object like a class instance or an actor instance.
+            class SwiftHeapObject {
+                static __wrap(pointer, deinit, prototype, identityCache) {
+                    pointer = pointer >>> 0;
+                    const makeFresh = (identityMap) => {
+                        const obj = Object.create(prototype);
+                        const state = { pointer, deinit, hasReleased: false, identityMap };
+                        obj.pointer = pointer;
+                        obj.__swiftHeapObjectState = state;
+                        swiftHeapObjectFinalizationRegistry.register(obj, state, state);
+                        if (identityMap) {
+                            identityMap.set(pointer, new WeakRef(obj));
+                        }
+                        return obj;
+                    };
+
+                    if (!identityCache) {
+                        return makeFresh(null);
+                    }
+
+                    const cached = identityCache.get(pointer)?.deref();
+                    if (cached && !cached.__swiftHeapObjectState.hasReleased) {
+                        deinit(pointer);
+                        return cached;
+                    }
+                    if (identityCache.has(pointer)) {
+                        identityCache.delete(pointer);
+                    }
+
+                    return makeFresh(identityCache);
+                }
+
+                release() {
+                    const state = this.__swiftHeapObjectState;
+                    if (state.hasReleased) {
+                        return;
+                    }
+                    state.hasReleased = true;
+                    swiftHeapObjectFinalizationRegistry.unregister(state);
+                    state.identityMap?.delete(state.pointer);
+                    state.deinit(state.pointer);
+                }
+            }
+            class PolygonReference extends SwiftHeapObject {
+                static __construct(ptr) {
+                    return SwiftHeapObject.__wrap(ptr, instance.exports.bjs_PolygonReference_deinit, PolygonReference.prototype, null);
+                }
+
+                constructor(sides) {
+                    const ret = instance.exports.bjs_PolygonReference_init(sides);
+                    return PolygonReference.__construct(ret);
+                }
+            }
+            const exports = {
+                makePolygonFactory: function bjs_makePolygonFactory() {
+                    const ret = instance.exports.bjs_makePolygonFactory();
+                    return swift.memory.getObject(ret);
+                },
+                makePolygonInspector: function bjs_makePolygonInspector() {
+                    const ret = instance.exports.bjs_makePolygonInspector();
+                    return swift.memory.getObject(ret);
+                },
+                PolygonReference,
+            };
+            _exports = exports;
+            return exports;
+        },
+    }
+}
\ No newline at end of file
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ArrayTypes.d.ts b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ArrayTypes.d.ts
index 255249eef..f48189956 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ArrayTypes.d.ts
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ArrayTypes.d.ts
@@ -41,11 +41,6 @@ export interface MultiArrayContainer extends SwiftHeapObject {
     readonly strings: string[];
 }
 export type Exports = {
-    Item: {
-    }
-    MultiArrayContainer: {
-        new(nums: number[], strs: string[]): MultiArrayContainer;
-    }
     processIntArray(values: number[]): number[];
     processStringArray(values: string[]): string[];
     processDoubleArray(values: number[]): number[];
@@ -76,6 +71,11 @@ export type Exports = {
     multiOptionalArrayParams(a: number[] | null, b: string[] | null): number;
     Direction: DirectionObject
     Status: StatusObject
+    Item: {
+    },
+    MultiArrayContainer: {
+        new(nums: number[], strs: string[]): MultiArrayContainer;
+    },
 }
 export type Imports = {
     checkArray(a: any): void;
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ArrayTypes.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ArrayTypes.js
index ad0111929..6d3992ce5 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ArrayTypes.js
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ArrayTypes.js
@@ -44,7 +44,438 @@ export async function createInstantiator(options, swift) {
 
     let _exports = null;
     let bjs = null;
-    const __bjs_createPointHelpers = () => ({
+    const __bjs_arrayCodecCache = new WeakMap();
+    function __bjs_arrayCodec(elementCodec) {
+        let codec = __bjs_arrayCodecCache.get(elementCodec);
+        if (codec !== undefined) {
+            return codec;
+        }
+        codec = {
+            lower(value) {
+                for (let i = 0; i < value.length; i++) {
+                    elementCodec.lower(value[i]);
+                }
+                i32Stack.push(value.length);
+            },
+            lift() {
+                const count = i32Stack.pop();
+                if (count === -1) {
+                    return taStack.pop();
+                }
+                const result = new Array(count);
+                for (let i = count - 1; i >= 0; i--) {
+                    result[i] = elementCodec.lift();
+                }
+                return result;
+            },
+        };
+        __bjs_arrayCodecCache.set(elementCodec, codec);
+        return codec;
+    }
+    const __bjs_optionalCodecCache = new WeakMap();
+    const __bjs_optionalCodecUndefinedOrCache = new WeakMap();
+    function __bjs_optionalCodec(elementCodec, isUndefinedOr = false) {
+        const cache = isUndefinedOr ? __bjs_optionalCodecUndefinedOrCache : __bjs_optionalCodecCache;
+        let codec = cache.get(elementCodec);
+        if (codec !== undefined) {
+            return codec;
+        }
+        codec = {
+            lower(value) {
+                const isSome = isUndefinedOr ? value !== undefined : value != null;
+                if (isSome) {
+                    elementCodec.lower(value);
+                    i32Stack.push(1);
+                } else {
+                    i32Stack.push(0);
+                }
+            },
+            lift() {
+                if (i32Stack.pop() === 0) {
+                    return isUndefinedOr ? undefined : null;
+                }
+                return elementCodec.lift();
+            },
+        };
+        cache.set(elementCodec, codec);
+        return codec;
+    }
+    const __bjs_dictCodecCache = new WeakMap();
+    function __bjs_dictCodec(valueCodec) {
+        let codec = __bjs_dictCodecCache.get(valueCodec);
+        if (codec !== undefined) {
+            return codec;
+        }
+        codec = {
+            lower(value) {
+                const keys = Object.keys(value);
+                for (let i = 0; i < keys.length; i++) {
+                    __bjs_stringCodec.lower(keys[i]);
+                    valueCodec.lower(value[keys[i]]);
+                }
+                i32Stack.push(keys.length);
+            },
+            lift() {
+                const count = i32Stack.pop();
+                const result = {};
+                for (let i = 0; i < count; i++) {
+                    const value = valueCodec.lift();
+                    const key = __bjs_stringCodec.lift();
+                    result[key] = value;
+                }
+                return result;
+            },
+        };
+        __bjs_dictCodecCache.set(valueCodec, codec);
+        return codec;
+    }
+
+    const __bjs_stringCodec = {
+        lower: (v) => {
+            const bytes = textEncoder.encode(v);
+            const id = swift.memory.retain(bytes);
+            i32Stack.push(bytes.length);
+            i32Stack.push(id);
+        },
+        lift: () => {
+            const string = strStack.pop();
+            return string;
+        },
+    };
+    const __bjs_primitiveCodecs = {
+        Bool: {
+            lower: (v) => {
+                i32Stack.push(v ? 1 : 0);
+            },
+            lift: () => {
+                const bool = i32Stack.pop() !== 0;
+                return bool;
+            },
+        },
+        Int: {
+            lower: (v) => {
+                i32Stack.push((v | 0));
+            },
+            lift: () => {
+                const int = i32Stack.pop();
+                return int;
+            },
+        },
+        Int8: {
+            lower: (v) => {
+                i32Stack.push((v | 0));
+            },
+            lift: () => {
+                const int = i32Stack.pop();
+                return int;
+            },
+        },
+        UInt8: {
+            lower: (v) => {
+                i32Stack.push((v | 0));
+            },
+            lift: () => {
+                const int = i32Stack.pop() >>> 0;
+                return int;
+            },
+        },
+        Int16: {
+            lower: (v) => {
+                i32Stack.push((v | 0));
+            },
+            lift: () => {
+                const int = i32Stack.pop();
+                return int;
+            },
+        },
+        UInt16: {
+            lower: (v) => {
+                i32Stack.push((v | 0));
+            },
+            lift: () => {
+                const int = i32Stack.pop() >>> 0;
+                return int;
+            },
+        },
+        Int32: {
+            lower: (v) => {
+                i32Stack.push((v | 0));
+            },
+            lift: () => {
+                const int = i32Stack.pop();
+                return int;
+            },
+        },
+        UInt32: {
+            lower: (v) => {
+                i32Stack.push((v | 0));
+            },
+            lift: () => {
+                const int = i32Stack.pop() >>> 0;
+                return int;
+            },
+        },
+        UInt: {
+            lower: (v) => {
+                i32Stack.push((v | 0));
+            },
+            lift: () => {
+                const int = i32Stack.pop() >>> 0;
+                return int;
+            },
+        },
+        Int64: {
+            lower: (v) => {
+                i64Stack.push(v);
+            },
+            lift: () => {
+                const int = i64Stack.pop();
+                return int;
+            },
+        },
+        UInt64: {
+            lower: (v) => {
+                i64Stack.push(v);
+            },
+            lift: () => {
+                const int = i64Stack.pop();
+                return int;
+            },
+        },
+        Float: {
+            lower: (v) => {
+                f32Stack.push(Math.fround(v));
+            },
+            lift: () => {
+                const f32 = f32Stack.pop();
+                return f32;
+            },
+        },
+        Double: {
+            lower: (v) => {
+                f64Stack.push(v);
+            },
+            lift: () => {
+                const f64 = f64Stack.pop();
+                return f64;
+            },
+        },
+        String: __bjs_stringCodec,
+        JSValue: {
+            lower: (v) => {
+                const [vKind, vPayload1, vPayload2] = __bjs_jsValueLower(v);
+                i32Stack.push(vKind);
+                i32Stack.push(vPayload1);
+                f64Stack.push(vPayload2);
+            },
+            lift: () => {
+                const jsValuePayload2 = f64Stack.pop();
+                const jsValuePayload1 = i32Stack.pop();
+                const jsValueKind = i32Stack.pop();
+                const jsValue = __bjs_jsValueLift(jsValueKind, jsValuePayload1, jsValuePayload2);
+                return jsValue;
+            },
+        },
+    };
+
+    function __bjs_jsValueLower(value) {
+        let kind;
+        let payload1;
+        let payload2;
+        if (value === null) {
+            kind = 4;
+            payload1 = 0;
+            payload2 = 0;
+        } else {
+            switch (typeof value) {
+                case "boolean":
+                    kind = 0;
+                    payload1 = value ? 1 : 0;
+                    payload2 = 0;
+                    break;
+                case "number":
+                    kind = 2;
+                    payload1 = 0;
+                    payload2 = value;
+                    break;
+                case "string":
+                    kind = 1;
+                    payload1 = swift.memory.retain(value);
+                    payload2 = 0;
+                    break;
+                case "undefined":
+                    kind = 5;
+                    payload1 = 0;
+                    payload2 = 0;
+                    break;
+                case "object":
+                    kind = 3;
+                    payload1 = swift.memory.retain(value);
+                    payload2 = 0;
+                    break;
+                case "function":
+                    kind = 3;
+                    payload1 = swift.memory.retain(value);
+                    payload2 = 0;
+                    break;
+                case "symbol":
+                    kind = 7;
+                    payload1 = swift.memory.retain(value);
+                    payload2 = 0;
+                    break;
+                case "bigint":
+                    kind = 8;
+                    payload1 = swift.memory.retain(value);
+                    payload2 = 0;
+                    break;
+                default:
+                    throw new TypeError("Unsupported JSValue type");
+            }
+        }
+        return [kind, payload1, payload2];
+    }
+    function __bjs_jsValueLift(kind, payload1, payload2) {
+        let jsValue;
+        switch (kind) {
+            case 0:
+                jsValue = payload1 !== 0;
+                break;
+            case 1:
+                jsValue = swift.memory.getObject(payload1);
+                break;
+            case 2:
+                jsValue = payload2;
+                break;
+            case 3:
+                jsValue = swift.memory.getObject(payload1);
+                break;
+            case 4:
+                jsValue = null;
+                break;
+            case 5:
+                jsValue = undefined;
+                break;
+            case 7:
+                jsValue = swift.memory.getObject(payload1);
+                break;
+            case 8:
+                jsValue = swift.memory.getObject(payload1);
+                break;
+            default:
+                throw new TypeError("Unsupported JSValue kind " + kind);
+        }
+        return jsValue;
+    }
+
+    const __bjs_codec_Array_Int = __bjs_arrayCodec(__bjs_primitiveCodecs.Int);
+    const __bjs_codec_Array_String = __bjs_arrayCodec(__bjs_stringCodec);
+    const __bjs_codec_Array_Double = __bjs_arrayCodec(__bjs_primitiveCodecs.Double);
+    const __bjs_codec_Array_Bool = __bjs_arrayCodec(__bjs_primitiveCodecs.Bool);
+    const __bjs_codec_M10TestModuleT5Point = {
+        lower: (v) => {
+            structHelpers.M10TestModuleT5Point.lower(v);
+        },
+        lift: () => {
+            const struct = structHelpers.M10TestModuleT5Point.lift();
+            return struct;
+        },
+    };
+    const __bjs_codec_Array_M10TestModuleT5Point = __bjs_arrayCodec(__bjs_codec_M10TestModuleT5Point);
+    const __bjs_codec_M10TestModuleT9Direction = {
+        lower: (v) => {
+            i32Stack.push((v | 0));
+        },
+        lift: () => {
+            const caseId = i32Stack.pop();
+            return caseId;
+        },
+    };
+    const __bjs_codec_Array_M10TestModuleT9Direction = __bjs_arrayCodec(__bjs_codec_M10TestModuleT9Direction);
+    const __bjs_codec_M10TestModuleT6Status = {
+        lower: (v) => {
+            i32Stack.push((v | 0));
+        },
+        lift: () => {
+            const rawValue = i32Stack.pop();
+            return rawValue;
+        },
+    };
+    const __bjs_codec_Array_M10TestModuleT6Status = __bjs_arrayCodec(__bjs_codec_M10TestModuleT6Status);
+    const __bjs_codec_Surp = {
+        lower: (v) => {
+            ptrStack.push((v | 0));
+        },
+        lift: () => {
+            const pointer = ptrStack.pop();
+            return pointer;
+        },
+    };
+    const __bjs_codec_Array_Surp = __bjs_arrayCodec(__bjs_codec_Surp);
+    const __bjs_codec_Sumrp = {
+        lower: (v) => {
+            ptrStack.push((v | 0));
+        },
+        lift: () => {
+            const pointer = ptrStack.pop();
+            return pointer;
+        },
+    };
+    const __bjs_codec_Array_Sumrp = __bjs_arrayCodec(__bjs_codec_Sumrp);
+    const __bjs_codec_Sop = {
+        lower: (v) => {
+            ptrStack.push((v | 0));
+        },
+        lift: () => {
+            const pointer = ptrStack.pop();
+            return pointer;
+        },
+    };
+    const __bjs_codec_Array_Sop = __bjs_arrayCodec(__bjs_codec_Sop);
+    const __bjs_codec_Optional_Int = __bjs_optionalCodec(__bjs_primitiveCodecs.Int);
+    const __bjs_codec_Array_Optional_Int = __bjs_arrayCodec(__bjs_codec_Optional_Int);
+    const __bjs_codec_Optional_String = __bjs_optionalCodec(__bjs_stringCodec);
+    const __bjs_codec_Array_Optional_String = __bjs_arrayCodec(__bjs_codec_Optional_String);
+    const __bjs_codec_Optional_Array_Int = __bjs_optionalCodec(__bjs_codec_Array_Int);
+    const __bjs_codec_Optional_M10TestModuleT5Point = __bjs_optionalCodec(__bjs_codec_M10TestModuleT5Point);
+    const __bjs_codec_Array_Optional_M10TestModuleT5Point = __bjs_arrayCodec(__bjs_codec_Optional_M10TestModuleT5Point);
+    const __bjs_codec_Optional_M10TestModuleT9Direction = __bjs_optionalCodec(__bjs_codec_M10TestModuleT9Direction);
+    const __bjs_codec_Array_Optional_M10TestModuleT9Direction = __bjs_arrayCodec(__bjs_codec_Optional_M10TestModuleT9Direction);
+    const __bjs_codec_Optional_M10TestModuleT6Status = __bjs_optionalCodec(__bjs_codec_M10TestModuleT6Status);
+    const __bjs_codec_Array_Optional_M10TestModuleT6Status = __bjs_arrayCodec(__bjs_codec_Optional_M10TestModuleT6Status);
+    const __bjs_codec_Array_Array_Int = __bjs_arrayCodec(__bjs_codec_Array_Int);
+    const __bjs_codec_Array_Array_String = __bjs_arrayCodec(__bjs_codec_Array_String);
+    const __bjs_codec_Array_Array_M10TestModuleT5Point = __bjs_arrayCodec(__bjs_codec_Array_M10TestModuleT5Point);
+    const __bjs_codec_M10TestModuleT4Item = {
+        lower: (v) => {
+            ptrStack.push(v.pointer);
+        },
+        lift: () => {
+            const ptr = ptrStack.pop();
+            const obj = _exports['Item'].__construct(ptr);
+            return obj;
+        },
+    };
+    const __bjs_codec_Array_M10TestModuleT4Item = __bjs_arrayCodec(__bjs_codec_M10TestModuleT4Item);
+    const __bjs_codec_Array_Array_M10TestModuleT4Item = __bjs_arrayCodec(__bjs_codec_Array_M10TestModuleT4Item);
+    const __bjs_codec_JSObject = {
+        lower: (v) => {
+            const objId = swift.memory.retain(v);
+            i32Stack.push(objId);
+        },
+        lift: () => {
+            const objId = i32Stack.pop();
+            const obj = swift.memory.getObject(objId);
+            swift.memory.release(objId);
+            return obj;
+        },
+    };
+    const __bjs_codec_Array_JSObject = __bjs_arrayCodec(__bjs_codec_JSObject);
+    const __bjs_codec_Optional_JSObject = __bjs_optionalCodec(__bjs_codec_JSObject);
+    const __bjs_codec_Array_Optional_JSObject = __bjs_arrayCodec(__bjs_codec_Optional_JSObject);
+    const __bjs_codec_Array_Array_JSObject = __bjs_arrayCodec(__bjs_codec_Array_JSObject);
+    const __bjs_codec_Optional_Array_String = __bjs_optionalCodec(__bjs_codec_Array_String);
+
+    const __bjs_createStructHelpers_M10TestModuleT5Point = () => ({
         lower: (value) => {
             f64Stack.push(value.x);
             f64Stack.push(value.y);
@@ -70,14 +501,14 @@ export async function createInstantiator(options, swift) {
             bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) {
                 const source = swift.memory.getObject(sourceId);
                 swift.memory.release(sourceId);
-                const bytes = new Uint8Array(memory.buffer, bytesPtr);
+                const bytes = new Uint8Array(memory.buffer, bytesPtr >>> 0);
                 bytes.set(source);
             }
             bjs["swift_js_make_js_string"] = function(ptr, len) {
                 return swift.memory.retain(decodeString(ptr, len));
             }
             bjs["swift_js_init_memory_with_result"] = function(ptr, len) {
-                const target = new Uint8Array(memory.buffer, ptr, len);
+                const target = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0);
                 target.set(tmpRetBytes);
                 tmpRetBytes = undefined;
             }
@@ -132,12 +563,21 @@ export async function createInstantiator(options, swift) {
                 taStack.push(Array.from(new Ctor(copy)));
             }
             bjs["swift_js_struct_lower_Point"] = function(objectId) {
-                structHelpers.Point.lower(swift.memory.getObject(objectId));
+                structHelpers.M10TestModuleT5Point.lower(swift.memory.getObject(objectId));
             }
             bjs["swift_js_struct_lift_Point"] = function() {
-                const value = structHelpers.Point.lift();
+                const value = structHelpers.M10TestModuleT5Point.lift();
                 return swift.memory.retain(value);
             }
+            bjs["bjs_core_register_type_handles"] = function() {};
+            bjs["bjs_TestModule_register_type_handles"] = function() {};
+            const __bjs_promiseSettlers = Symbol("JavaScriptKit.promiseSettlers");
+            bjs["swift_js_make_promise"] = function() {
+                let resolve, reject;
+                const promise = new Promise((res, rej) => { resolve = res; reject = rej; });
+                promise[__bjs_promiseSettlers] = { resolve, reject };
+                return swift.memory.retain(promise);
+            }
             bjs["swift_js_return_optional_bool"] = function(isSome, value) {
                 if (isSome === 0) {
                     tmpRetOptionalBool = null;
@@ -257,18 +697,7 @@ export async function createInstantiator(options, swift) {
             }
             TestModule["bjs_importProcessNumbers"] = function bjs_importProcessNumbers() {
                 try {
-                    const arrayLen = i32Stack.pop();
-                    let arrayResult;
-                    if (arrayLen === -1) {
-                        arrayResult = taStack.pop();
-                    } else {
-                        arrayResult = [];
-                        for (let i = 0; i < arrayLen; i++) {
-                            const f64 = f64Stack.pop();
-                            arrayResult.push(f64);
-                        }
-                        arrayResult.reverse();
-                    }
+                    const arrayResult = __bjs_codec_Array_Double.lift();
                     imports.importProcessNumbers(arrayResult);
                 } catch (error) {
                     setException(error);
@@ -277,82 +706,34 @@ export async function createInstantiator(options, swift) {
             TestModule["bjs_importGetNumbers"] = function bjs_importGetNumbers() {
                 try {
                     let ret = imports.importGetNumbers();
-                    for (const elem of ret) {
-                        f64Stack.push(elem);
-                    }
-                    i32Stack.push(ret.length);
+                    __bjs_codec_Array_Double.lower(ret);
                 } catch (error) {
                     setException(error);
                 }
             }
             TestModule["bjs_importTransformNumbers"] = function bjs_importTransformNumbers() {
                 try {
-                    const arrayLen = i32Stack.pop();
-                    let arrayResult;
-                    if (arrayLen === -1) {
-                        arrayResult = taStack.pop();
-                    } else {
-                        arrayResult = [];
-                        for (let i = 0; i < arrayLen; i++) {
-                            const f64 = f64Stack.pop();
-                            arrayResult.push(f64);
-                        }
-                        arrayResult.reverse();
-                    }
+                    const arrayResult = __bjs_codec_Array_Double.lift();
                     let ret = imports.importTransformNumbers(arrayResult);
-                    for (const elem of ret) {
-                        f64Stack.push(elem);
-                    }
-                    i32Stack.push(ret.length);
+                    __bjs_codec_Array_Double.lower(ret);
                 } catch (error) {
                     setException(error);
                 }
             }
             TestModule["bjs_importProcessStrings"] = function bjs_importProcessStrings() {
                 try {
-                    const arrayLen = i32Stack.pop();
-                    let arrayResult;
-                    if (arrayLen === -1) {
-                        arrayResult = taStack.pop();
-                    } else {
-                        arrayResult = [];
-                        for (let i = 0; i < arrayLen; i++) {
-                            const string = strStack.pop();
-                            arrayResult.push(string);
-                        }
-                        arrayResult.reverse();
-                    }
+                    const arrayResult = __bjs_codec_Array_String.lift();
                     let ret = imports.importProcessStrings(arrayResult);
-                    for (const elem of ret) {
-                        const bytes = textEncoder.encode(elem);
-                        const id = swift.memory.retain(bytes);
-                        i32Stack.push(bytes.length);
-                        i32Stack.push(id);
-                    }
-                    i32Stack.push(ret.length);
+                    __bjs_codec_Array_String.lower(ret);
                 } catch (error) {
                     setException(error);
                 }
             }
             TestModule["bjs_importProcessBooleans"] = function bjs_importProcessBooleans() {
                 try {
-                    const arrayLen = i32Stack.pop();
-                    let arrayResult;
-                    if (arrayLen === -1) {
-                        arrayResult = taStack.pop();
-                    } else {
-                        arrayResult = [];
-                        for (let i = 0; i < arrayLen; i++) {
-                            const bool = i32Stack.pop() !== 0;
-                            arrayResult.push(bool);
-                        }
-                        arrayResult.reverse();
-                    }
+                    const arrayResult = __bjs_codec_Array_Bool.lift();
                     let ret = imports.importProcessBooleans(arrayResult);
-                    for (const elem of ret) {
-                        i32Stack.push(elem ? 1 : 0);
-                    }
-                    i32Stack.push(ret.length);
+                    __bjs_codec_Array_Bool.lower(ret);
                 } catch (error) {
                     setException(error);
                 }
@@ -383,6 +764,7 @@ export async function createInstantiator(options, swift) {
             /// Represents a Swift heap object like a class instance or an actor instance.
             class SwiftHeapObject {
                 static __wrap(pointer, deinit, prototype, identityCache) {
+                    pointer = pointer >>> 0;
                     const makeFresh = (identityMap) => {
                         const obj = Object.create(prototype);
                         const state = { pointer, deinit, hasReleased: false, identityMap };
@@ -434,765 +816,199 @@ export async function createInstantiator(options, swift) {
                 }
 
                 constructor(nums, strs) {
-                    for (const elem of nums) {
-                        i32Stack.push((elem | 0));
-                    }
-                    i32Stack.push(nums.length);
-                    for (const elem1 of strs) {
-                        const bytes = textEncoder.encode(elem1);
-                        const id = swift.memory.retain(bytes);
-                        i32Stack.push(bytes.length);
-                        i32Stack.push(id);
-                    }
-                    i32Stack.push(strs.length);
+                    __bjs_codec_Array_Int.lower(nums);
+                    __bjs_codec_Array_String.lower(strs);
                     const ret = instance.exports.bjs_MultiArrayContainer_init();
                     return MultiArrayContainer.__construct(ret);
                 }
                 get numbers() {
                     instance.exports.bjs_MultiArrayContainer_numbers_get(this.pointer);
-                    const arrayLen = i32Stack.pop();
-                    let arrayResult;
-                    if (arrayLen === -1) {
-                        arrayResult = taStack.pop();
-                    } else {
-                        arrayResult = [];
-                        for (let i = 0; i < arrayLen; i++) {
-                            const int = i32Stack.pop();
-                            arrayResult.push(int);
-                        }
-                        arrayResult.reverse();
-                    }
+                    const arrayResult = __bjs_codec_Array_Int.lift();
                     return arrayResult;
                 }
                 get strings() {
                     instance.exports.bjs_MultiArrayContainer_strings_get(this.pointer);
-                    const arrayLen = i32Stack.pop();
-                    let arrayResult;
-                    if (arrayLen === -1) {
-                        arrayResult = taStack.pop();
-                    } else {
-                        arrayResult = [];
-                        for (let i = 0; i < arrayLen; i++) {
-                            const string = strStack.pop();
-                            arrayResult.push(string);
-                        }
-                        arrayResult.reverse();
-                    }
+                    const arrayResult = __bjs_codec_Array_String.lift();
                     return arrayResult;
                 }
             }
-            const PointHelpers = __bjs_createPointHelpers();
-            structHelpers.Point = PointHelpers;
+            const __bjs_helpers_M10TestModuleT5Point = __bjs_createStructHelpers_M10TestModuleT5Point();
+            structHelpers.M10TestModuleT5Point = __bjs_helpers_M10TestModuleT5Point;
 
             const exports = {
-                Item,
-                MultiArrayContainer,
                 processIntArray: function bjs_processIntArray(values) {
-                    for (const elem of values) {
-                        i32Stack.push((elem | 0));
-                    }
-                    i32Stack.push(values.length);
+                    __bjs_codec_Array_Int.lower(values);
                     instance.exports.bjs_processIntArray();
-                    const arrayLen = i32Stack.pop();
-                    let arrayResult;
-                    if (arrayLen === -1) {
-                        arrayResult = taStack.pop();
-                    } else {
-                        arrayResult = [];
-                        for (let i = 0; i < arrayLen; i++) {
-                            const int = i32Stack.pop();
-                            arrayResult.push(int);
-                        }
-                        arrayResult.reverse();
-                    }
+                    const arrayResult = __bjs_codec_Array_Int.lift();
                     return arrayResult;
                 },
                 processStringArray: function bjs_processStringArray(values) {
-                    for (const elem of values) {
-                        const bytes = textEncoder.encode(elem);
-                        const id = swift.memory.retain(bytes);
-                        i32Stack.push(bytes.length);
-                        i32Stack.push(id);
-                    }
-                    i32Stack.push(values.length);
+                    __bjs_codec_Array_String.lower(values);
                     instance.exports.bjs_processStringArray();
-                    const arrayLen = i32Stack.pop();
-                    let arrayResult;
-                    if (arrayLen === -1) {
-                        arrayResult = taStack.pop();
-                    } else {
-                        arrayResult = [];
-                        for (let i = 0; i < arrayLen; i++) {
-                            const string = strStack.pop();
-                            arrayResult.push(string);
-                        }
-                        arrayResult.reverse();
-                    }
+                    const arrayResult = __bjs_codec_Array_String.lift();
                     return arrayResult;
                 },
                 processDoubleArray: function bjs_processDoubleArray(values) {
-                    for (const elem of values) {
-                        f64Stack.push(elem);
-                    }
-                    i32Stack.push(values.length);
+                    __bjs_codec_Array_Double.lower(values);
                     instance.exports.bjs_processDoubleArray();
-                    const arrayLen = i32Stack.pop();
-                    let arrayResult;
-                    if (arrayLen === -1) {
-                        arrayResult = taStack.pop();
-                    } else {
-                        arrayResult = [];
-                        for (let i = 0; i < arrayLen; i++) {
-                            const f64 = f64Stack.pop();
-                            arrayResult.push(f64);
-                        }
-                        arrayResult.reverse();
-                    }
+                    const arrayResult = __bjs_codec_Array_Double.lift();
                     return arrayResult;
                 },
                 processBoolArray: function bjs_processBoolArray(values) {
-                    for (const elem of values) {
-                        i32Stack.push(elem ? 1 : 0);
-                    }
-                    i32Stack.push(values.length);
+                    __bjs_codec_Array_Bool.lower(values);
                     instance.exports.bjs_processBoolArray();
-                    const arrayLen = i32Stack.pop();
-                    let arrayResult;
-                    if (arrayLen === -1) {
-                        arrayResult = taStack.pop();
-                    } else {
-                        arrayResult = [];
-                        for (let i = 0; i < arrayLen; i++) {
-                            const bool = i32Stack.pop() !== 0;
-                            arrayResult.push(bool);
-                        }
-                        arrayResult.reverse();
-                    }
+                    const arrayResult = __bjs_codec_Array_Bool.lift();
                     return arrayResult;
                 },
                 processPointArray: function bjs_processPointArray(points) {
-                    for (const elem of points) {
-                        structHelpers.Point.lower(elem);
-                    }
-                    i32Stack.push(points.length);
+                    __bjs_codec_Array_M10TestModuleT5Point.lower(points);
                     instance.exports.bjs_processPointArray();
-                    const arrayLen = i32Stack.pop();
-                    let arrayResult;
-                    if (arrayLen === -1) {
-                        arrayResult = taStack.pop();
-                    } else {
-                        arrayResult = [];
-                        for (let i = 0; i < arrayLen; i++) {
-                            const struct = structHelpers.Point.lift();
-                            arrayResult.push(struct);
-                        }
-                        arrayResult.reverse();
-                    }
+                    const arrayResult = __bjs_codec_Array_M10TestModuleT5Point.lift();
                     return arrayResult;
                 },
                 processDirectionArray: function bjs_processDirectionArray(directions) {
-                    for (const elem of directions) {
-                        i32Stack.push((elem | 0));
-                    }
-                    i32Stack.push(directions.length);
+                    __bjs_codec_Array_M10TestModuleT9Direction.lower(directions);
                     instance.exports.bjs_processDirectionArray();
-                    const arrayLen = i32Stack.pop();
-                    let arrayResult;
-                    if (arrayLen === -1) {
-                        arrayResult = taStack.pop();
-                    } else {
-                        arrayResult = [];
-                        for (let i = 0; i < arrayLen; i++) {
-                            const caseId = i32Stack.pop();
-                            arrayResult.push(caseId);
-                        }
-                        arrayResult.reverse();
-                    }
+                    const arrayResult = __bjs_codec_Array_M10TestModuleT9Direction.lift();
                     return arrayResult;
                 },
                 processStatusArray: function bjs_processStatusArray(statuses) {
-                    for (const elem of statuses) {
-                        i32Stack.push((elem | 0));
-                    }
-                    i32Stack.push(statuses.length);
+                    __bjs_codec_Array_M10TestModuleT6Status.lower(statuses);
                     instance.exports.bjs_processStatusArray();
-                    const arrayLen = i32Stack.pop();
-                    let arrayResult;
-                    if (arrayLen === -1) {
-                        arrayResult = taStack.pop();
-                    } else {
-                        arrayResult = [];
-                        for (let i = 0; i < arrayLen; i++) {
-                            const rawValue = i32Stack.pop();
-                            arrayResult.push(rawValue);
-                        }
-                        arrayResult.reverse();
-                    }
+                    const arrayResult = __bjs_codec_Array_M10TestModuleT6Status.lift();
                     return arrayResult;
                 },
                 sumIntArray: function bjs_sumIntArray(values) {
-                    for (const elem of values) {
-                        i32Stack.push((elem | 0));
-                    }
-                    i32Stack.push(values.length);
+                    __bjs_codec_Array_Int.lower(values);
                     const ret = instance.exports.bjs_sumIntArray();
                     return ret;
                 },
                 findFirstPoint: function bjs_findFirstPoint(points, matching) {
-                    for (const elem of points) {
-                        structHelpers.Point.lower(elem);
-                    }
-                    i32Stack.push(points.length);
+                    __bjs_codec_Array_M10TestModuleT5Point.lower(points);
                     const matchingBytes = textEncoder.encode(matching);
                     const matchingId = swift.memory.retain(matchingBytes);
                     instance.exports.bjs_findFirstPoint(matchingId, matchingBytes.length);
-                    const structValue = structHelpers.Point.lift();
+                    const structValue = structHelpers.M10TestModuleT5Point.lift();
                     return structValue;
                 },
                 processUnsafeRawPointerArray: function bjs_processUnsafeRawPointerArray(values) {
-                    for (const elem of values) {
-                        ptrStack.push((elem | 0));
-                    }
-                    i32Stack.push(values.length);
+                    __bjs_codec_Array_Surp.lower(values);
                     instance.exports.bjs_processUnsafeRawPointerArray();
-                    const arrayLen = i32Stack.pop();
-                    let arrayResult;
-                    if (arrayLen === -1) {
-                        arrayResult = taStack.pop();
-                    } else {
-                        arrayResult = [];
-                        for (let i = 0; i < arrayLen; i++) {
-                            const pointer = ptrStack.pop();
-                            arrayResult.push(pointer);
-                        }
-                        arrayResult.reverse();
-                    }
+                    const arrayResult = __bjs_codec_Array_Surp.lift();
                     return arrayResult;
                 },
                 processUnsafeMutableRawPointerArray: function bjs_processUnsafeMutableRawPointerArray(values) {
-                    for (const elem of values) {
-                        ptrStack.push((elem | 0));
-                    }
-                    i32Stack.push(values.length);
+                    __bjs_codec_Array_Sumrp.lower(values);
                     instance.exports.bjs_processUnsafeMutableRawPointerArray();
-                    const arrayLen = i32Stack.pop();
-                    let arrayResult;
-                    if (arrayLen === -1) {
-                        arrayResult = taStack.pop();
-                    } else {
-                        arrayResult = [];
-                        for (let i = 0; i < arrayLen; i++) {
-                            const pointer = ptrStack.pop();
-                            arrayResult.push(pointer);
-                        }
-                        arrayResult.reverse();
-                    }
+                    const arrayResult = __bjs_codec_Array_Sumrp.lift();
                     return arrayResult;
                 },
                 processOpaquePointerArray: function bjs_processOpaquePointerArray(values) {
-                    for (const elem of values) {
-                        ptrStack.push((elem | 0));
-                    }
-                    i32Stack.push(values.length);
+                    __bjs_codec_Array_Sop.lower(values);
                     instance.exports.bjs_processOpaquePointerArray();
-                    const arrayLen = i32Stack.pop();
-                    let arrayResult;
-                    if (arrayLen === -1) {
-                        arrayResult = taStack.pop();
-                    } else {
-                        arrayResult = [];
-                        for (let i = 0; i < arrayLen; i++) {
-                            const pointer = ptrStack.pop();
-                            arrayResult.push(pointer);
-                        }
-                        arrayResult.reverse();
-                    }
+                    const arrayResult = __bjs_codec_Array_Sop.lift();
                     return arrayResult;
                 },
                 processOptionalIntArray: function bjs_processOptionalIntArray(values) {
-                    for (const elem of values) {
-                        const isSome = elem != null ? 1 : 0;
-                        if (isSome) {
-                            i32Stack.push((elem | 0));
-                        }
-                        i32Stack.push(isSome);
-                    }
-                    i32Stack.push(values.length);
+                    __bjs_codec_Array_Optional_Int.lower(values);
                     instance.exports.bjs_processOptionalIntArray();
-                    const arrayLen = i32Stack.pop();
-                    let arrayResult;
-                    if (arrayLen === -1) {
-                        arrayResult = taStack.pop();
-                    } else {
-                        arrayResult = [];
-                        for (let i = 0; i < arrayLen; i++) {
-                            const isSome1 = i32Stack.pop();
-                            let optValue;
-                            if (isSome1 === 0) {
-                                optValue = null;
-                            } else {
-                                const int = i32Stack.pop();
-                                optValue = int;
-                            }
-                            arrayResult.push(optValue);
-                        }
-                        arrayResult.reverse();
-                    }
+                    const arrayResult = __bjs_codec_Array_Optional_Int.lift();
                     return arrayResult;
                 },
                 processOptionalStringArray: function bjs_processOptionalStringArray(values) {
-                    for (const elem of values) {
-                        const isSome = elem != null ? 1 : 0;
-                        if (isSome) {
-                            const bytes = textEncoder.encode(elem);
-                            const id = swift.memory.retain(bytes);
-                            i32Stack.push(bytes.length);
-                            i32Stack.push(id);
-                        }
-                        i32Stack.push(isSome);
-                    }
-                    i32Stack.push(values.length);
+                    __bjs_codec_Array_Optional_String.lower(values);
                     instance.exports.bjs_processOptionalStringArray();
-                    const arrayLen = i32Stack.pop();
-                    let arrayResult;
-                    if (arrayLen === -1) {
-                        arrayResult = taStack.pop();
-                    } else {
-                        arrayResult = [];
-                        for (let i = 0; i < arrayLen; i++) {
-                            const isSome1 = i32Stack.pop();
-                            let optValue;
-                            if (isSome1 === 0) {
-                                optValue = null;
-                            } else {
-                                const string = strStack.pop();
-                                optValue = string;
-                            }
-                            arrayResult.push(optValue);
-                        }
-                        arrayResult.reverse();
-                    }
+                    const arrayResult = __bjs_codec_Array_Optional_String.lift();
                     return arrayResult;
                 },
                 processOptionalArray: function bjs_processOptionalArray(values) {
-                    const isSome = values != null;
-                    if (isSome) {
-                        for (const elem of values) {
-                            i32Stack.push((elem | 0));
-                        }
-                        i32Stack.push(values.length);
-                    }
-                    i32Stack.push(+isSome);
+                    __bjs_codec_Optional_Array_Int.lower(values);
                     instance.exports.bjs_processOptionalArray();
-                    const isSome1 = i32Stack.pop();
-                    let optResult;
-                    if (isSome1) {
-                        const arrayLen = i32Stack.pop();
-                        let arrayResult;
-                        if (arrayLen === -1) {
-                            arrayResult = taStack.pop();
-                        } else {
-                            arrayResult = [];
-                            for (let i = 0; i < arrayLen; i++) {
-                                const int = i32Stack.pop();
-                                arrayResult.push(int);
-                            }
-                            arrayResult.reverse();
-                        }
-                        optResult = arrayResult;
-                    } else {
-                        optResult = null;
-                    }
-                    return optResult;
+                    const optValue = __bjs_codec_Optional_Array_Int.lift();
+                    return optValue;
                 },
                 processOptionalPointArray: function bjs_processOptionalPointArray(points) {
-                    for (const elem of points) {
-                        const isSome = elem != null ? 1 : 0;
-                        if (isSome) {
-                            structHelpers.Point.lower(elem);
-                        }
-                        i32Stack.push(isSome);
-                    }
-                    i32Stack.push(points.length);
+                    __bjs_codec_Array_Optional_M10TestModuleT5Point.lower(points);
                     instance.exports.bjs_processOptionalPointArray();
-                    const arrayLen = i32Stack.pop();
-                    let arrayResult;
-                    if (arrayLen === -1) {
-                        arrayResult = taStack.pop();
-                    } else {
-                        arrayResult = [];
-                        for (let i = 0; i < arrayLen; i++) {
-                            const isSome1 = i32Stack.pop();
-                            let optValue;
-                            if (isSome1 === 0) {
-                                optValue = null;
-                            } else {
-                                const struct = structHelpers.Point.lift();
-                                optValue = struct;
-                            }
-                            arrayResult.push(optValue);
-                        }
-                        arrayResult.reverse();
-                    }
+                    const arrayResult = __bjs_codec_Array_Optional_M10TestModuleT5Point.lift();
                     return arrayResult;
                 },
                 processOptionalDirectionArray: function bjs_processOptionalDirectionArray(directions) {
-                    for (const elem of directions) {
-                        const isSome = elem != null ? 1 : 0;
-                        if (isSome) {
-                            i32Stack.push((elem | 0));
-                        }
-                        i32Stack.push(isSome);
-                    }
-                    i32Stack.push(directions.length);
+                    __bjs_codec_Array_Optional_M10TestModuleT9Direction.lower(directions);
                     instance.exports.bjs_processOptionalDirectionArray();
-                    const arrayLen = i32Stack.pop();
-                    let arrayResult;
-                    if (arrayLen === -1) {
-                        arrayResult = taStack.pop();
-                    } else {
-                        arrayResult = [];
-                        for (let i = 0; i < arrayLen; i++) {
-                            const isSome1 = i32Stack.pop();
-                            let optValue;
-                            if (isSome1 === 0) {
-                                optValue = null;
-                            } else {
-                                const caseId = i32Stack.pop();
-                                optValue = caseId;
-                            }
-                            arrayResult.push(optValue);
-                        }
-                        arrayResult.reverse();
-                    }
+                    const arrayResult = __bjs_codec_Array_Optional_M10TestModuleT9Direction.lift();
                     return arrayResult;
                 },
                 processOptionalStatusArray: function bjs_processOptionalStatusArray(statuses) {
-                    for (const elem of statuses) {
-                        const isSome = elem != null ? 1 : 0;
-                        if (isSome) {
-                            i32Stack.push((elem | 0));
-                        }
-                        i32Stack.push(isSome);
-                    }
-                    i32Stack.push(statuses.length);
+                    __bjs_codec_Array_Optional_M10TestModuleT6Status.lower(statuses);
                     instance.exports.bjs_processOptionalStatusArray();
-                    const arrayLen = i32Stack.pop();
-                    let arrayResult;
-                    if (arrayLen === -1) {
-                        arrayResult = taStack.pop();
-                    } else {
-                        arrayResult = [];
-                        for (let i = 0; i < arrayLen; i++) {
-                            const isSome1 = i32Stack.pop();
-                            let optValue;
-                            if (isSome1 === 0) {
-                                optValue = null;
-                            } else {
-                                const rawValue = i32Stack.pop();
-                                optValue = rawValue;
-                            }
-                            arrayResult.push(optValue);
-                        }
-                        arrayResult.reverse();
-                    }
+                    const arrayResult = __bjs_codec_Array_Optional_M10TestModuleT6Status.lift();
                     return arrayResult;
                 },
                 processNestedIntArray: function bjs_processNestedIntArray(values) {
-                    for (const elem of values) {
-                        for (const elem1 of elem) {
-                            i32Stack.push((elem1 | 0));
-                        }
-                        i32Stack.push(elem.length);
-                    }
-                    i32Stack.push(values.length);
+                    __bjs_codec_Array_Array_Int.lower(values);
                     instance.exports.bjs_processNestedIntArray();
-                    const arrayLen = i32Stack.pop();
-                    let arrayResult;
-                    if (arrayLen === -1) {
-                        arrayResult = taStack.pop();
-                    } else {
-                        arrayResult = [];
-                        for (let i = 0; i < arrayLen; i++) {
-                            const arrayLen1 = i32Stack.pop();
-                            let arrayResult1;
-                            if (arrayLen1 === -1) {
-                                arrayResult1 = taStack.pop();
-                            } else {
-                                arrayResult1 = [];
-                                for (let i1 = 0; i1 < arrayLen1; i1++) {
-                                    const int = i32Stack.pop();
-                                    arrayResult1.push(int);
-                                }
-                                arrayResult1.reverse();
-                            }
-                            arrayResult.push(arrayResult1);
-                        }
-                        arrayResult.reverse();
-                    }
+                    const arrayResult = __bjs_codec_Array_Array_Int.lift();
                     return arrayResult;
                 },
                 processNestedStringArray: function bjs_processNestedStringArray(values) {
-                    for (const elem of values) {
-                        for (const elem1 of elem) {
-                            const bytes = textEncoder.encode(elem1);
-                            const id = swift.memory.retain(bytes);
-                            i32Stack.push(bytes.length);
-                            i32Stack.push(id);
-                        }
-                        i32Stack.push(elem.length);
-                    }
-                    i32Stack.push(values.length);
+                    __bjs_codec_Array_Array_String.lower(values);
                     instance.exports.bjs_processNestedStringArray();
-                    const arrayLen = i32Stack.pop();
-                    let arrayResult;
-                    if (arrayLen === -1) {
-                        arrayResult = taStack.pop();
-                    } else {
-                        arrayResult = [];
-                        for (let i = 0; i < arrayLen; i++) {
-                            const arrayLen1 = i32Stack.pop();
-                            let arrayResult1;
-                            if (arrayLen1 === -1) {
-                                arrayResult1 = taStack.pop();
-                            } else {
-                                arrayResult1 = [];
-                                for (let i1 = 0; i1 < arrayLen1; i1++) {
-                                    const string = strStack.pop();
-                                    arrayResult1.push(string);
-                                }
-                                arrayResult1.reverse();
-                            }
-                            arrayResult.push(arrayResult1);
-                        }
-                        arrayResult.reverse();
-                    }
+                    const arrayResult = __bjs_codec_Array_Array_String.lift();
                     return arrayResult;
                 },
                 processNestedPointArray: function bjs_processNestedPointArray(points) {
-                    for (const elem of points) {
-                        for (const elem1 of elem) {
-                            structHelpers.Point.lower(elem1);
-                        }
-                        i32Stack.push(elem.length);
-                    }
-                    i32Stack.push(points.length);
+                    __bjs_codec_Array_Array_M10TestModuleT5Point.lower(points);
                     instance.exports.bjs_processNestedPointArray();
-                    const arrayLen = i32Stack.pop();
-                    let arrayResult;
-                    if (arrayLen === -1) {
-                        arrayResult = taStack.pop();
-                    } else {
-                        arrayResult = [];
-                        for (let i = 0; i < arrayLen; i++) {
-                            const arrayLen1 = i32Stack.pop();
-                            let arrayResult1;
-                            if (arrayLen1 === -1) {
-                                arrayResult1 = taStack.pop();
-                            } else {
-                                arrayResult1 = [];
-                                for (let i1 = 0; i1 < arrayLen1; i1++) {
-                                    const struct = structHelpers.Point.lift();
-                                    arrayResult1.push(struct);
-                                }
-                                arrayResult1.reverse();
-                            }
-                            arrayResult.push(arrayResult1);
-                        }
-                        arrayResult.reverse();
-                    }
+                    const arrayResult = __bjs_codec_Array_Array_M10TestModuleT5Point.lift();
                     return arrayResult;
                 },
                 processItemArray: function bjs_processItemArray(items) {
-                    for (const elem of items) {
-                        ptrStack.push(elem.pointer);
-                    }
-                    i32Stack.push(items.length);
+                    __bjs_codec_Array_M10TestModuleT4Item.lower(items);
                     instance.exports.bjs_processItemArray();
-                    const arrayLen = i32Stack.pop();
-                    let arrayResult;
-                    if (arrayLen === -1) {
-                        arrayResult = taStack.pop();
-                    } else {
-                        arrayResult = [];
-                        for (let i = 0; i < arrayLen; i++) {
-                            const ptr = ptrStack.pop();
-                            const obj = Item.__construct(ptr);
-                            arrayResult.push(obj);
-                        }
-                        arrayResult.reverse();
-                    }
+                    const arrayResult = __bjs_codec_Array_M10TestModuleT4Item.lift();
                     return arrayResult;
                 },
                 processNestedItemArray: function bjs_processNestedItemArray(items) {
-                    for (const elem of items) {
-                        for (const elem1 of elem) {
-                            ptrStack.push(elem1.pointer);
-                        }
-                        i32Stack.push(elem.length);
-                    }
-                    i32Stack.push(items.length);
+                    __bjs_codec_Array_Array_M10TestModuleT4Item.lower(items);
                     instance.exports.bjs_processNestedItemArray();
-                    const arrayLen = i32Stack.pop();
-                    let arrayResult;
-                    if (arrayLen === -1) {
-                        arrayResult = taStack.pop();
-                    } else {
-                        arrayResult = [];
-                        for (let i = 0; i < arrayLen; i++) {
-                            const arrayLen1 = i32Stack.pop();
-                            let arrayResult1;
-                            if (arrayLen1 === -1) {
-                                arrayResult1 = taStack.pop();
-                            } else {
-                                arrayResult1 = [];
-                                for (let i1 = 0; i1 < arrayLen1; i1++) {
-                                    const ptr = ptrStack.pop();
-                                    const obj = Item.__construct(ptr);
-                                    arrayResult1.push(obj);
-                                }
-                                arrayResult1.reverse();
-                            }
-                            arrayResult.push(arrayResult1);
-                        }
-                        arrayResult.reverse();
-                    }
+                    const arrayResult = __bjs_codec_Array_Array_M10TestModuleT4Item.lift();
                     return arrayResult;
                 },
                 processJSObjectArray: function bjs_processJSObjectArray(objects) {
-                    for (const elem of objects) {
-                        const objId = swift.memory.retain(elem);
-                        i32Stack.push(objId);
-                    }
-                    i32Stack.push(objects.length);
+                    __bjs_codec_Array_JSObject.lower(objects);
                     instance.exports.bjs_processJSObjectArray();
-                    const arrayLen = i32Stack.pop();
-                    let arrayResult;
-                    if (arrayLen === -1) {
-                        arrayResult = taStack.pop();
-                    } else {
-                        arrayResult = [];
-                        for (let i = 0; i < arrayLen; i++) {
-                            const objId1 = i32Stack.pop();
-                            const obj = swift.memory.getObject(objId1);
-                            swift.memory.release(objId1);
-                            arrayResult.push(obj);
-                        }
-                        arrayResult.reverse();
-                    }
+                    const arrayResult = __bjs_codec_Array_JSObject.lift();
                     return arrayResult;
                 },
                 processOptionalJSObjectArray: function bjs_processOptionalJSObjectArray(objects) {
-                    for (const elem of objects) {
-                        const isSome = elem != null ? 1 : 0;
-                        if (isSome) {
-                            const objId = swift.memory.retain(elem);
-                            i32Stack.push(objId);
-                        }
-                        i32Stack.push(isSome);
-                    }
-                    i32Stack.push(objects.length);
+                    __bjs_codec_Array_Optional_JSObject.lower(objects);
                     instance.exports.bjs_processOptionalJSObjectArray();
-                    const arrayLen = i32Stack.pop();
-                    let arrayResult;
-                    if (arrayLen === -1) {
-                        arrayResult = taStack.pop();
-                    } else {
-                        arrayResult = [];
-                        for (let i = 0; i < arrayLen; i++) {
-                            const isSome1 = i32Stack.pop();
-                            let optValue;
-                            if (isSome1 === 0) {
-                                optValue = null;
-                            } else {
-                                const objId1 = i32Stack.pop();
-                                const obj = swift.memory.getObject(objId1);
-                                swift.memory.release(objId1);
-                                optValue = obj;
-                            }
-                            arrayResult.push(optValue);
-                        }
-                        arrayResult.reverse();
-                    }
+                    const arrayResult = __bjs_codec_Array_Optional_JSObject.lift();
                     return arrayResult;
                 },
                 processNestedJSObjectArray: function bjs_processNestedJSObjectArray(objects) {
-                    for (const elem of objects) {
-                        for (const elem1 of elem) {
-                            const objId = swift.memory.retain(elem1);
-                            i32Stack.push(objId);
-                        }
-                        i32Stack.push(elem.length);
-                    }
-                    i32Stack.push(objects.length);
+                    __bjs_codec_Array_Array_JSObject.lower(objects);
                     instance.exports.bjs_processNestedJSObjectArray();
-                    const arrayLen = i32Stack.pop();
-                    let arrayResult;
-                    if (arrayLen === -1) {
-                        arrayResult = taStack.pop();
-                    } else {
-                        arrayResult = [];
-                        for (let i = 0; i < arrayLen; i++) {
-                            const arrayLen1 = i32Stack.pop();
-                            let arrayResult1;
-                            if (arrayLen1 === -1) {
-                                arrayResult1 = taStack.pop();
-                            } else {
-                                arrayResult1 = [];
-                                for (let i1 = 0; i1 < arrayLen1; i1++) {
-                                    const objId1 = i32Stack.pop();
-                                    const obj = swift.memory.getObject(objId1);
-                                    swift.memory.release(objId1);
-                                    arrayResult1.push(obj);
-                                }
-                                arrayResult1.reverse();
-                            }
-                            arrayResult.push(arrayResult1);
-                        }
-                        arrayResult.reverse();
-                    }
+                    const arrayResult = __bjs_codec_Array_Array_JSObject.lift();
                     return arrayResult;
                 },
                 multiArrayParams: function bjs_multiArrayParams(nums, strs) {
-                    for (const elem of nums) {
-                        i32Stack.push((elem | 0));
-                    }
-                    i32Stack.push(nums.length);
-                    for (const elem1 of strs) {
-                        const bytes = textEncoder.encode(elem1);
-                        const id = swift.memory.retain(bytes);
-                        i32Stack.push(bytes.length);
-                        i32Stack.push(id);
-                    }
-                    i32Stack.push(strs.length);
+                    __bjs_codec_Array_Int.lower(nums);
+                    __bjs_codec_Array_String.lower(strs);
                     const ret = instance.exports.bjs_multiArrayParams();
                     return ret;
                 },
                 multiOptionalArrayParams: function bjs_multiOptionalArrayParams(a, b) {
-                    const isSome = a != null;
-                    if (isSome) {
-                        for (const elem of a) {
-                            i32Stack.push((elem | 0));
-                        }
-                        i32Stack.push(a.length);
-                    }
-                    i32Stack.push(+isSome);
-                    const isSome1 = b != null;
-                    if (isSome1) {
-                        for (const elem1 of b) {
-                            const bytes = textEncoder.encode(elem1);
-                            const id = swift.memory.retain(bytes);
-                            i32Stack.push(bytes.length);
-                            i32Stack.push(id);
-                        }
-                        i32Stack.push(b.length);
-                    }
-                    i32Stack.push(+isSome1);
+                    __bjs_codec_Optional_Array_Int.lower(a);
+                    __bjs_codec_Optional_Array_String.lower(b);
                     const ret = instance.exports.bjs_multiOptionalArrayParams();
                     return ret;
                 },
                 Direction: DirectionValues,
                 Status: StatusValues,
+                Item,
+                MultiArrayContainer,
             };
             _exports = exports;
             return exports;
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Async.d.ts b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Async.d.ts
index aecab090e..507a96d4a 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Async.d.ts
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Async.d.ts
@@ -4,6 +4,26 @@
 // To update this file, just rebuild your project or run
 // `swift package bridge-js`.
 
+export const AsyncDirectionValues: {
+    readonly North: 0;
+    readonly South: 1;
+};
+export type AsyncDirectionTag = typeof AsyncDirectionValues[keyof typeof AsyncDirectionValues];
+
+export const AsyncThemeValues: {
+    readonly Light: "light";
+    readonly Dark: "dark";
+};
+export type AsyncThemeTag = typeof AsyncThemeValues[keyof typeof AsyncThemeValues];
+
+export interface AsyncPoint {
+    x: number;
+    y: number;
+}
+export type AsyncDirectionObject = typeof AsyncDirectionValues;
+
+export type AsyncThemeObject = typeof AsyncThemeValues;
+
 export type Exports = {
     asyncReturnVoid(): Promise<void>;
     asyncRoundTripInt(v: number): Promise<number>;
@@ -12,6 +32,21 @@ export type Exports = {
     asyncRoundTripFloat(v: number): Promise<number>;
     asyncRoundTripDouble(v: number): Promise<number>;
     asyncRoundTripJSObject(v: any): Promise<any>;
+    asyncRoundTripStruct(v: AsyncPoint): Promise<AsyncPoint>;
+    asyncRoundTripStructThrows(v: AsyncPoint): Promise<AsyncPoint>;
+    asyncThrowsZeroArg(): Promise<string>;
+    asyncCombineStructs(a: AsyncPoint, b: AsyncPoint): Promise<AsyncPoint>;
+    asyncRoundTripEnum(v: AsyncDirectionTag): Promise<AsyncDirectionTag>;
+    asyncRoundTripRawEnum(v: AsyncThemeTag): Promise<AsyncThemeTag>;
+    asyncRoundTripOptionalEnum(v: AsyncDirectionTag | null): Promise<AsyncDirectionTag | null>;
+    asyncRoundTripOptionalRawEnum(v: AsyncThemeTag | null): Promise<AsyncThemeTag | null>;
+    asyncRoundTripOptionalStruct(v: AsyncPoint | null): Promise<AsyncPoint | null>;
+    asyncRoundTripStructArray(v: AsyncPoint[]): Promise<AsyncPoint[]>;
+    asyncRoundTripEnumArray(v: AsyncDirectionTag[]): Promise<AsyncDirectionTag[]>;
+    asyncRoundTripStructDictionary(v: Record<string, AsyncPoint>): Promise<Record<string, AsyncPoint>>;
+    asyncRoundTripEnumDictionary(v: Record<string, AsyncDirectionTag>): Promise<Record<string, AsyncDirectionTag>>;
+    AsyncDirection: AsyncDirectionObject
+    AsyncTheme: AsyncThemeObject
 }
 export type Imports = {
 }
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Async.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Async.js
index a4c42674e..c025cf4f0 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Async.js
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Async.js
@@ -4,6 +4,16 @@
 // To update this file, just rebuild your project or run
 // `swift package bridge-js`.
 
+export const AsyncDirectionValues = {
+    North: 0,
+    South: 1,
+};
+
+export const AsyncThemeValues = {
+    Light: "light",
+    Dark: "dark",
+};
+
 export async function createInstantiator(options, swift) {
     let instance;
     let memory;
@@ -31,6 +41,364 @@ export async function createInstantiator(options, swift) {
 
     let _exports = null;
     let bjs = null;
+    const __bjs_arrayCodecCache = new WeakMap();
+    function __bjs_arrayCodec(elementCodec) {
+        let codec = __bjs_arrayCodecCache.get(elementCodec);
+        if (codec !== undefined) {
+            return codec;
+        }
+        codec = {
+            lower(value) {
+                for (let i = 0; i < value.length; i++) {
+                    elementCodec.lower(value[i]);
+                }
+                i32Stack.push(value.length);
+            },
+            lift() {
+                const count = i32Stack.pop();
+                if (count === -1) {
+                    return taStack.pop();
+                }
+                const result = new Array(count);
+                for (let i = count - 1; i >= 0; i--) {
+                    result[i] = elementCodec.lift();
+                }
+                return result;
+            },
+        };
+        __bjs_arrayCodecCache.set(elementCodec, codec);
+        return codec;
+    }
+    const __bjs_optionalCodecCache = new WeakMap();
+    const __bjs_optionalCodecUndefinedOrCache = new WeakMap();
+    function __bjs_optionalCodec(elementCodec, isUndefinedOr = false) {
+        const cache = isUndefinedOr ? __bjs_optionalCodecUndefinedOrCache : __bjs_optionalCodecCache;
+        let codec = cache.get(elementCodec);
+        if (codec !== undefined) {
+            return codec;
+        }
+        codec = {
+            lower(value) {
+                const isSome = isUndefinedOr ? value !== undefined : value != null;
+                if (isSome) {
+                    elementCodec.lower(value);
+                    i32Stack.push(1);
+                } else {
+                    i32Stack.push(0);
+                }
+            },
+            lift() {
+                if (i32Stack.pop() === 0) {
+                    return isUndefinedOr ? undefined : null;
+                }
+                return elementCodec.lift();
+            },
+        };
+        cache.set(elementCodec, codec);
+        return codec;
+    }
+    const __bjs_dictCodecCache = new WeakMap();
+    function __bjs_dictCodec(valueCodec) {
+        let codec = __bjs_dictCodecCache.get(valueCodec);
+        if (codec !== undefined) {
+            return codec;
+        }
+        codec = {
+            lower(value) {
+                const keys = Object.keys(value);
+                for (let i = 0; i < keys.length; i++) {
+                    __bjs_stringCodec.lower(keys[i]);
+                    valueCodec.lower(value[keys[i]]);
+                }
+                i32Stack.push(keys.length);
+            },
+            lift() {
+                const count = i32Stack.pop();
+                const result = {};
+                for (let i = 0; i < count; i++) {
+                    const value = valueCodec.lift();
+                    const key = __bjs_stringCodec.lift();
+                    result[key] = value;
+                }
+                return result;
+            },
+        };
+        __bjs_dictCodecCache.set(valueCodec, codec);
+        return codec;
+    }
+
+    const __bjs_stringCodec = {
+        lower: (v) => {
+            const bytes = textEncoder.encode(v);
+            const id = swift.memory.retain(bytes);
+            i32Stack.push(bytes.length);
+            i32Stack.push(id);
+        },
+        lift: () => {
+            const string = strStack.pop();
+            return string;
+        },
+    };
+    const __bjs_primitiveCodecs = {
+        Bool: {
+            lower: (v) => {
+                i32Stack.push(v ? 1 : 0);
+            },
+            lift: () => {
+                const bool = i32Stack.pop() !== 0;
+                return bool;
+            },
+        },
+        Int: {
+            lower: (v) => {
+                i32Stack.push((v | 0));
+            },
+            lift: () => {
+                const int = i32Stack.pop();
+                return int;
+            },
+        },
+        Int8: {
+            lower: (v) => {
+                i32Stack.push((v | 0));
+            },
+            lift: () => {
+                const int = i32Stack.pop();
+                return int;
+            },
+        },
+        UInt8: {
+            lower: (v) => {
+                i32Stack.push((v | 0));
+            },
+            lift: () => {
+                const int = i32Stack.pop() >>> 0;
+                return int;
+            },
+        },
+        Int16: {
+            lower: (v) => {
+                i32Stack.push((v | 0));
+            },
+            lift: () => {
+                const int = i32Stack.pop();
+                return int;
+            },
+        },
+        UInt16: {
+            lower: (v) => {
+                i32Stack.push((v | 0));
+            },
+            lift: () => {
+                const int = i32Stack.pop() >>> 0;
+                return int;
+            },
+        },
+        Int32: {
+            lower: (v) => {
+                i32Stack.push((v | 0));
+            },
+            lift: () => {
+                const int = i32Stack.pop();
+                return int;
+            },
+        },
+        UInt32: {
+            lower: (v) => {
+                i32Stack.push((v | 0));
+            },
+            lift: () => {
+                const int = i32Stack.pop() >>> 0;
+                return int;
+            },
+        },
+        UInt: {
+            lower: (v) => {
+                i32Stack.push((v | 0));
+            },
+            lift: () => {
+                const int = i32Stack.pop() >>> 0;
+                return int;
+            },
+        },
+        Int64: {
+            lower: (v) => {
+                i64Stack.push(v);
+            },
+            lift: () => {
+                const int = i64Stack.pop();
+                return int;
+            },
+        },
+        UInt64: {
+            lower: (v) => {
+                i64Stack.push(v);
+            },
+            lift: () => {
+                const int = i64Stack.pop();
+                return int;
+            },
+        },
+        Float: {
+            lower: (v) => {
+                f32Stack.push(Math.fround(v));
+            },
+            lift: () => {
+                const f32 = f32Stack.pop();
+                return f32;
+            },
+        },
+        Double: {
+            lower: (v) => {
+                f64Stack.push(v);
+            },
+            lift: () => {
+                const f64 = f64Stack.pop();
+                return f64;
+            },
+        },
+        String: __bjs_stringCodec,
+        JSValue: {
+            lower: (v) => {
+                const [vKind, vPayload1, vPayload2] = __bjs_jsValueLower(v);
+                i32Stack.push(vKind);
+                i32Stack.push(vPayload1);
+                f64Stack.push(vPayload2);
+            },
+            lift: () => {
+                const jsValuePayload2 = f64Stack.pop();
+                const jsValuePayload1 = i32Stack.pop();
+                const jsValueKind = i32Stack.pop();
+                const jsValue = __bjs_jsValueLift(jsValueKind, jsValuePayload1, jsValuePayload2);
+                return jsValue;
+            },
+        },
+    };
+
+    function __bjs_jsValueLower(value) {
+        let kind;
+        let payload1;
+        let payload2;
+        if (value === null) {
+            kind = 4;
+            payload1 = 0;
+            payload2 = 0;
+        } else {
+            switch (typeof value) {
+                case "boolean":
+                    kind = 0;
+                    payload1 = value ? 1 : 0;
+                    payload2 = 0;
+                    break;
+                case "number":
+                    kind = 2;
+                    payload1 = 0;
+                    payload2 = value;
+                    break;
+                case "string":
+                    kind = 1;
+                    payload1 = swift.memory.retain(value);
+                    payload2 = 0;
+                    break;
+                case "undefined":
+                    kind = 5;
+                    payload1 = 0;
+                    payload2 = 0;
+                    break;
+                case "object":
+                    kind = 3;
+                    payload1 = swift.memory.retain(value);
+                    payload2 = 0;
+                    break;
+                case "function":
+                    kind = 3;
+                    payload1 = swift.memory.retain(value);
+                    payload2 = 0;
+                    break;
+                case "symbol":
+                    kind = 7;
+                    payload1 = swift.memory.retain(value);
+                    payload2 = 0;
+                    break;
+                case "bigint":
+                    kind = 8;
+                    payload1 = swift.memory.retain(value);
+                    payload2 = 0;
+                    break;
+                default:
+                    throw new TypeError("Unsupported JSValue type");
+            }
+        }
+        return [kind, payload1, payload2];
+    }
+    function __bjs_jsValueLift(kind, payload1, payload2) {
+        let jsValue;
+        switch (kind) {
+            case 0:
+                jsValue = payload1 !== 0;
+                break;
+            case 1:
+                jsValue = swift.memory.getObject(payload1);
+                break;
+            case 2:
+                jsValue = payload2;
+                break;
+            case 3:
+                jsValue = swift.memory.getObject(payload1);
+                break;
+            case 4:
+                jsValue = null;
+                break;
+            case 5:
+                jsValue = undefined;
+                break;
+            case 7:
+                jsValue = swift.memory.getObject(payload1);
+                break;
+            case 8:
+                jsValue = swift.memory.getObject(payload1);
+                break;
+            default:
+                throw new TypeError("Unsupported JSValue kind " + kind);
+        }
+        return jsValue;
+    }
+
+    const __bjs_codec_M10TestModuleT10AsyncPoint = {
+        lower: (v) => {
+            structHelpers.M10TestModuleT10AsyncPoint.lower(v);
+        },
+        lift: () => {
+            const struct = structHelpers.M10TestModuleT10AsyncPoint.lift();
+            return struct;
+        },
+    };
+    const __bjs_codec_Optional_M10TestModuleT10AsyncPoint = __bjs_optionalCodec(__bjs_codec_M10TestModuleT10AsyncPoint);
+    const __bjs_codec_Array_M10TestModuleT10AsyncPoint = __bjs_arrayCodec(__bjs_codec_M10TestModuleT10AsyncPoint);
+    const __bjs_codec_M10TestModuleT14AsyncDirection = {
+        lower: (v) => {
+            i32Stack.push((v | 0));
+        },
+        lift: () => {
+            const caseId = i32Stack.pop();
+            return caseId;
+        },
+    };
+    const __bjs_codec_Array_M10TestModuleT14AsyncDirection = __bjs_arrayCodec(__bjs_codec_M10TestModuleT14AsyncDirection);
+    const __bjs_codec_Dict_M10TestModuleT10AsyncPoint = __bjs_dictCodec(__bjs_codec_M10TestModuleT10AsyncPoint);
+    const __bjs_codec_Dict_M10TestModuleT14AsyncDirection = __bjs_dictCodec(__bjs_codec_M10TestModuleT14AsyncDirection);
+
+    const __bjs_createStructHelpers_M10TestModuleT10AsyncPoint = () => ({
+        lower: (value) => {
+            i32Stack.push((value.x | 0));
+            i32Stack.push((value.y | 0));
+        },
+        lift: () => {
+            const int = i32Stack.pop();
+            const int1 = i32Stack.pop();
+            return { x: int1, y: int };
+        }
+    });
 
     return {
         /**
@@ -45,14 +413,14 @@ export async function createInstantiator(options, swift) {
             bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) {
                 const source = swift.memory.getObject(sourceId);
                 swift.memory.release(sourceId);
-                const bytes = new Uint8Array(memory.buffer, bytesPtr);
+                const bytes = new Uint8Array(memory.buffer, bytesPtr >>> 0);
                 bytes.set(source);
             }
             bjs["swift_js_make_js_string"] = function(ptr, len) {
                 return swift.memory.retain(decodeString(ptr, len));
             }
             bjs["swift_js_init_memory_with_result"] = function(ptr, len) {
-                const target = new Uint8Array(memory.buffer, ptr, len);
+                const target = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0);
                 target.set(tmpRetBytes);
                 tmpRetBytes = undefined;
             }
@@ -106,6 +474,164 @@ export async function createInstantiator(options, swift) {
                 const copy = memory.buffer.slice(ptr, ptr + byteLen);
                 taStack.push(Array.from(new Ctor(copy)));
             }
+            bjs["swift_js_struct_lower_AsyncPoint"] = function(objectId) {
+                structHelpers.M10TestModuleT10AsyncPoint.lower(swift.memory.getObject(objectId));
+            }
+            bjs["swift_js_struct_lift_AsyncPoint"] = function() {
+                const value = structHelpers.M10TestModuleT10AsyncPoint.lift();
+                return swift.memory.retain(value);
+            }
+            bjs["bjs_core_register_type_handles"] = function() {};
+            bjs["bjs_TestModule_register_type_handles"] = function() {};
+            const __bjs_promiseSettlers = Symbol("JavaScriptKit.promiseSettlers");
+            bjs["swift_js_make_promise"] = function() {
+                let resolve, reject;
+                const promise = new Promise((res, rej) => { resolve = res; reject = rej; });
+                promise[__bjs_promiseSettlers] = { resolve, reject };
+                return swift.memory.retain(promise);
+            }
+            bjs["promise_resolve_TestModule_y"] = function(promise) {
+                try {
+                    swift.memory.getObject(promise)[__bjs_promiseSettlers].resolve();
+                } catch (error) {
+                    setException(error);
+                }
+            }
+            bjs["promise_resolve_TestModule_Si"] = function(promise, value) {
+                try {
+                    swift.memory.getObject(promise)[__bjs_promiseSettlers].resolve(value);
+                } catch (error) {
+                    setException(error);
+                }
+            }
+            bjs["promise_resolve_TestModule_SS"] = function(promise, valueBytes, valueCount) {
+                try {
+                    const string = decodeString(valueBytes, valueCount);
+                    swift.memory.getObject(promise)[__bjs_promiseSettlers].resolve(string);
+                } catch (error) {
+                    setException(error);
+                }
+            }
+            bjs["promise_resolve_TestModule_Sb"] = function(promise, value) {
+                try {
+                    swift.memory.getObject(promise)[__bjs_promiseSettlers].resolve(value !== 0);
+                } catch (error) {
+                    setException(error);
+                }
+            }
+            bjs["promise_resolve_TestModule_Sf"] = function(promise, value) {
+                try {
+                    swift.memory.getObject(promise)[__bjs_promiseSettlers].resolve(value);
+                } catch (error) {
+                    setException(error);
+                }
+            }
+            bjs["promise_resolve_TestModule_Sd"] = function(promise, value) {
+                try {
+                    swift.memory.getObject(promise)[__bjs_promiseSettlers].resolve(value);
+                } catch (error) {
+                    setException(error);
+                }
+            }
+            bjs["promise_resolve_TestModule_8JSObjectC"] = function(promise, value) {
+                try {
+                    swift.memory.getObject(promise)[__bjs_promiseSettlers].resolve(swift.memory.getObject(value));
+                } catch (error) {
+                    setException(error);
+                }
+            }
+            bjs["promise_resolve_TestModule_10AsyncPointV"] = function(promise) {
+                try {
+                    const structValue = structHelpers.M10TestModuleT10AsyncPoint.lift();
+                    swift.memory.getObject(promise)[__bjs_promiseSettlers].resolve(structValue);
+                } catch (error) {
+                    setException(error);
+                }
+            }
+            bjs["promise_resolve_TestModule_14AsyncDirectionO"] = function(promise, value) {
+                try {
+                    swift.memory.getObject(promise)[__bjs_promiseSettlers].resolve(value);
+                } catch (error) {
+                    setException(error);
+                }
+            }
+            bjs["promise_resolve_TestModule_10AsyncThemeO"] = function(promise, valueBytes, valueCount) {
+                try {
+                    const string = decodeString(valueBytes, valueCount);
+                    swift.memory.getObject(promise)[__bjs_promiseSettlers].resolve(string);
+                } catch (error) {
+                    setException(error);
+                }
+            }
+            bjs["promise_resolve_TestModule_Sq14AsyncDirectionO"] = function(promise, valueIsSome, valueWrappedValue) {
+                try {
+                    swift.memory.getObject(promise)[__bjs_promiseSettlers].resolve(valueIsSome ? valueWrappedValue : null);
+                } catch (error) {
+                    setException(error);
+                }
+            }
+            bjs["promise_resolve_TestModule_Sq10AsyncThemeO"] = function(promise, valueIsSome, valueBytes, valueCount) {
+                try {
+                    let optResult;
+                    if (valueIsSome) {
+                        const string = decodeString(valueBytes, valueCount);
+                        optResult = string;
+                    } else {
+                        optResult = null;
+                    }
+                    swift.memory.getObject(promise)[__bjs_promiseSettlers].resolve(optResult);
+                } catch (error) {
+                    setException(error);
+                }
+            }
+            bjs["promise_resolve_TestModule_Sq10AsyncPointV"] = function(promise) {
+                try {
+                    const optValue = __bjs_codec_Optional_M10TestModuleT10AsyncPoint.lift();
+                    swift.memory.getObject(promise)[__bjs_promiseSettlers].resolve(optValue);
+                } catch (error) {
+                    setException(error);
+                }
+            }
+            bjs["promise_resolve_TestModule_Sa10AsyncPointV"] = function(promise) {
+                try {
+                    const arrayResult = __bjs_codec_Array_M10TestModuleT10AsyncPoint.lift();
+                    swift.memory.getObject(promise)[__bjs_promiseSettlers].resolve(arrayResult);
+                } catch (error) {
+                    setException(error);
+                }
+            }
+            bjs["promise_resolve_TestModule_Sa14AsyncDirectionO"] = function(promise) {
+                try {
+                    const arrayResult = __bjs_codec_Array_M10TestModuleT14AsyncDirection.lift();
+                    swift.memory.getObject(promise)[__bjs_promiseSettlers].resolve(arrayResult);
+                } catch (error) {
+                    setException(error);
+                }
+            }
+            bjs["promise_resolve_TestModule_SD10AsyncPointV"] = function(promise) {
+                try {
+                    const dictResult = __bjs_codec_Dict_M10TestModuleT10AsyncPoint.lift();
+                    swift.memory.getObject(promise)[__bjs_promiseSettlers].resolve(dictResult);
+                } catch (error) {
+                    setException(error);
+                }
+            }
+            bjs["promise_resolve_TestModule_SD14AsyncDirectionO"] = function(promise) {
+                try {
+                    const dictResult = __bjs_codec_Dict_M10TestModuleT14AsyncDirection.lift();
+                    swift.memory.getObject(promise)[__bjs_promiseSettlers].resolve(dictResult);
+                } catch (error) {
+                    setException(error);
+                }
+            }
+            bjs["promise_reject_TestModule"] = function(promise, valueKind, valuePayload1, valuePayload2) {
+                try {
+                    const jsValue = __bjs_jsValueLift(valueKind, valuePayload1, valuePayload2);
+                    swift.memory.getObject(promise)[__bjs_promiseSettlers].reject(jsValue);
+                } catch (error) {
+                    setException(error);
+                }
+            }
             bjs["swift_js_return_optional_bool"] = function(isSome, value) {
                 if (isSome === 0) {
                     tmpRetOptionalBool = null;
@@ -210,6 +736,9 @@ export async function createInstantiator(options, swift) {
         /** @param {WebAssembly.Instance} instance */
         createExports: (instance) => {
             const js = swift.memory.heap;
+            const __bjs_helpers_M10TestModuleT10AsyncPoint = __bjs_createStructHelpers_M10TestModuleT10AsyncPoint();
+            structHelpers.M10TestModuleT10AsyncPoint = __bjs_helpers_M10TestModuleT10AsyncPoint;
+
             const exports = {
                 asyncReturnVoid: function bjs_asyncReturnVoid() {
                     const ret = instance.exports.bjs_asyncReturnVoid();
@@ -255,6 +784,121 @@ export async function createInstantiator(options, swift) {
                     swift.memory.release(ret);
                     return ret1;
                 },
+                asyncRoundTripStruct: function bjs_asyncRoundTripStruct(v) {
+                    structHelpers.M10TestModuleT10AsyncPoint.lower(v);
+                    const ret = instance.exports.bjs_asyncRoundTripStruct();
+                    const ret1 = swift.memory.getObject(ret);
+                    swift.memory.release(ret);
+                    return ret1;
+                },
+                asyncRoundTripStructThrows: function bjs_asyncRoundTripStructThrows(v) {
+                    structHelpers.M10TestModuleT10AsyncPoint.lower(v);
+                    const ret = instance.exports.bjs_asyncRoundTripStructThrows();
+                    const ret1 = swift.memory.getObject(ret);
+                    swift.memory.release(ret);
+                    if (tmpRetException) {
+                        const error = swift.memory.getObject(tmpRetException);
+                        swift.memory.release(tmpRetException);
+                        tmpRetException = undefined;
+                        throw error;
+                    }
+                    return ret1;
+                },
+                asyncThrowsZeroArg: function bjs_asyncThrowsZeroArg() {
+                    const ret = instance.exports.bjs_asyncThrowsZeroArg();
+                    const ret1 = swift.memory.getObject(ret);
+                    swift.memory.release(ret);
+                    if (tmpRetException) {
+                        const error = swift.memory.getObject(tmpRetException);
+                        swift.memory.release(tmpRetException);
+                        tmpRetException = undefined;
+                        throw error;
+                    }
+                    return ret1;
+                },
+                asyncCombineStructs: function bjs_asyncCombineStructs(a, b) {
+                    structHelpers.M10TestModuleT10AsyncPoint.lower(a);
+                    structHelpers.M10TestModuleT10AsyncPoint.lower(b);
+                    const ret = instance.exports.bjs_asyncCombineStructs();
+                    const ret1 = swift.memory.getObject(ret);
+                    swift.memory.release(ret);
+                    return ret1;
+                },
+                asyncRoundTripEnum: function bjs_asyncRoundTripEnum(v) {
+                    const ret = instance.exports.bjs_asyncRoundTripEnum(v);
+                    const ret1 = swift.memory.getObject(ret);
+                    swift.memory.release(ret);
+                    return ret1;
+                },
+                asyncRoundTripRawEnum: function bjs_asyncRoundTripRawEnum(v) {
+                    const vBytes = textEncoder.encode(v);
+                    const vId = swift.memory.retain(vBytes);
+                    const ret = instance.exports.bjs_asyncRoundTripRawEnum(vId, vBytes.length);
+                    const ret1 = swift.memory.getObject(ret);
+                    swift.memory.release(ret);
+                    return ret1;
+                },
+                asyncRoundTripOptionalEnum: function bjs_asyncRoundTripOptionalEnum(v) {
+                    const isSome = v != null;
+                    const ret = instance.exports.bjs_asyncRoundTripOptionalEnum(+isSome, isSome ? v : 0);
+                    const ret1 = swift.memory.getObject(ret);
+                    swift.memory.release(ret);
+                    return ret1;
+                },
+                asyncRoundTripOptionalRawEnum: function bjs_asyncRoundTripOptionalRawEnum(v) {
+                    const isSome = v != null;
+                    let result, result1;
+                    if (isSome) {
+                        const vBytes = textEncoder.encode(v);
+                        const vId = swift.memory.retain(vBytes);
+                        result = vId;
+                        result1 = vBytes.length;
+                    } else {
+                        result = 0;
+                        result1 = 0;
+                    }
+                    const ret = instance.exports.bjs_asyncRoundTripOptionalRawEnum(+isSome, result, result1);
+                    const ret1 = swift.memory.getObject(ret);
+                    swift.memory.release(ret);
+                    return ret1;
+                },
+                asyncRoundTripOptionalStruct: function bjs_asyncRoundTripOptionalStruct(v) {
+                    __bjs_codec_Optional_M10TestModuleT10AsyncPoint.lower(v);
+                    const ret = instance.exports.bjs_asyncRoundTripOptionalStruct();
+                    const ret1 = swift.memory.getObject(ret);
+                    swift.memory.release(ret);
+                    return ret1;
+                },
+                asyncRoundTripStructArray: function bjs_asyncRoundTripStructArray(v) {
+                    __bjs_codec_Array_M10TestModuleT10AsyncPoint.lower(v);
+                    const ret = instance.exports.bjs_asyncRoundTripStructArray();
+                    const ret1 = swift.memory.getObject(ret);
+                    swift.memory.release(ret);
+                    return ret1;
+                },
+                asyncRoundTripEnumArray: function bjs_asyncRoundTripEnumArray(v) {
+                    __bjs_codec_Array_M10TestModuleT14AsyncDirection.lower(v);
+                    const ret = instance.exports.bjs_asyncRoundTripEnumArray();
+                    const ret1 = swift.memory.getObject(ret);
+                    swift.memory.release(ret);
+                    return ret1;
+                },
+                asyncRoundTripStructDictionary: function bjs_asyncRoundTripStructDictionary(v) {
+                    __bjs_codec_Dict_M10TestModuleT10AsyncPoint.lower(v);
+                    const ret = instance.exports.bjs_asyncRoundTripStructDictionary();
+                    const ret1 = swift.memory.getObject(ret);
+                    swift.memory.release(ret);
+                    return ret1;
+                },
+                asyncRoundTripEnumDictionary: function bjs_asyncRoundTripEnumDictionary(v) {
+                    __bjs_codec_Dict_M10TestModuleT14AsyncDirection.lower(v);
+                    const ret = instance.exports.bjs_asyncRoundTripEnumDictionary();
+                    const ret1 = swift.memory.getObject(ret);
+                    swift.memory.release(ret);
+                    return ret1;
+                },
+                AsyncDirection: AsyncDirectionValues,
+                AsyncTheme: AsyncThemeValues,
             };
             _exports = exports;
             return exports;
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/AsyncAssociatedValueEnum.d.ts b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/AsyncAssociatedValueEnum.d.ts
new file mode 100644
index 000000000..d25336ef7
--- /dev/null
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/AsyncAssociatedValueEnum.d.ts
@@ -0,0 +1,33 @@
+// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit,
+// DO NOT EDIT.
+//
+// To update this file, just rebuild your project or run
+// `swift package bridge-js`.
+
+export const AsyncPayloadResultValues: {
+    readonly Tag: {
+        readonly Success: 0;
+        readonly Failure: 1;
+        readonly Idle: 2;
+    };
+};
+
+export type AsyncPayloadResultTag =
+  { tag: typeof AsyncPayloadResultValues.Tag.Success; param0: string } | { tag: typeof AsyncPayloadResultValues.Tag.Failure; param0: number } | { tag: typeof AsyncPayloadResultValues.Tag.Idle }
+
+export type AsyncPayloadResultObject = typeof AsyncPayloadResultValues;
+
+export type Exports = {
+    asyncRoundTripAssociatedValueEnum(value: AsyncPayloadResultTag): Promise<AsyncPayloadResultTag>;
+    asyncRoundTripOptionalAssociatedValueEnum(value: AsyncPayloadResultTag | null): Promise<AsyncPayloadResultTag | null>;
+    AsyncPayloadResult: AsyncPayloadResultObject
+}
+export type Imports = {
+}
+export function createInstantiator(options: {
+    imports: Imports;
+}, swift: any): Promise<{
+    addImports: (importObject: WebAssembly.Imports) => void;
+    setInstance: (instance: WebAssembly.Instance) => void;
+    createExports: (instance: WebAssembly.Instance) => Exports;
+}>;
\ No newline at end of file
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/AsyncAssociatedValueEnum.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/AsyncAssociatedValueEnum.js
new file mode 100644
index 000000000..49b2ff88b
--- /dev/null
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/AsyncAssociatedValueEnum.js
@@ -0,0 +1,416 @@
+// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit,
+// DO NOT EDIT.
+//
+// To update this file, just rebuild your project or run
+// `swift package bridge-js`.
+
+export const AsyncPayloadResultValues = {
+    Tag: {
+        Success: 0,
+        Failure: 1,
+        Idle: 2,
+    },
+};
+export async function createInstantiator(options, swift) {
+    let instance;
+    let memory;
+    let setException;
+    let decodeString;
+    const textDecoder = new TextDecoder("utf-8");
+    const textEncoder = new TextEncoder("utf-8");
+    let tmpRetString;
+    let tmpRetBytes;
+    let tmpRetException;
+    let tmpRetOptionalBool;
+    let tmpRetOptionalInt;
+    let tmpRetOptionalFloat;
+    let tmpRetOptionalDouble;
+    let tmpRetOptionalHeapObject;
+    let strStack = [];
+    let i32Stack = [];
+    let i64Stack = [];
+    let f32Stack = [];
+    let f64Stack = [];
+    let ptrStack = [];
+    let taStack = [];
+    const enumHelpers = {};
+    const structHelpers = {};
+
+    let _exports = null;
+    let bjs = null;
+    function __bjs_jsValueLower(value) {
+        let kind;
+        let payload1;
+        let payload2;
+        if (value === null) {
+            kind = 4;
+            payload1 = 0;
+            payload2 = 0;
+        } else {
+            switch (typeof value) {
+                case "boolean":
+                    kind = 0;
+                    payload1 = value ? 1 : 0;
+                    payload2 = 0;
+                    break;
+                case "number":
+                    kind = 2;
+                    payload1 = 0;
+                    payload2 = value;
+                    break;
+                case "string":
+                    kind = 1;
+                    payload1 = swift.memory.retain(value);
+                    payload2 = 0;
+                    break;
+                case "undefined":
+                    kind = 5;
+                    payload1 = 0;
+                    payload2 = 0;
+                    break;
+                case "object":
+                    kind = 3;
+                    payload1 = swift.memory.retain(value);
+                    payload2 = 0;
+                    break;
+                case "function":
+                    kind = 3;
+                    payload1 = swift.memory.retain(value);
+                    payload2 = 0;
+                    break;
+                case "symbol":
+                    kind = 7;
+                    payload1 = swift.memory.retain(value);
+                    payload2 = 0;
+                    break;
+                case "bigint":
+                    kind = 8;
+                    payload1 = swift.memory.retain(value);
+                    payload2 = 0;
+                    break;
+                default:
+                    throw new TypeError("Unsupported JSValue type");
+            }
+        }
+        return [kind, payload1, payload2];
+    }
+    function __bjs_jsValueLift(kind, payload1, payload2) {
+        let jsValue;
+        switch (kind) {
+            case 0:
+                jsValue = payload1 !== 0;
+                break;
+            case 1:
+                jsValue = swift.memory.getObject(payload1);
+                break;
+            case 2:
+                jsValue = payload2;
+                break;
+            case 3:
+                jsValue = swift.memory.getObject(payload1);
+                break;
+            case 4:
+                jsValue = null;
+                break;
+            case 5:
+                jsValue = undefined;
+                break;
+            case 7:
+                jsValue = swift.memory.getObject(payload1);
+                break;
+            case 8:
+                jsValue = swift.memory.getObject(payload1);
+                break;
+            default:
+                throw new TypeError("Unsupported JSValue kind " + kind);
+        }
+        return jsValue;
+    }
+
+    const __bjs_createEnumHelpers_M10TestModuleT18AsyncPayloadResult = () => ({
+        lower: (value) => {
+            const enumTag = value.tag;
+            switch (enumTag) {
+                case AsyncPayloadResultValues.Tag.Success: {
+                    const bytes = textEncoder.encode(value.param0);
+                    const id = swift.memory.retain(bytes);
+                    i32Stack.push(bytes.length);
+                    i32Stack.push(id);
+                    return AsyncPayloadResultValues.Tag.Success;
+                }
+                case AsyncPayloadResultValues.Tag.Failure: {
+                    i32Stack.push((value.param0 | 0));
+                    return AsyncPayloadResultValues.Tag.Failure;
+                }
+                case AsyncPayloadResultValues.Tag.Idle: {
+                    return AsyncPayloadResultValues.Tag.Idle;
+                }
+                default: throw new Error("Unknown AsyncPayloadResultValues tag: " + String(enumTag));
+            }
+        },
+        lift: (tag) => {
+            tag = tag | 0;
+            switch (tag) {
+                case AsyncPayloadResultValues.Tag.Success: {
+                    const string = strStack.pop();
+                    return { tag: AsyncPayloadResultValues.Tag.Success, param0: string };
+                }
+                case AsyncPayloadResultValues.Tag.Failure: {
+                    const int = i32Stack.pop();
+                    return { tag: AsyncPayloadResultValues.Tag.Failure, param0: int };
+                }
+                case AsyncPayloadResultValues.Tag.Idle: return { tag: AsyncPayloadResultValues.Tag.Idle };
+                default: throw new Error("Unknown AsyncPayloadResultValues tag returned from Swift: " + String(tag));
+            }
+        }
+    });
+
+    return {
+        /**
+         * @param {WebAssembly.Imports} importObject
+         */
+        addImports: (importObject, importsContext) => {
+            bjs = {};
+            importObject["bjs"] = bjs;
+            bjs["swift_js_return_string"] = function(ptr, len) {
+                tmpRetString = decodeString(ptr, len);
+            }
+            bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) {
+                const source = swift.memory.getObject(sourceId);
+                swift.memory.release(sourceId);
+                const bytes = new Uint8Array(memory.buffer, bytesPtr >>> 0);
+                bytes.set(source);
+            }
+            bjs["swift_js_make_js_string"] = function(ptr, len) {
+                return swift.memory.retain(decodeString(ptr, len));
+            }
+            bjs["swift_js_init_memory_with_result"] = function(ptr, len) {
+                const target = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0);
+                target.set(tmpRetBytes);
+                tmpRetBytes = undefined;
+            }
+            bjs["swift_js_throw"] = function(id) {
+                tmpRetException = swift.memory.retainByRef(id);
+            }
+            bjs["swift_js_retain"] = function(id) {
+                return swift.memory.retainByRef(id);
+            }
+            bjs["swift_js_release"] = function(id) {
+                swift.memory.release(id);
+            }
+            bjs["swift_js_push_i32"] = function(v) {
+                i32Stack.push(v | 0);
+            }
+            bjs["swift_js_push_f32"] = function(v) {
+                f32Stack.push(Math.fround(v));
+            }
+            bjs["swift_js_push_f64"] = function(v) {
+                f64Stack.push(v);
+            }
+            bjs["swift_js_push_string"] = function(ptr, len) {
+                const value = decodeString(ptr, len);
+                strStack.push(value);
+            }
+            bjs["swift_js_pop_i32"] = function() {
+                return i32Stack.pop();
+            }
+            bjs["swift_js_pop_f32"] = function() {
+                return f32Stack.pop();
+            }
+            bjs["swift_js_pop_f64"] = function() {
+                return f64Stack.pop();
+            }
+            bjs["swift_js_push_pointer"] = function(pointer) {
+                ptrStack.push(pointer);
+            }
+            bjs["swift_js_pop_pointer"] = function() {
+                return ptrStack.pop();
+            }
+            bjs["swift_js_push_i64"] = function(v) {
+                i64Stack.push(v);
+            }
+            bjs["swift_js_pop_i64"] = function() {
+                return i64Stack.pop();
+            }
+            const taCtors = [Int8Array, Uint8Array, Int16Array, Uint16Array, Int32Array, Uint32Array, Float32Array, Float64Array];
+            bjs["swift_js_push_typed_array"] = function(kind, ptr, count) {
+                const Ctor = taCtors[kind];
+                const byteLen = count * Ctor.BYTES_PER_ELEMENT;
+                const copy = memory.buffer.slice(ptr, ptr + byteLen);
+                taStack.push(Array.from(new Ctor(copy)));
+            }
+            bjs["bjs_core_register_type_handles"] = function() {};
+            bjs["bjs_TestModule_register_type_handles"] = function() {};
+            const __bjs_promiseSettlers = Symbol("JavaScriptKit.promiseSettlers");
+            bjs["swift_js_make_promise"] = function() {
+                let resolve, reject;
+                const promise = new Promise((res, rej) => { resolve = res; reject = rej; });
+                promise[__bjs_promiseSettlers] = { resolve, reject };
+                return swift.memory.retain(promise);
+            }
+            bjs["promise_resolve_TestModule_18AsyncPayloadResultO"] = function(promise, value) {
+                try {
+                    const enumValue = enumHelpers.M10TestModuleT18AsyncPayloadResult.lift(value);
+                    swift.memory.getObject(promise)[__bjs_promiseSettlers].resolve(enumValue);
+                } catch (error) {
+                    setException(error);
+                }
+            }
+            bjs["promise_resolve_TestModule_Sq18AsyncPayloadResultO"] = function(promise, valueIsSome, valueCaseId) {
+                try {
+                    let optResult;
+                    if (valueIsSome) {
+                        const enumValue = enumHelpers.M10TestModuleT18AsyncPayloadResult.lift(valueCaseId);
+                        optResult = enumValue;
+                    } else {
+                        optResult = null;
+                    }
+                    swift.memory.getObject(promise)[__bjs_promiseSettlers].resolve(optResult);
+                } catch (error) {
+                    setException(error);
+                }
+            }
+            bjs["promise_reject_TestModule"] = function(promise, valueKind, valuePayload1, valuePayload2) {
+                try {
+                    const jsValue = __bjs_jsValueLift(valueKind, valuePayload1, valuePayload2);
+                    swift.memory.getObject(promise)[__bjs_promiseSettlers].reject(jsValue);
+                } catch (error) {
+                    setException(error);
+                }
+            }
+            bjs["swift_js_return_optional_bool"] = function(isSome, value) {
+                if (isSome === 0) {
+                    tmpRetOptionalBool = null;
+                } else {
+                    tmpRetOptionalBool = value !== 0;
+                }
+            }
+            bjs["swift_js_return_optional_int"] = function(isSome, value) {
+                if (isSome === 0) {
+                    tmpRetOptionalInt = null;
+                } else {
+                    tmpRetOptionalInt = value | 0;
+                }
+            }
+            bjs["swift_js_return_optional_float"] = function(isSome, value) {
+                if (isSome === 0) {
+                    tmpRetOptionalFloat = null;
+                } else {
+                    tmpRetOptionalFloat = Math.fround(value);
+                }
+            }
+            bjs["swift_js_return_optional_double"] = function(isSome, value) {
+                if (isSome === 0) {
+                    tmpRetOptionalDouble = null;
+                } else {
+                    tmpRetOptionalDouble = value;
+                }
+            }
+            bjs["swift_js_return_optional_string"] = function(isSome, ptr, len) {
+                if (isSome === 0) {
+                    tmpRetString = null;
+                } else {
+                    tmpRetString = decodeString(ptr, len);
+                }
+            }
+            bjs["swift_js_return_optional_object"] = function(isSome, objectId) {
+                if (isSome === 0) {
+                    tmpRetString = null;
+                } else {
+                    tmpRetString = swift.memory.getObject(objectId);
+                }
+            }
+            bjs["swift_js_return_optional_heap_object"] = function(isSome, pointer) {
+                if (isSome === 0) {
+                    tmpRetOptionalHeapObject = null;
+                } else {
+                    tmpRetOptionalHeapObject = pointer;
+                }
+            }
+            bjs["swift_js_get_optional_int_presence"] = function() {
+                return tmpRetOptionalInt != null ? 1 : 0;
+            }
+            bjs["swift_js_get_optional_int_value"] = function() {
+                const value = tmpRetOptionalInt;
+                tmpRetOptionalInt = undefined;
+                return value;
+            }
+            bjs["swift_js_get_optional_string"] = function() {
+                const str = tmpRetString;
+                tmpRetString = undefined;
+                if (str == null) {
+                    return -1;
+                } else {
+                    const bytes = textEncoder.encode(str);
+                    tmpRetBytes = bytes;
+                    return bytes.length;
+                }
+            }
+            bjs["swift_js_get_optional_float_presence"] = function() {
+                return tmpRetOptionalFloat != null ? 1 : 0;
+            }
+            bjs["swift_js_get_optional_float_value"] = function() {
+                const value = tmpRetOptionalFloat;
+                tmpRetOptionalFloat = undefined;
+                return value;
+            }
+            bjs["swift_js_get_optional_double_presence"] = function() {
+                return tmpRetOptionalDouble != null ? 1 : 0;
+            }
+            bjs["swift_js_get_optional_double_value"] = function() {
+                const value = tmpRetOptionalDouble;
+                tmpRetOptionalDouble = undefined;
+                return value;
+            }
+            bjs["swift_js_get_optional_heap_object_pointer"] = function() {
+                const pointer = tmpRetOptionalHeapObject;
+                tmpRetOptionalHeapObject = undefined;
+                return pointer || 0;
+            }
+            bjs["swift_js_closure_unregister"] = function(funcRef) {}
+        },
+        setInstance: (i) => {
+            instance = i;
+            memory = instance.exports.memory;
+
+            decodeString = (ptr, len) => { const bytes = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); return textDecoder.decode(bytes); }
+
+            setException = (error) => {
+                instance.exports._swift_js_exception.value = swift.memory.retain(error)
+            }
+        },
+        /** @param {WebAssembly.Instance} instance */
+        createExports: (instance) => {
+            const js = swift.memory.heap;
+            const __bjs_helpers_M10TestModuleT18AsyncPayloadResult = __bjs_createEnumHelpers_M10TestModuleT18AsyncPayloadResult();
+            enumHelpers.M10TestModuleT18AsyncPayloadResult = __bjs_helpers_M10TestModuleT18AsyncPayloadResult;
+
+            const exports = {
+                asyncRoundTripAssociatedValueEnum: function bjs_asyncRoundTripAssociatedValueEnum(value) {
+                    const valueCaseId = enumHelpers.M10TestModuleT18AsyncPayloadResult.lower(value);
+                    const ret = instance.exports.bjs_asyncRoundTripAssociatedValueEnum(valueCaseId);
+                    const ret1 = swift.memory.getObject(ret);
+                    swift.memory.release(ret);
+                    return ret1;
+                },
+                asyncRoundTripOptionalAssociatedValueEnum: function bjs_asyncRoundTripOptionalAssociatedValueEnum(value) {
+                    const isSome = value != null;
+                    let result;
+                    if (isSome) {
+                        const valueCaseId = enumHelpers.M10TestModuleT18AsyncPayloadResult.lower(value);
+                        result = valueCaseId;
+                    } else {
+                        result = 0;
+                    }
+                    const ret = instance.exports.bjs_asyncRoundTripOptionalAssociatedValueEnum(+isSome, result);
+                    const ret1 = swift.memory.getObject(ret);
+                    swift.memory.release(ret);
+                    return ret1;
+                },
+                AsyncPayloadResult: AsyncPayloadResultValues,
+            };
+            _exports = exports;
+            return exports;
+        },
+    }
+}
\ No newline at end of file
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/AsyncImport.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/AsyncImport.js
index fd27e3d67..96c0d11e8 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/AsyncImport.js
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/AsyncImport.js
@@ -128,7 +128,7 @@ export async function createInstantiator(options, swift) {
         const state = { pointer, file, line, unregistered: false };
         const real = (...args) => {
             if (state.unregistered) {
-                const bytes = new Uint8Array(memory.buffer, state.file);
+                const bytes = new Uint8Array(memory.buffer, state.file >>> 0);
                 let length = 0;
                 while (bytes[length] !== 0) { length += 1; }
                 const fileID = decodeString(state.file, length);
@@ -160,14 +160,14 @@ export async function createInstantiator(options, swift) {
             bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) {
                 const source = swift.memory.getObject(sourceId);
                 swift.memory.release(sourceId);
-                const bytes = new Uint8Array(memory.buffer, bytesPtr);
+                const bytes = new Uint8Array(memory.buffer, bytesPtr >>> 0);
                 bytes.set(source);
             }
             bjs["swift_js_make_js_string"] = function(ptr, len) {
                 return swift.memory.retain(decodeString(ptr, len));
             }
             bjs["swift_js_init_memory_with_result"] = function(ptr, len) {
-                const target = new Uint8Array(memory.buffer, ptr, len);
+                const target = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0);
                 target.set(tmpRetBytes);
                 tmpRetBytes = undefined;
             }
@@ -221,6 +221,14 @@ export async function createInstantiator(options, swift) {
                 const copy = memory.buffer.slice(ptr, ptr + byteLen);
                 taStack.push(Array.from(new Ctor(copy)));
             }
+            bjs["bjs_core_register_type_handles"] = function() {};
+            const __bjs_promiseSettlers = Symbol("JavaScriptKit.promiseSettlers");
+            bjs["swift_js_make_promise"] = function() {
+                let resolve, reject;
+                const promise = new Promise((res, rej) => { resolve = res; reject = rej; });
+                promise[__bjs_promiseSettlers] = { resolve, reject };
+                return swift.memory.retain(promise);
+            }
             bjs["swift_js_return_optional_bool"] = function(isSome, value) {
                 if (isSome === 0) {
                     tmpRetOptionalBool = null;
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/AsyncStaticImport.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/AsyncStaticImport.js
index 6b6698377..eea340c35 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/AsyncStaticImport.js
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/AsyncStaticImport.js
@@ -128,7 +128,7 @@ export async function createInstantiator(options, swift) {
         const state = { pointer, file, line, unregistered: false };
         const real = (...args) => {
             if (state.unregistered) {
-                const bytes = new Uint8Array(memory.buffer, state.file);
+                const bytes = new Uint8Array(memory.buffer, state.file >>> 0);
                 let length = 0;
                 while (bytes[length] !== 0) { length += 1; }
                 const fileID = decodeString(state.file, length);
@@ -153,20 +153,21 @@ export async function createInstantiator(options, swift) {
         addImports: (importObject, importsContext) => {
             bjs = {};
             importObject["bjs"] = bjs;
+            const imports = options.getImports(importsContext);
             bjs["swift_js_return_string"] = function(ptr, len) {
                 tmpRetString = decodeString(ptr, len);
             }
             bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) {
                 const source = swift.memory.getObject(sourceId);
                 swift.memory.release(sourceId);
-                const bytes = new Uint8Array(memory.buffer, bytesPtr);
+                const bytes = new Uint8Array(memory.buffer, bytesPtr >>> 0);
                 bytes.set(source);
             }
             bjs["swift_js_make_js_string"] = function(ptr, len) {
                 return swift.memory.retain(decodeString(ptr, len));
             }
             bjs["swift_js_init_memory_with_result"] = function(ptr, len) {
-                const target = new Uint8Array(memory.buffer, ptr, len);
+                const target = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0);
                 target.set(tmpRetBytes);
                 tmpRetBytes = undefined;
             }
@@ -220,6 +221,14 @@ export async function createInstantiator(options, swift) {
                 const copy = memory.buffer.slice(ptr, ptr + byteLen);
                 taStack.push(Array.from(new Ctor(copy)));
             }
+            bjs["bjs_core_register_type_handles"] = function() {};
+            const __bjs_promiseSettlers = Symbol("JavaScriptKit.promiseSettlers");
+            bjs["swift_js_make_promise"] = function() {
+                let resolve, reject;
+                const promise = new Promise((res, rej) => { resolve = res; reject = rej; });
+                promise[__bjs_promiseSettlers] = { resolve, reject };
+                return swift.memory.retain(promise);
+            }
             bjs["swift_js_return_optional_bool"] = function(isSome, value) {
                 if (isSome === 0) {
                     tmpRetOptionalBool = null;
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ClassWithNestedTypes.d.ts b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ClassWithNestedTypes.d.ts
new file mode 100644
index 000000000..5537696c4
--- /dev/null
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ClassWithNestedTypes.d.ts
@@ -0,0 +1,51 @@
+// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit,
+// DO NOT EDIT.
+//
+// To update this file, just rebuild your project or run
+// `swift package bridge-js`.
+
+export type RoleObject = typeof Account.RoleValues;
+
+export namespace Account {
+    const RoleValues: {
+        readonly Admin: "admin";
+        readonly Guest: "guest";
+    };
+    type RoleTag = typeof RoleValues[keyof typeof RoleValues];
+    export interface Credentials {
+        token: string;
+    }
+}
+/// Represents a Swift heap object like a class instance or an actor instance.
+export interface SwiftHeapObject {
+    /// Release the heap object.
+    ///
+    /// Note: Calling this method will release the heap object and it will no longer be accessible.
+    release(): void;
+}
+export interface Account extends SwiftHeapObject {
+    describe(): string;
+    name: string;
+    readonly role: Account.RoleTag;
+}
+export type Exports = {
+    Account: {
+        new(name: string): Account;
+        readonly defaultRole: Account.RoleTag;
+        Role: RoleObject
+        Credentials: {
+            init(token: string): Account.Credentials;
+            readonly maxLength: number;
+            empty(): Account.Credentials;
+        },
+    },
+}
+export type Imports = {
+}
+export function createInstantiator(options: {
+    imports: Imports;
+}, swift: any): Promise<{
+    addImports: (importObject: WebAssembly.Imports) => void;
+    setInstance: (instance: WebAssembly.Instance) => void;
+    createExports: (instance: WebAssembly.Instance) => Exports;
+}>;
\ No newline at end of file
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ClassWithNestedTypes.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ClassWithNestedTypes.js
new file mode 100644
index 000000000..ecdb0b059
--- /dev/null
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ClassWithNestedTypes.js
@@ -0,0 +1,377 @@
+// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit,
+// DO NOT EDIT.
+//
+// To update this file, just rebuild your project or run
+// `swift package bridge-js`.
+
+export const RoleValues = {
+    Admin: "admin",
+    Guest: "guest",
+};
+
+export async function createInstantiator(options, swift) {
+    let instance;
+    let memory;
+    let setException;
+    let decodeString;
+    const textDecoder = new TextDecoder("utf-8");
+    const textEncoder = new TextEncoder("utf-8");
+    let tmpRetString;
+    let tmpRetBytes;
+    let tmpRetException;
+    let tmpRetOptionalBool;
+    let tmpRetOptionalInt;
+    let tmpRetOptionalFloat;
+    let tmpRetOptionalDouble;
+    let tmpRetOptionalHeapObject;
+    let strStack = [];
+    let i32Stack = [];
+    let i64Stack = [];
+    let f32Stack = [];
+    let f64Stack = [];
+    let ptrStack = [];
+    let taStack = [];
+    const enumHelpers = {};
+    const structHelpers = {};
+
+    let _exports = null;
+    let bjs = null;
+    const __bjs_createStructHelpers_M10TestModuleT7AccountT11Credentials = () => ({
+        lower: (value) => {
+            const bytes = textEncoder.encode(value.token);
+            const id = swift.memory.retain(bytes);
+            i32Stack.push(bytes.length);
+            i32Stack.push(id);
+        },
+        lift: () => {
+            const string = strStack.pop();
+            return { token: string };
+        }
+    });
+
+    return {
+        /**
+         * @param {WebAssembly.Imports} importObject
+         */
+        addImports: (importObject, importsContext) => {
+            bjs = {};
+            importObject["bjs"] = bjs;
+            bjs["swift_js_return_string"] = function(ptr, len) {
+                tmpRetString = decodeString(ptr, len);
+            }
+            bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) {
+                const source = swift.memory.getObject(sourceId);
+                swift.memory.release(sourceId);
+                const bytes = new Uint8Array(memory.buffer, bytesPtr >>> 0);
+                bytes.set(source);
+            }
+            bjs["swift_js_make_js_string"] = function(ptr, len) {
+                return swift.memory.retain(decodeString(ptr, len));
+            }
+            bjs["swift_js_init_memory_with_result"] = function(ptr, len) {
+                const target = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0);
+                target.set(tmpRetBytes);
+                tmpRetBytes = undefined;
+            }
+            bjs["swift_js_throw"] = function(id) {
+                tmpRetException = swift.memory.retainByRef(id);
+            }
+            bjs["swift_js_retain"] = function(id) {
+                return swift.memory.retainByRef(id);
+            }
+            bjs["swift_js_release"] = function(id) {
+                swift.memory.release(id);
+            }
+            bjs["swift_js_push_i32"] = function(v) {
+                i32Stack.push(v | 0);
+            }
+            bjs["swift_js_push_f32"] = function(v) {
+                f32Stack.push(Math.fround(v));
+            }
+            bjs["swift_js_push_f64"] = function(v) {
+                f64Stack.push(v);
+            }
+            bjs["swift_js_push_string"] = function(ptr, len) {
+                const value = decodeString(ptr, len);
+                strStack.push(value);
+            }
+            bjs["swift_js_pop_i32"] = function() {
+                return i32Stack.pop();
+            }
+            bjs["swift_js_pop_f32"] = function() {
+                return f32Stack.pop();
+            }
+            bjs["swift_js_pop_f64"] = function() {
+                return f64Stack.pop();
+            }
+            bjs["swift_js_push_pointer"] = function(pointer) {
+                ptrStack.push(pointer);
+            }
+            bjs["swift_js_pop_pointer"] = function() {
+                return ptrStack.pop();
+            }
+            bjs["swift_js_push_i64"] = function(v) {
+                i64Stack.push(v);
+            }
+            bjs["swift_js_pop_i64"] = function() {
+                return i64Stack.pop();
+            }
+            const taCtors = [Int8Array, Uint8Array, Int16Array, Uint16Array, Int32Array, Uint32Array, Float32Array, Float64Array];
+            bjs["swift_js_push_typed_array"] = function(kind, ptr, count) {
+                const Ctor = taCtors[kind];
+                const byteLen = count * Ctor.BYTES_PER_ELEMENT;
+                const copy = memory.buffer.slice(ptr, ptr + byteLen);
+                taStack.push(Array.from(new Ctor(copy)));
+            }
+            bjs["swift_js_struct_lower_Account_Credentials"] = function(objectId) {
+                structHelpers.M10TestModuleT7AccountT11Credentials.lower(swift.memory.getObject(objectId));
+            }
+            bjs["swift_js_struct_lift_Account_Credentials"] = function() {
+                const value = structHelpers.M10TestModuleT7AccountT11Credentials.lift();
+                return swift.memory.retain(value);
+            }
+            bjs["bjs_core_register_type_handles"] = function() {};
+            bjs["bjs_TestModule_register_type_handles"] = function() {};
+            const __bjs_promiseSettlers = Symbol("JavaScriptKit.promiseSettlers");
+            bjs["swift_js_make_promise"] = function() {
+                let resolve, reject;
+                const promise = new Promise((res, rej) => { resolve = res; reject = rej; });
+                promise[__bjs_promiseSettlers] = { resolve, reject };
+                return swift.memory.retain(promise);
+            }
+            bjs["swift_js_return_optional_bool"] = function(isSome, value) {
+                if (isSome === 0) {
+                    tmpRetOptionalBool = null;
+                } else {
+                    tmpRetOptionalBool = value !== 0;
+                }
+            }
+            bjs["swift_js_return_optional_int"] = function(isSome, value) {
+                if (isSome === 0) {
+                    tmpRetOptionalInt = null;
+                } else {
+                    tmpRetOptionalInt = value | 0;
+                }
+            }
+            bjs["swift_js_return_optional_float"] = function(isSome, value) {
+                if (isSome === 0) {
+                    tmpRetOptionalFloat = null;
+                } else {
+                    tmpRetOptionalFloat = Math.fround(value);
+                }
+            }
+            bjs["swift_js_return_optional_double"] = function(isSome, value) {
+                if (isSome === 0) {
+                    tmpRetOptionalDouble = null;
+                } else {
+                    tmpRetOptionalDouble = value;
+                }
+            }
+            bjs["swift_js_return_optional_string"] = function(isSome, ptr, len) {
+                if (isSome === 0) {
+                    tmpRetString = null;
+                } else {
+                    tmpRetString = decodeString(ptr, len);
+                }
+            }
+            bjs["swift_js_return_optional_object"] = function(isSome, objectId) {
+                if (isSome === 0) {
+                    tmpRetString = null;
+                } else {
+                    tmpRetString = swift.memory.getObject(objectId);
+                }
+            }
+            bjs["swift_js_return_optional_heap_object"] = function(isSome, pointer) {
+                if (isSome === 0) {
+                    tmpRetOptionalHeapObject = null;
+                } else {
+                    tmpRetOptionalHeapObject = pointer;
+                }
+            }
+            bjs["swift_js_get_optional_int_presence"] = function() {
+                return tmpRetOptionalInt != null ? 1 : 0;
+            }
+            bjs["swift_js_get_optional_int_value"] = function() {
+                const value = tmpRetOptionalInt;
+                tmpRetOptionalInt = undefined;
+                return value;
+            }
+            bjs["swift_js_get_optional_string"] = function() {
+                const str = tmpRetString;
+                tmpRetString = undefined;
+                if (str == null) {
+                    return -1;
+                } else {
+                    const bytes = textEncoder.encode(str);
+                    tmpRetBytes = bytes;
+                    return bytes.length;
+                }
+            }
+            bjs["swift_js_get_optional_float_presence"] = function() {
+                return tmpRetOptionalFloat != null ? 1 : 0;
+            }
+            bjs["swift_js_get_optional_float_value"] = function() {
+                const value = tmpRetOptionalFloat;
+                tmpRetOptionalFloat = undefined;
+                return value;
+            }
+            bjs["swift_js_get_optional_double_presence"] = function() {
+                return tmpRetOptionalDouble != null ? 1 : 0;
+            }
+            bjs["swift_js_get_optional_double_value"] = function() {
+                const value = tmpRetOptionalDouble;
+                tmpRetOptionalDouble = undefined;
+                return value;
+            }
+            bjs["swift_js_get_optional_heap_object_pointer"] = function() {
+                const pointer = tmpRetOptionalHeapObject;
+                tmpRetOptionalHeapObject = undefined;
+                return pointer || 0;
+            }
+            bjs["swift_js_closure_unregister"] = function(funcRef) {}
+            // Wrapper functions for module: TestModule
+            if (!importObject["TestModule"]) {
+                importObject["TestModule"] = {};
+            }
+            importObject["TestModule"]["bjs_Account_wrap"] = function(pointer) {
+                const obj = _exports['Account'].__construct(pointer);
+                return swift.memory.retain(obj);
+            };
+        },
+        setInstance: (i) => {
+            instance = i;
+            memory = instance.exports.memory;
+
+            decodeString = (ptr, len) => { const bytes = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); return textDecoder.decode(bytes); }
+
+            setException = (error) => {
+                instance.exports._swift_js_exception.value = swift.memory.retain(error)
+            }
+        },
+        /** @param {WebAssembly.Instance} instance */
+        createExports: (instance) => {
+            const js = swift.memory.heap;
+            const swiftHeapObjectFinalizationRegistry = (typeof FinalizationRegistry === "undefined") ? { register: () => {}, unregister: () => {} } : new FinalizationRegistry((state) => {
+                if (state.hasReleased) {
+                    return;
+                }
+                state.hasReleased = true;
+                state.identityMap?.delete(state.pointer);
+                state.deinit(state.pointer);
+            });
+
+            /// Represents a Swift heap object like a class instance or an actor instance.
+            class SwiftHeapObject {
+                static __wrap(pointer, deinit, prototype, identityCache) {
+                    pointer = pointer >>> 0;
+                    const makeFresh = (identityMap) => {
+                        const obj = Object.create(prototype);
+                        const state = { pointer, deinit, hasReleased: false, identityMap };
+                        obj.pointer = pointer;
+                        obj.__swiftHeapObjectState = state;
+                        swiftHeapObjectFinalizationRegistry.register(obj, state, state);
+                        if (identityMap) {
+                            identityMap.set(pointer, new WeakRef(obj));
+                        }
+                        return obj;
+                    };
+
+                    if (!identityCache) {
+                        return makeFresh(null);
+                    }
+
+                    const cached = identityCache.get(pointer)?.deref();
+                    if (cached && !cached.__swiftHeapObjectState.hasReleased) {
+                        deinit(pointer);
+                        return cached;
+                    }
+                    if (identityCache.has(pointer)) {
+                        identityCache.delete(pointer);
+                    }
+
+                    return makeFresh(identityCache);
+                }
+
+                release() {
+                    const state = this.__swiftHeapObjectState;
+                    if (state.hasReleased) {
+                        return;
+                    }
+                    state.hasReleased = true;
+                    swiftHeapObjectFinalizationRegistry.unregister(state);
+                    state.identityMap?.delete(state.pointer);
+                    state.deinit(state.pointer);
+                }
+            }
+            class Account extends SwiftHeapObject {
+                static __construct(ptr) {
+                    return SwiftHeapObject.__wrap(ptr, instance.exports.bjs_Account_deinit, Account.prototype, null);
+                }
+
+                constructor(name) {
+                    const nameBytes = textEncoder.encode(name);
+                    const nameId = swift.memory.retain(nameBytes);
+                    const ret = instance.exports.bjs_Account_init(nameId, nameBytes.length);
+                    return Account.__construct(ret);
+                }
+                describe() {
+                    instance.exports.bjs_Account_describe(this.pointer);
+                    const ret = tmpRetString;
+                    tmpRetString = undefined;
+                    return ret;
+                }
+                get name() {
+                    instance.exports.bjs_Account_name_get(this.pointer);
+                    const ret = tmpRetString;
+                    tmpRetString = undefined;
+                    return ret;
+                }
+                set name(value) {
+                    const valueBytes = textEncoder.encode(value);
+                    const valueId = swift.memory.retain(valueBytes);
+                    instance.exports.bjs_Account_name_set(this.pointer, valueId, valueBytes.length);
+                }
+                get role() {
+                    instance.exports.bjs_Account_role_get(this.pointer);
+                    const ret = tmpRetString;
+                    tmpRetString = undefined;
+                    return ret;
+                }
+                static get defaultRole() {
+                    instance.exports.bjs_Account_static_defaultRole_get();
+                    const ret = tmpRetString;
+                    tmpRetString = undefined;
+                    return ret;
+                }
+            }
+            const __bjs_helpers_M10TestModuleT7AccountT11Credentials = __bjs_createStructHelpers_M10TestModuleT7AccountT11Credentials();
+            structHelpers.M10TestModuleT7AccountT11Credentials = __bjs_helpers_M10TestModuleT7AccountT11Credentials;
+
+            const exports = {
+                Account: Object.assign(Account, {
+                    Role: RoleValues,
+                    Credentials: {
+                        init: function(token) {
+                            const tokenBytes = textEncoder.encode(token);
+                            const tokenId = swift.memory.retain(tokenBytes);
+                            instance.exports.bjs_Account_Credentials_init(tokenId, tokenBytes.length);
+                            const structValue = structHelpers.M10TestModuleT7AccountT11Credentials.lift();
+                            return structValue;
+                        },
+                        get maxLength() {
+                            const ret = instance.exports.bjs_Account_Credentials_static_maxLength_get();
+                            return ret;
+                        },
+                        empty: function() {
+                            instance.exports.bjs_Account_Credentials_static_empty();
+                            const structValue = structHelpers.M10TestModuleT7AccountT11Credentials.lift();
+                            return structValue;
+                        },
+                    },
+                }),
+            };
+            _exports = exports;
+            return exports;
+        },
+    }
+}
\ No newline at end of file
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DefaultParameters.d.ts b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DefaultParameters.d.ts
index ac5658eb3..961b9fa5b 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DefaultParameters.d.ts
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DefaultParameters.d.ts
@@ -46,22 +46,6 @@ export interface ConstructorDefaults extends SwiftHeapObject {
     tag: string | null;
 }
 export type Exports = {
-    DefaultGreeter: {
-        new(name: string): DefaultGreeter;
-    }
-    EmptyGreeter: {
-        new(): EmptyGreeter;
-    }
-    ConstructorDefaults: {
-        /**
-         * @param name - Optional parameter (default: "Default")
-         * @param count - Optional parameter (default: 42)
-         * @param enabled - Optional parameter (default: true)
-         * @param status - Optional parameter (default: Status.Active)
-         * @param tag - Optional parameter (default: null)
-         */
-        new(name?: string, count?: number, enabled?: boolean, status?: StatusTag, tag?: string | null): ConstructorDefaults;
-    }
     /**
      * @param message - Optional parameter (default: "Hello World")
      */
@@ -143,6 +127,22 @@ export type Exports = {
      */
     testMixedWithArrayDefault(name?: string, values?: number[], enabled?: boolean): string;
     Status: StatusObject
+    ConstructorDefaults: {
+        /**
+         * @param name - Optional parameter (default: "Default")
+         * @param count - Optional parameter (default: 42)
+         * @param enabled - Optional parameter (default: true)
+         * @param status - Optional parameter (default: Status.Active)
+         * @param tag - Optional parameter (default: null)
+         */
+        new(name?: string, count?: number, enabled?: boolean, status?: StatusTag, tag?: string | null): ConstructorDefaults;
+    },
+    DefaultGreeter: {
+        new(name: string): DefaultGreeter;
+    },
+    EmptyGreeter: {
+        new(): EmptyGreeter;
+    },
     MathOperations: {
         /**
          * @param baseValue - Optional parameter (default: 0.0)
@@ -152,7 +152,7 @@ export type Exports = {
          * @param b - Optional parameter (default: 5.0)
          */
         subtract(a: number, b?: number): number;
-    }
+    },
 }
 export type Imports = {
 }
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DefaultParameters.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DefaultParameters.js
index 8f8463bf0..fe1fa7b54 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DefaultParameters.js
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DefaultParameters.js
@@ -37,7 +37,345 @@ export async function createInstantiator(options, swift) {
 
     let _exports = null;
     let bjs = null;
-    const __bjs_createConfigHelpers = () => ({
+    const __bjs_arrayCodecCache = new WeakMap();
+    function __bjs_arrayCodec(elementCodec) {
+        let codec = __bjs_arrayCodecCache.get(elementCodec);
+        if (codec !== undefined) {
+            return codec;
+        }
+        codec = {
+            lower(value) {
+                for (let i = 0; i < value.length; i++) {
+                    elementCodec.lower(value[i]);
+                }
+                i32Stack.push(value.length);
+            },
+            lift() {
+                const count = i32Stack.pop();
+                if (count === -1) {
+                    return taStack.pop();
+                }
+                const result = new Array(count);
+                for (let i = count - 1; i >= 0; i--) {
+                    result[i] = elementCodec.lift();
+                }
+                return result;
+            },
+        };
+        __bjs_arrayCodecCache.set(elementCodec, codec);
+        return codec;
+    }
+    const __bjs_optionalCodecCache = new WeakMap();
+    const __bjs_optionalCodecUndefinedOrCache = new WeakMap();
+    function __bjs_optionalCodec(elementCodec, isUndefinedOr = false) {
+        const cache = isUndefinedOr ? __bjs_optionalCodecUndefinedOrCache : __bjs_optionalCodecCache;
+        let codec = cache.get(elementCodec);
+        if (codec !== undefined) {
+            return codec;
+        }
+        codec = {
+            lower(value) {
+                const isSome = isUndefinedOr ? value !== undefined : value != null;
+                if (isSome) {
+                    elementCodec.lower(value);
+                    i32Stack.push(1);
+                } else {
+                    i32Stack.push(0);
+                }
+            },
+            lift() {
+                if (i32Stack.pop() === 0) {
+                    return isUndefinedOr ? undefined : null;
+                }
+                return elementCodec.lift();
+            },
+        };
+        cache.set(elementCodec, codec);
+        return codec;
+    }
+    const __bjs_dictCodecCache = new WeakMap();
+    function __bjs_dictCodec(valueCodec) {
+        let codec = __bjs_dictCodecCache.get(valueCodec);
+        if (codec !== undefined) {
+            return codec;
+        }
+        codec = {
+            lower(value) {
+                const keys = Object.keys(value);
+                for (let i = 0; i < keys.length; i++) {
+                    __bjs_stringCodec.lower(keys[i]);
+                    valueCodec.lower(value[keys[i]]);
+                }
+                i32Stack.push(keys.length);
+            },
+            lift() {
+                const count = i32Stack.pop();
+                const result = {};
+                for (let i = 0; i < count; i++) {
+                    const value = valueCodec.lift();
+                    const key = __bjs_stringCodec.lift();
+                    result[key] = value;
+                }
+                return result;
+            },
+        };
+        __bjs_dictCodecCache.set(valueCodec, codec);
+        return codec;
+    }
+
+    const __bjs_stringCodec = {
+        lower: (v) => {
+            const bytes = textEncoder.encode(v);
+            const id = swift.memory.retain(bytes);
+            i32Stack.push(bytes.length);
+            i32Stack.push(id);
+        },
+        lift: () => {
+            const string = strStack.pop();
+            return string;
+        },
+    };
+    const __bjs_primitiveCodecs = {
+        Bool: {
+            lower: (v) => {
+                i32Stack.push(v ? 1 : 0);
+            },
+            lift: () => {
+                const bool = i32Stack.pop() !== 0;
+                return bool;
+            },
+        },
+        Int: {
+            lower: (v) => {
+                i32Stack.push((v | 0));
+            },
+            lift: () => {
+                const int = i32Stack.pop();
+                return int;
+            },
+        },
+        Int8: {
+            lower: (v) => {
+                i32Stack.push((v | 0));
+            },
+            lift: () => {
+                const int = i32Stack.pop();
+                return int;
+            },
+        },
+        UInt8: {
+            lower: (v) => {
+                i32Stack.push((v | 0));
+            },
+            lift: () => {
+                const int = i32Stack.pop() >>> 0;
+                return int;
+            },
+        },
+        Int16: {
+            lower: (v) => {
+                i32Stack.push((v | 0));
+            },
+            lift: () => {
+                const int = i32Stack.pop();
+                return int;
+            },
+        },
+        UInt16: {
+            lower: (v) => {
+                i32Stack.push((v | 0));
+            },
+            lift: () => {
+                const int = i32Stack.pop() >>> 0;
+                return int;
+            },
+        },
+        Int32: {
+            lower: (v) => {
+                i32Stack.push((v | 0));
+            },
+            lift: () => {
+                const int = i32Stack.pop();
+                return int;
+            },
+        },
+        UInt32: {
+            lower: (v) => {
+                i32Stack.push((v | 0));
+            },
+            lift: () => {
+                const int = i32Stack.pop() >>> 0;
+                return int;
+            },
+        },
+        UInt: {
+            lower: (v) => {
+                i32Stack.push((v | 0));
+            },
+            lift: () => {
+                const int = i32Stack.pop() >>> 0;
+                return int;
+            },
+        },
+        Int64: {
+            lower: (v) => {
+                i64Stack.push(v);
+            },
+            lift: () => {
+                const int = i64Stack.pop();
+                return int;
+            },
+        },
+        UInt64: {
+            lower: (v) => {
+                i64Stack.push(v);
+            },
+            lift: () => {
+                const int = i64Stack.pop();
+                return int;
+            },
+        },
+        Float: {
+            lower: (v) => {
+                f32Stack.push(Math.fround(v));
+            },
+            lift: () => {
+                const f32 = f32Stack.pop();
+                return f32;
+            },
+        },
+        Double: {
+            lower: (v) => {
+                f64Stack.push(v);
+            },
+            lift: () => {
+                const f64 = f64Stack.pop();
+                return f64;
+            },
+        },
+        String: __bjs_stringCodec,
+        JSValue: {
+            lower: (v) => {
+                const [vKind, vPayload1, vPayload2] = __bjs_jsValueLower(v);
+                i32Stack.push(vKind);
+                i32Stack.push(vPayload1);
+                f64Stack.push(vPayload2);
+            },
+            lift: () => {
+                const jsValuePayload2 = f64Stack.pop();
+                const jsValuePayload1 = i32Stack.pop();
+                const jsValueKind = i32Stack.pop();
+                const jsValue = __bjs_jsValueLift(jsValueKind, jsValuePayload1, jsValuePayload2);
+                return jsValue;
+            },
+        },
+    };
+
+    function __bjs_jsValueLower(value) {
+        let kind;
+        let payload1;
+        let payload2;
+        if (value === null) {
+            kind = 4;
+            payload1 = 0;
+            payload2 = 0;
+        } else {
+            switch (typeof value) {
+                case "boolean":
+                    kind = 0;
+                    payload1 = value ? 1 : 0;
+                    payload2 = 0;
+                    break;
+                case "number":
+                    kind = 2;
+                    payload1 = 0;
+                    payload2 = value;
+                    break;
+                case "string":
+                    kind = 1;
+                    payload1 = swift.memory.retain(value);
+                    payload2 = 0;
+                    break;
+                case "undefined":
+                    kind = 5;
+                    payload1 = 0;
+                    payload2 = 0;
+                    break;
+                case "object":
+                    kind = 3;
+                    payload1 = swift.memory.retain(value);
+                    payload2 = 0;
+                    break;
+                case "function":
+                    kind = 3;
+                    payload1 = swift.memory.retain(value);
+                    payload2 = 0;
+                    break;
+                case "symbol":
+                    kind = 7;
+                    payload1 = swift.memory.retain(value);
+                    payload2 = 0;
+                    break;
+                case "bigint":
+                    kind = 8;
+                    payload1 = swift.memory.retain(value);
+                    payload2 = 0;
+                    break;
+                default:
+                    throw new TypeError("Unsupported JSValue type");
+            }
+        }
+        return [kind, payload1, payload2];
+    }
+    function __bjs_jsValueLift(kind, payload1, payload2) {
+        let jsValue;
+        switch (kind) {
+            case 0:
+                jsValue = payload1 !== 0;
+                break;
+            case 1:
+                jsValue = swift.memory.getObject(payload1);
+                break;
+            case 2:
+                jsValue = payload2;
+                break;
+            case 3:
+                jsValue = swift.memory.getObject(payload1);
+                break;
+            case 4:
+                jsValue = null;
+                break;
+            case 5:
+                jsValue = undefined;
+                break;
+            case 7:
+                jsValue = swift.memory.getObject(payload1);
+                break;
+            case 8:
+                jsValue = swift.memory.getObject(payload1);
+                break;
+            default:
+                throw new TypeError("Unsupported JSValue kind " + kind);
+        }
+        return jsValue;
+    }
+
+    const __bjs_codec_M10TestModuleT6Config = {
+        lower: (v) => {
+            structHelpers.M10TestModuleT6Config.lower(v);
+        },
+        lift: () => {
+            const struct = structHelpers.M10TestModuleT6Config.lift();
+            return struct;
+        },
+    };
+    const __bjs_codec_Optional_M10TestModuleT6Config = __bjs_optionalCodec(__bjs_codec_M10TestModuleT6Config);
+    const __bjs_codec_Array_Int = __bjs_arrayCodec(__bjs_primitiveCodecs.Int);
+    const __bjs_codec_Array_String = __bjs_arrayCodec(__bjs_stringCodec);
+    const __bjs_codec_Array_Double = __bjs_arrayCodec(__bjs_primitiveCodecs.Double);
+    const __bjs_codec_Array_Bool = __bjs_arrayCodec(__bjs_primitiveCodecs.Bool);
+
+    const __bjs_createStructHelpers_M10TestModuleT6Config = () => ({
         lower: (value) => {
             const bytes = textEncoder.encode(value.name);
             const id = swift.memory.retain(bytes);
@@ -53,7 +391,7 @@ export async function createInstantiator(options, swift) {
             return { name: string, value: int, enabled: bool };
         }
     });
-    const __bjs_createMathOperationsHelpers = () => ({
+    const __bjs_createStructHelpers_M10TestModuleT14MathOperations = () => ({
         lower: (value) => {
             f64Stack.push(value.baseValue);
         },
@@ -61,14 +399,14 @@ export async function createInstantiator(options, swift) {
             const f64 = f64Stack.pop();
             const instance1 = { baseValue: f64 };
             instance1.add = function(a, b = 10.0) {
-                structHelpers.MathOperations.lower(this);
+                structHelpers.M10TestModuleT14MathOperations.lower(this);
                 const ret = instance.exports.bjs_MathOperations_add(a, b);
                 return ret;
             }.bind(instance1);
             instance1.multiply = function(a, b) {
-                structHelpers.MathOperations.lower(this);
-                const ret = instance.exports.bjs_MathOperations_multiply(a, b);
-                return ret;
+                structHelpers.M10TestModuleT14MathOperations.lower(this);
+                const ret1 = instance.exports.bjs_MathOperations_multiply(a, b);
+                return ret1;
             }.bind(instance1);
             return instance1;
         }
@@ -87,14 +425,14 @@ export async function createInstantiator(options, swift) {
             bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) {
                 const source = swift.memory.getObject(sourceId);
                 swift.memory.release(sourceId);
-                const bytes = new Uint8Array(memory.buffer, bytesPtr);
+                const bytes = new Uint8Array(memory.buffer, bytesPtr >>> 0);
                 bytes.set(source);
             }
             bjs["swift_js_make_js_string"] = function(ptr, len) {
                 return swift.memory.retain(decodeString(ptr, len));
             }
             bjs["swift_js_init_memory_with_result"] = function(ptr, len) {
-                const target = new Uint8Array(memory.buffer, ptr, len);
+                const target = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0);
                 target.set(tmpRetBytes);
                 tmpRetBytes = undefined;
             }
@@ -149,19 +487,28 @@ export async function createInstantiator(options, swift) {
                 taStack.push(Array.from(new Ctor(copy)));
             }
             bjs["swift_js_struct_lower_Config"] = function(objectId) {
-                structHelpers.Config.lower(swift.memory.getObject(objectId));
+                structHelpers.M10TestModuleT6Config.lower(swift.memory.getObject(objectId));
             }
             bjs["swift_js_struct_lift_Config"] = function() {
-                const value = structHelpers.Config.lift();
+                const value = structHelpers.M10TestModuleT6Config.lift();
                 return swift.memory.retain(value);
             }
             bjs["swift_js_struct_lower_MathOperations"] = function(objectId) {
-                structHelpers.MathOperations.lower(swift.memory.getObject(objectId));
+                structHelpers.M10TestModuleT14MathOperations.lower(swift.memory.getObject(objectId));
             }
             bjs["swift_js_struct_lift_MathOperations"] = function() {
-                const value = structHelpers.MathOperations.lift();
+                const value = structHelpers.M10TestModuleT14MathOperations.lift();
                 return swift.memory.retain(value);
             }
+            bjs["bjs_core_register_type_handles"] = function() {};
+            bjs["bjs_TestModule_register_type_handles"] = function() {};
+            const __bjs_promiseSettlers = Symbol("JavaScriptKit.promiseSettlers");
+            bjs["swift_js_make_promise"] = function() {
+                let resolve, reject;
+                const promise = new Promise((res, rej) => { resolve = res; reject = rej; });
+                promise[__bjs_promiseSettlers] = { resolve, reject };
+                return swift.memory.retain(promise);
+            }
             bjs["swift_js_return_optional_bool"] = function(isSome, value) {
                 if (isSome === 0) {
                     tmpRetOptionalBool = null;
@@ -294,6 +641,7 @@ export async function createInstantiator(options, swift) {
             /// Represents a Swift heap object like a class instance or an actor instance.
             class SwiftHeapObject {
                 static __wrap(pointer, deinit, prototype, identityCache) {
+                    pointer = pointer >>> 0;
                     const makeFresh = (identityMap) => {
                         const obj = Object.create(prototype);
                         const state = { pointer, deinit, hasReleased: false, identityMap };
@@ -441,16 +789,13 @@ export async function createInstantiator(options, swift) {
                     instance.exports.bjs_ConstructorDefaults_tag_set(this.pointer, +isSome, result, result1);
                 }
             }
-            const ConfigHelpers = __bjs_createConfigHelpers();
-            structHelpers.Config = ConfigHelpers;
+            const __bjs_helpers_M10TestModuleT6Config = __bjs_createStructHelpers_M10TestModuleT6Config();
+            structHelpers.M10TestModuleT6Config = __bjs_helpers_M10TestModuleT6Config;
 
-            const MathOperationsHelpers = __bjs_createMathOperationsHelpers();
-            structHelpers.MathOperations = MathOperationsHelpers;
+            const __bjs_helpers_M10TestModuleT14MathOperations = __bjs_createStructHelpers_M10TestModuleT14MathOperations();
+            structHelpers.M10TestModuleT14MathOperations = __bjs_helpers_M10TestModuleT14MathOperations;
 
             const exports = {
-                DefaultGreeter,
-                EmptyGreeter,
-                ConstructorDefaults,
                 testStringDefault: function bjs_testStringDefault(message = "Hello World") {
                     const messageBytes = textEncoder.encode(message);
                     const messageId = swift.memory.retain(messageBytes);
@@ -530,147 +875,64 @@ export async function createInstantiator(options, swift) {
                     return EmptyGreeter.__construct(ret);
                 },
                 testOptionalStructDefault: function bjs_testOptionalStructDefault(point = null) {
-                    const isSome = point != null;
-                    if (isSome) {
-                        structHelpers.Config.lower(point);
-                    }
-                    i32Stack.push(+isSome);
+                    __bjs_codec_Optional_M10TestModuleT6Config.lower(point);
                     instance.exports.bjs_testOptionalStructDefault();
-                    const isSome1 = i32Stack.pop();
-                    const optResult = isSome1 ? structHelpers.Config.lift() : null;
-                    return optResult;
+                    const optValue = __bjs_codec_Optional_M10TestModuleT6Config.lift();
+                    return optValue;
                 },
                 testOptionalStructWithValueDefault: function bjs_testOptionalStructWithValueDefault(point = { name: "default", value: 42, enabled: true }) {
-                    const isSome = point != null;
-                    if (isSome) {
-                        structHelpers.Config.lower(point);
-                    }
-                    i32Stack.push(+isSome);
+                    __bjs_codec_Optional_M10TestModuleT6Config.lower(point);
                     instance.exports.bjs_testOptionalStructWithValueDefault();
-                    const isSome1 = i32Stack.pop();
-                    const optResult = isSome1 ? structHelpers.Config.lift() : null;
-                    return optResult;
+                    const optValue = __bjs_codec_Optional_M10TestModuleT6Config.lift();
+                    return optValue;
                 },
                 testIntArrayDefault: function bjs_testIntArrayDefault(values = [1, 2, 3]) {
-                    for (const elem of values) {
-                        i32Stack.push((elem | 0));
-                    }
-                    i32Stack.push(values.length);
+                    __bjs_codec_Array_Int.lower(values);
                     instance.exports.bjs_testIntArrayDefault();
-                    const arrayLen = i32Stack.pop();
-                    let arrayResult;
-                    if (arrayLen === -1) {
-                        arrayResult = taStack.pop();
-                    } else {
-                        arrayResult = [];
-                        for (let i = 0; i < arrayLen; i++) {
-                            const int = i32Stack.pop();
-                            arrayResult.push(int);
-                        }
-                        arrayResult.reverse();
-                    }
+                    const arrayResult = __bjs_codec_Array_Int.lift();
                     return arrayResult;
                 },
                 testStringArrayDefault: function bjs_testStringArrayDefault(names = ["a", "b", "c"]) {
-                    for (const elem of names) {
-                        const bytes = textEncoder.encode(elem);
-                        const id = swift.memory.retain(bytes);
-                        i32Stack.push(bytes.length);
-                        i32Stack.push(id);
-                    }
-                    i32Stack.push(names.length);
+                    __bjs_codec_Array_String.lower(names);
                     instance.exports.bjs_testStringArrayDefault();
-                    const arrayLen = i32Stack.pop();
-                    let arrayResult;
-                    if (arrayLen === -1) {
-                        arrayResult = taStack.pop();
-                    } else {
-                        arrayResult = [];
-                        for (let i = 0; i < arrayLen; i++) {
-                            const string = strStack.pop();
-                            arrayResult.push(string);
-                        }
-                        arrayResult.reverse();
-                    }
+                    const arrayResult = __bjs_codec_Array_String.lift();
                     return arrayResult;
                 },
                 testDoubleArrayDefault: function bjs_testDoubleArrayDefault(values = [1.5, 2.5, 3.5]) {
-                    for (const elem of values) {
-                        f64Stack.push(elem);
-                    }
-                    i32Stack.push(values.length);
+                    __bjs_codec_Array_Double.lower(values);
                     instance.exports.bjs_testDoubleArrayDefault();
-                    const arrayLen = i32Stack.pop();
-                    let arrayResult;
-                    if (arrayLen === -1) {
-                        arrayResult = taStack.pop();
-                    } else {
-                        arrayResult = [];
-                        for (let i = 0; i < arrayLen; i++) {
-                            const f64 = f64Stack.pop();
-                            arrayResult.push(f64);
-                        }
-                        arrayResult.reverse();
-                    }
+                    const arrayResult = __bjs_codec_Array_Double.lift();
                     return arrayResult;
                 },
                 testBoolArrayDefault: function bjs_testBoolArrayDefault(flags = [true, false, true]) {
-                    for (const elem of flags) {
-                        i32Stack.push(elem ? 1 : 0);
-                    }
-                    i32Stack.push(flags.length);
+                    __bjs_codec_Array_Bool.lower(flags);
                     instance.exports.bjs_testBoolArrayDefault();
-                    const arrayLen = i32Stack.pop();
-                    let arrayResult;
-                    if (arrayLen === -1) {
-                        arrayResult = taStack.pop();
-                    } else {
-                        arrayResult = [];
-                        for (let i = 0; i < arrayLen; i++) {
-                            const bool = i32Stack.pop() !== 0;
-                            arrayResult.push(bool);
-                        }
-                        arrayResult.reverse();
-                    }
+                    const arrayResult = __bjs_codec_Array_Bool.lift();
                     return arrayResult;
                 },
                 testEmptyArrayDefault: function bjs_testEmptyArrayDefault(items = []) {
-                    for (const elem of items) {
-                        i32Stack.push((elem | 0));
-                    }
-                    i32Stack.push(items.length);
+                    __bjs_codec_Array_Int.lower(items);
                     instance.exports.bjs_testEmptyArrayDefault();
-                    const arrayLen = i32Stack.pop();
-                    let arrayResult;
-                    if (arrayLen === -1) {
-                        arrayResult = taStack.pop();
-                    } else {
-                        arrayResult = [];
-                        for (let i = 0; i < arrayLen; i++) {
-                            const int = i32Stack.pop();
-                            arrayResult.push(int);
-                        }
-                        arrayResult.reverse();
-                    }
+                    const arrayResult = __bjs_codec_Array_Int.lift();
                     return arrayResult;
                 },
                 testMixedWithArrayDefault: function bjs_testMixedWithArrayDefault(name = "test", values = [10, 20, 30], enabled = true) {
                     const nameBytes = textEncoder.encode(name);
                     const nameId = swift.memory.retain(nameBytes);
-                    for (const elem of values) {
-                        i32Stack.push((elem | 0));
-                    }
-                    i32Stack.push(values.length);
+                    __bjs_codec_Array_Int.lower(values);
                     instance.exports.bjs_testMixedWithArrayDefault(nameId, nameBytes.length, enabled);
                     const ret = tmpRetString;
                     tmpRetString = undefined;
                     return ret;
                 },
                 Status: StatusValues,
+                ConstructorDefaults,
+                DefaultGreeter,
+                EmptyGreeter,
                 MathOperations: {
                     init: function(baseValue = 0.0) {
                         instance.exports.bjs_MathOperations_init(baseValue);
-                        const structValue = structHelpers.MathOperations.lift();
+                        const structValue = structHelpers.M10TestModuleT14MathOperations.lift();
                         return structValue;
                     },
                     subtract: function(a, b = 5.0) {
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DictionaryTypes.d.ts b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DictionaryTypes.d.ts
index f14b29aa4..652177cd8 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DictionaryTypes.d.ts
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DictionaryTypes.d.ts
@@ -18,14 +18,14 @@ export interface SwiftHeapObject {
 export interface Box extends SwiftHeapObject {
 }
 export type Exports = {
-    Box: {
-    }
     mirrorDictionary(values: Record<string, number>): Record<string, number>;
     optionalDictionary(values: Record<string, string> | null): Record<string, string> | null;
     nestedDictionary(values: Record<string, number[]>): Record<string, number[]>;
     boxDictionary(boxes: Record<string, Box>): Record<string, Box>;
     optionalBoxDictionary(boxes: Record<string, Box | null>): Record<string, Box | null>;
     roundtripCounters(counters: Counters): Counters;
+    Box: {
+    },
 }
 export type Imports = {
     importMirrorDictionary(values: Record<string, number>): Record<string, number>;
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DictionaryTypes.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DictionaryTypes.js
index d040df41c..8ccda3c19 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DictionaryTypes.js
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DictionaryTypes.js
@@ -31,44 +31,363 @@ export async function createInstantiator(options, swift) {
 
     let _exports = null;
     let bjs = null;
-    const __bjs_createCountersHelpers = () => ({
+    const __bjs_arrayCodecCache = new WeakMap();
+    function __bjs_arrayCodec(elementCodec) {
+        let codec = __bjs_arrayCodecCache.get(elementCodec);
+        if (codec !== undefined) {
+            return codec;
+        }
+        codec = {
+            lower(value) {
+                for (let i = 0; i < value.length; i++) {
+                    elementCodec.lower(value[i]);
+                }
+                i32Stack.push(value.length);
+            },
+            lift() {
+                const count = i32Stack.pop();
+                if (count === -1) {
+                    return taStack.pop();
+                }
+                const result = new Array(count);
+                for (let i = count - 1; i >= 0; i--) {
+                    result[i] = elementCodec.lift();
+                }
+                return result;
+            },
+        };
+        __bjs_arrayCodecCache.set(elementCodec, codec);
+        return codec;
+    }
+    const __bjs_optionalCodecCache = new WeakMap();
+    const __bjs_optionalCodecUndefinedOrCache = new WeakMap();
+    function __bjs_optionalCodec(elementCodec, isUndefinedOr = false) {
+        const cache = isUndefinedOr ? __bjs_optionalCodecUndefinedOrCache : __bjs_optionalCodecCache;
+        let codec = cache.get(elementCodec);
+        if (codec !== undefined) {
+            return codec;
+        }
+        codec = {
+            lower(value) {
+                const isSome = isUndefinedOr ? value !== undefined : value != null;
+                if (isSome) {
+                    elementCodec.lower(value);
+                    i32Stack.push(1);
+                } else {
+                    i32Stack.push(0);
+                }
+            },
+            lift() {
+                if (i32Stack.pop() === 0) {
+                    return isUndefinedOr ? undefined : null;
+                }
+                return elementCodec.lift();
+            },
+        };
+        cache.set(elementCodec, codec);
+        return codec;
+    }
+    const __bjs_dictCodecCache = new WeakMap();
+    function __bjs_dictCodec(valueCodec) {
+        let codec = __bjs_dictCodecCache.get(valueCodec);
+        if (codec !== undefined) {
+            return codec;
+        }
+        codec = {
+            lower(value) {
+                const keys = Object.keys(value);
+                for (let i = 0; i < keys.length; i++) {
+                    __bjs_stringCodec.lower(keys[i]);
+                    valueCodec.lower(value[keys[i]]);
+                }
+                i32Stack.push(keys.length);
+            },
+            lift() {
+                const count = i32Stack.pop();
+                const result = {};
+                for (let i = 0; i < count; i++) {
+                    const value = valueCodec.lift();
+                    const key = __bjs_stringCodec.lift();
+                    result[key] = value;
+                }
+                return result;
+            },
+        };
+        __bjs_dictCodecCache.set(valueCodec, codec);
+        return codec;
+    }
+
+    const __bjs_stringCodec = {
+        lower: (v) => {
+            const bytes = textEncoder.encode(v);
+            const id = swift.memory.retain(bytes);
+            i32Stack.push(bytes.length);
+            i32Stack.push(id);
+        },
+        lift: () => {
+            const string = strStack.pop();
+            return string;
+        },
+    };
+    const __bjs_primitiveCodecs = {
+        Bool: {
+            lower: (v) => {
+                i32Stack.push(v ? 1 : 0);
+            },
+            lift: () => {
+                const bool = i32Stack.pop() !== 0;
+                return bool;
+            },
+        },
+        Int: {
+            lower: (v) => {
+                i32Stack.push((v | 0));
+            },
+            lift: () => {
+                const int = i32Stack.pop();
+                return int;
+            },
+        },
+        Int8: {
+            lower: (v) => {
+                i32Stack.push((v | 0));
+            },
+            lift: () => {
+                const int = i32Stack.pop();
+                return int;
+            },
+        },
+        UInt8: {
+            lower: (v) => {
+                i32Stack.push((v | 0));
+            },
+            lift: () => {
+                const int = i32Stack.pop() >>> 0;
+                return int;
+            },
+        },
+        Int16: {
+            lower: (v) => {
+                i32Stack.push((v | 0));
+            },
+            lift: () => {
+                const int = i32Stack.pop();
+                return int;
+            },
+        },
+        UInt16: {
+            lower: (v) => {
+                i32Stack.push((v | 0));
+            },
+            lift: () => {
+                const int = i32Stack.pop() >>> 0;
+                return int;
+            },
+        },
+        Int32: {
+            lower: (v) => {
+                i32Stack.push((v | 0));
+            },
+            lift: () => {
+                const int = i32Stack.pop();
+                return int;
+            },
+        },
+        UInt32: {
+            lower: (v) => {
+                i32Stack.push((v | 0));
+            },
+            lift: () => {
+                const int = i32Stack.pop() >>> 0;
+                return int;
+            },
+        },
+        UInt: {
+            lower: (v) => {
+                i32Stack.push((v | 0));
+            },
+            lift: () => {
+                const int = i32Stack.pop() >>> 0;
+                return int;
+            },
+        },
+        Int64: {
+            lower: (v) => {
+                i64Stack.push(v);
+            },
+            lift: () => {
+                const int = i64Stack.pop();
+                return int;
+            },
+        },
+        UInt64: {
+            lower: (v) => {
+                i64Stack.push(v);
+            },
+            lift: () => {
+                const int = i64Stack.pop();
+                return int;
+            },
+        },
+        Float: {
+            lower: (v) => {
+                f32Stack.push(Math.fround(v));
+            },
+            lift: () => {
+                const f32 = f32Stack.pop();
+                return f32;
+            },
+        },
+        Double: {
+            lower: (v) => {
+                f64Stack.push(v);
+            },
+            lift: () => {
+                const f64 = f64Stack.pop();
+                return f64;
+            },
+        },
+        String: __bjs_stringCodec,
+        JSValue: {
+            lower: (v) => {
+                const [vKind, vPayload1, vPayload2] = __bjs_jsValueLower(v);
+                i32Stack.push(vKind);
+                i32Stack.push(vPayload1);
+                f64Stack.push(vPayload2);
+            },
+            lift: () => {
+                const jsValuePayload2 = f64Stack.pop();
+                const jsValuePayload1 = i32Stack.pop();
+                const jsValueKind = i32Stack.pop();
+                const jsValue = __bjs_jsValueLift(jsValueKind, jsValuePayload1, jsValuePayload2);
+                return jsValue;
+            },
+        },
+    };
+
+    function __bjs_jsValueLower(value) {
+        let kind;
+        let payload1;
+        let payload2;
+        if (value === null) {
+            kind = 4;
+            payload1 = 0;
+            payload2 = 0;
+        } else {
+            switch (typeof value) {
+                case "boolean":
+                    kind = 0;
+                    payload1 = value ? 1 : 0;
+                    payload2 = 0;
+                    break;
+                case "number":
+                    kind = 2;
+                    payload1 = 0;
+                    payload2 = value;
+                    break;
+                case "string":
+                    kind = 1;
+                    payload1 = swift.memory.retain(value);
+                    payload2 = 0;
+                    break;
+                case "undefined":
+                    kind = 5;
+                    payload1 = 0;
+                    payload2 = 0;
+                    break;
+                case "object":
+                    kind = 3;
+                    payload1 = swift.memory.retain(value);
+                    payload2 = 0;
+                    break;
+                case "function":
+                    kind = 3;
+                    payload1 = swift.memory.retain(value);
+                    payload2 = 0;
+                    break;
+                case "symbol":
+                    kind = 7;
+                    payload1 = swift.memory.retain(value);
+                    payload2 = 0;
+                    break;
+                case "bigint":
+                    kind = 8;
+                    payload1 = swift.memory.retain(value);
+                    payload2 = 0;
+                    break;
+                default:
+                    throw new TypeError("Unsupported JSValue type");
+            }
+        }
+        return [kind, payload1, payload2];
+    }
+    function __bjs_jsValueLift(kind, payload1, payload2) {
+        let jsValue;
+        switch (kind) {
+            case 0:
+                jsValue = payload1 !== 0;
+                break;
+            case 1:
+                jsValue = swift.memory.getObject(payload1);
+                break;
+            case 2:
+                jsValue = payload2;
+                break;
+            case 3:
+                jsValue = swift.memory.getObject(payload1);
+                break;
+            case 4:
+                jsValue = null;
+                break;
+            case 5:
+                jsValue = undefined;
+                break;
+            case 7:
+                jsValue = swift.memory.getObject(payload1);
+                break;
+            case 8:
+                jsValue = swift.memory.getObject(payload1);
+                break;
+            default:
+                throw new TypeError("Unsupported JSValue kind " + kind);
+        }
+        return jsValue;
+    }
+
+    const __bjs_codec_Dict_Int = __bjs_dictCodec(__bjs_primitiveCodecs.Int);
+    const __bjs_codec_Dict_String = __bjs_dictCodec(__bjs_stringCodec);
+    const __bjs_codec_Optional_Dict_String = __bjs_optionalCodec(__bjs_codec_Dict_String);
+    const __bjs_codec_Array_Int = __bjs_arrayCodec(__bjs_primitiveCodecs.Int);
+    const __bjs_codec_Dict_Array_Int = __bjs_dictCodec(__bjs_codec_Array_Int);
+    const __bjs_codec_M10TestModuleT3Box = {
+        lower: (v) => {
+            ptrStack.push(v.pointer);
+        },
+        lift: () => {
+            const ptr = ptrStack.pop();
+            const obj = _exports['Box'].__construct(ptr);
+            return obj;
+        },
+    };
+    const __bjs_codec_Dict_M10TestModuleT3Box = __bjs_dictCodec(__bjs_codec_M10TestModuleT3Box);
+    const __bjs_codec_Optional_M10TestModuleT3Box = __bjs_optionalCodec(__bjs_codec_M10TestModuleT3Box);
+    const __bjs_codec_Dict_Optional_M10TestModuleT3Box = __bjs_dictCodec(__bjs_codec_Optional_M10TestModuleT3Box);
+    const __bjs_codec_Dict_Double = __bjs_dictCodec(__bjs_primitiveCodecs.Double);
+    const __bjs_codec_Optional_Int = __bjs_optionalCodec(__bjs_primitiveCodecs.Int);
+    const __bjs_codec_Dict_Optional_Int = __bjs_dictCodec(__bjs_codec_Optional_Int);
+
+    const __bjs_createStructHelpers_M10TestModuleT8Counters = () => ({
         lower: (value) => {
             const bytes = textEncoder.encode(value.name);
             const id = swift.memory.retain(bytes);
             i32Stack.push(bytes.length);
             i32Stack.push(id);
-            const entries = Object.entries(value.counts);
-            for (const entry of entries) {
-                const [key, value] = entry;
-                const bytes1 = textEncoder.encode(key);
-                const id1 = swift.memory.retain(bytes1);
-                i32Stack.push(bytes1.length);
-                i32Stack.push(id1);
-                const isSome = value != null ? 1 : 0;
-                if (isSome) {
-                    i32Stack.push((value | 0));
-                }
-                i32Stack.push(isSome);
-            }
-            i32Stack.push(entries.length);
+            __bjs_codec_Dict_Optional_Int.lower(value.counts);
         },
         lift: () => {
-            const dictLen = i32Stack.pop();
-            const dictResult = {};
-            for (let i = 0; i < dictLen; i++) {
-                const isSome = i32Stack.pop();
-                let optValue;
-                if (isSome === 0) {
-                    optValue = null;
-                } else {
-                    const int = i32Stack.pop();
-                    optValue = int;
-                }
-                const string = strStack.pop();
-                dictResult[string] = optValue;
-            }
-            const string1 = strStack.pop();
-            return { name: string1, counts: dictResult };
+            const dictResult = __bjs_codec_Dict_Optional_Int.lift();
+            const string = strStack.pop();
+            return { name: string, counts: dictResult };
         }
     });
 
@@ -86,14 +405,14 @@ export async function createInstantiator(options, swift) {
             bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) {
                 const source = swift.memory.getObject(sourceId);
                 swift.memory.release(sourceId);
-                const bytes = new Uint8Array(memory.buffer, bytesPtr);
+                const bytes = new Uint8Array(memory.buffer, bytesPtr >>> 0);
                 bytes.set(source);
             }
             bjs["swift_js_make_js_string"] = function(ptr, len) {
                 return swift.memory.retain(decodeString(ptr, len));
             }
             bjs["swift_js_init_memory_with_result"] = function(ptr, len) {
-                const target = new Uint8Array(memory.buffer, ptr, len);
+                const target = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0);
                 target.set(tmpRetBytes);
                 tmpRetBytes = undefined;
             }
@@ -148,12 +467,21 @@ export async function createInstantiator(options, swift) {
                 taStack.push(Array.from(new Ctor(copy)));
             }
             bjs["swift_js_struct_lower_Counters"] = function(objectId) {
-                structHelpers.Counters.lower(swift.memory.getObject(objectId));
+                structHelpers.M10TestModuleT8Counters.lower(swift.memory.getObject(objectId));
             }
             bjs["swift_js_struct_lift_Counters"] = function() {
-                const value = structHelpers.Counters.lift();
+                const value = structHelpers.M10TestModuleT8Counters.lift();
                 return swift.memory.retain(value);
             }
+            bjs["bjs_core_register_type_handles"] = function() {};
+            bjs["bjs_TestModule_register_type_handles"] = function() {};
+            const __bjs_promiseSettlers = Symbol("JavaScriptKit.promiseSettlers");
+            bjs["swift_js_make_promise"] = function() {
+                let resolve, reject;
+                const promise = new Promise((res, rej) => { resolve = res; reject = rej; });
+                promise[__bjs_promiseSettlers] = { resolve, reject };
+                return swift.memory.retain(promise);
+            }
             bjs["swift_js_return_optional_bool"] = function(isSome, value) {
                 if (isSome === 0) {
                     tmpRetOptionalBool = null;
@@ -255,24 +583,9 @@ export async function createInstantiator(options, swift) {
             const TestModule = importObject["TestModule"] = importObject["TestModule"] || {};
             TestModule["bjs_importMirrorDictionary"] = function bjs_importMirrorDictionary() {
                 try {
-                    const dictLen = i32Stack.pop();
-                    const dictResult = {};
-                    for (let i = 0; i < dictLen; i++) {
-                        const f64 = f64Stack.pop();
-                        const string = strStack.pop();
-                        dictResult[string] = f64;
-                    }
+                    const dictResult = __bjs_codec_Dict_Double.lift();
                     let ret = imports.importMirrorDictionary(dictResult);
-                    const entries = Object.entries(ret);
-                    for (const entry of entries) {
-                        const [key, value] = entry;
-                        const bytes = textEncoder.encode(key);
-                        const id = swift.memory.retain(bytes);
-                        i32Stack.push(bytes.length);
-                        i32Stack.push(id);
-                        f64Stack.push(value);
-                    }
-                    i32Stack.push(entries.length);
+                    __bjs_codec_Dict_Double.lower(ret);
                 } catch (error) {
                     setException(error);
                 }
@@ -303,6 +616,7 @@ export async function createInstantiator(options, swift) {
             /// Represents a Swift heap object like a class instance or an actor instance.
             class SwiftHeapObject {
                 static __wrap(pointer, deinit, prototype, identityCache) {
+                    pointer = pointer >>> 0;
                     const makeFresh = (identityMap) => {
                         const obj = Object.create(prototype);
                         const state = { pointer, deinit, hasReleased: false, identityMap };
@@ -348,163 +662,47 @@ export async function createInstantiator(options, swift) {
                 }
 
             }
-            const CountersHelpers = __bjs_createCountersHelpers();
-            structHelpers.Counters = CountersHelpers;
+            const __bjs_helpers_M10TestModuleT8Counters = __bjs_createStructHelpers_M10TestModuleT8Counters();
+            structHelpers.M10TestModuleT8Counters = __bjs_helpers_M10TestModuleT8Counters;
 
             const exports = {
-                Box,
                 mirrorDictionary: function bjs_mirrorDictionary(values) {
-                    const entries = Object.entries(values);
-                    for (const entry of entries) {
-                        const [key, value] = entry;
-                        const bytes = textEncoder.encode(key);
-                        const id = swift.memory.retain(bytes);
-                        i32Stack.push(bytes.length);
-                        i32Stack.push(id);
-                        i32Stack.push((value | 0));
-                    }
-                    i32Stack.push(entries.length);
+                    __bjs_codec_Dict_Int.lower(values);
                     instance.exports.bjs_mirrorDictionary();
-                    const dictLen = i32Stack.pop();
-                    const dictResult = {};
-                    for (let i = 0; i < dictLen; i++) {
-                        const int = i32Stack.pop();
-                        const string = strStack.pop();
-                        dictResult[string] = int;
-                    }
+                    const dictResult = __bjs_codec_Dict_Int.lift();
                     return dictResult;
                 },
                 optionalDictionary: function bjs_optionalDictionary(values) {
-                    const isSome = values != null;
-                    if (isSome) {
-                        const entries = Object.entries(values);
-                        for (const entry of entries) {
-                            const [key, value] = entry;
-                            const bytes = textEncoder.encode(key);
-                            const id = swift.memory.retain(bytes);
-                            i32Stack.push(bytes.length);
-                            i32Stack.push(id);
-                            const bytes1 = textEncoder.encode(value);
-                            const id1 = swift.memory.retain(bytes1);
-                            i32Stack.push(bytes1.length);
-                            i32Stack.push(id1);
-                        }
-                        i32Stack.push(entries.length);
-                    }
-                    i32Stack.push(+isSome);
+                    __bjs_codec_Optional_Dict_String.lower(values);
                     instance.exports.bjs_optionalDictionary();
-                    const isSome1 = i32Stack.pop();
-                    let optResult;
-                    if (isSome1) {
-                        const dictLen = i32Stack.pop();
-                        const dictResult = {};
-                        for (let i = 0; i < dictLen; i++) {
-                            const string = strStack.pop();
-                            const string1 = strStack.pop();
-                            dictResult[string1] = string;
-                        }
-                        optResult = dictResult;
-                    } else {
-                        optResult = null;
-                    }
-                    return optResult;
+                    const optValue = __bjs_codec_Optional_Dict_String.lift();
+                    return optValue;
                 },
                 nestedDictionary: function bjs_nestedDictionary(values) {
-                    const entries = Object.entries(values);
-                    for (const entry of entries) {
-                        const [key, value] = entry;
-                        const bytes = textEncoder.encode(key);
-                        const id = swift.memory.retain(bytes);
-                        i32Stack.push(bytes.length);
-                        i32Stack.push(id);
-                        for (const elem of value) {
-                            i32Stack.push((elem | 0));
-                        }
-                        i32Stack.push(value.length);
-                    }
-                    i32Stack.push(entries.length);
+                    __bjs_codec_Dict_Array_Int.lower(values);
                     instance.exports.bjs_nestedDictionary();
-                    const dictLen = i32Stack.pop();
-                    const dictResult = {};
-                    for (let i = 0; i < dictLen; i++) {
-                        const arrayLen = i32Stack.pop();
-                        let arrayResult;
-                        if (arrayLen === -1) {
-                            arrayResult = taStack.pop();
-                        } else {
-                            arrayResult = [];
-                            for (let i1 = 0; i1 < arrayLen; i1++) {
-                                const int = i32Stack.pop();
-                                arrayResult.push(int);
-                            }
-                            arrayResult.reverse();
-                        }
-                        const string = strStack.pop();
-                        dictResult[string] = arrayResult;
-                    }
+                    const dictResult = __bjs_codec_Dict_Array_Int.lift();
                     return dictResult;
                 },
                 boxDictionary: function bjs_boxDictionary(boxes) {
-                    const entries = Object.entries(boxes);
-                    for (const entry of entries) {
-                        const [key, value] = entry;
-                        const bytes = textEncoder.encode(key);
-                        const id = swift.memory.retain(bytes);
-                        i32Stack.push(bytes.length);
-                        i32Stack.push(id);
-                        ptrStack.push(value.pointer);
-                    }
-                    i32Stack.push(entries.length);
+                    __bjs_codec_Dict_M10TestModuleT3Box.lower(boxes);
                     instance.exports.bjs_boxDictionary();
-                    const dictLen = i32Stack.pop();
-                    const dictResult = {};
-                    for (let i = 0; i < dictLen; i++) {
-                        const ptr = ptrStack.pop();
-                        const obj = Box.__construct(ptr);
-                        const string = strStack.pop();
-                        dictResult[string] = obj;
-                    }
+                    const dictResult = __bjs_codec_Dict_M10TestModuleT3Box.lift();
                     return dictResult;
                 },
                 optionalBoxDictionary: function bjs_optionalBoxDictionary(boxes) {
-                    const entries = Object.entries(boxes);
-                    for (const entry of entries) {
-                        const [key, value] = entry;
-                        const bytes = textEncoder.encode(key);
-                        const id = swift.memory.retain(bytes);
-                        i32Stack.push(bytes.length);
-                        i32Stack.push(id);
-                        const isSome = value != null ? 1 : 0;
-                        if (isSome) {
-                            ptrStack.push(value.pointer);
-                        }
-                        i32Stack.push(isSome);
-                    }
-                    i32Stack.push(entries.length);
+                    __bjs_codec_Dict_Optional_M10TestModuleT3Box.lower(boxes);
                     instance.exports.bjs_optionalBoxDictionary();
-                    const dictLen = i32Stack.pop();
-                    const dictResult = {};
-                    for (let i = 0; i < dictLen; i++) {
-                        const isSome1 = i32Stack.pop();
-                        let optValue;
-                        if (isSome1 === 0) {
-                            optValue = null;
-                        } else {
-                            const ptr = ptrStack.pop();
-                            const obj = Box.__construct(ptr);
-                            optValue = obj;
-                        }
-                        const string = strStack.pop();
-                        dictResult[string] = optValue;
-                    }
+                    const dictResult = __bjs_codec_Dict_Optional_M10TestModuleT3Box.lift();
                     return dictResult;
                 },
                 roundtripCounters: function bjs_roundtripCounters(counters) {
-                    structHelpers.Counters.lower(counters);
+                    structHelpers.M10TestModuleT8Counters.lower(counters);
                     instance.exports.bjs_roundtripCounters();
-                    const structValue = structHelpers.Counters.lift();
+                    const structValue = structHelpers.M10TestModuleT8Counters.lift();
                     return structValue;
                 },
+                Box,
             };
             _exports = exports;
             return exports;
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DocComments.d.ts b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DocComments.d.ts
new file mode 100644
index 000000000..196ef73fe
--- /dev/null
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DocComments.d.ts
@@ -0,0 +1,140 @@
+// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit,
+// DO NOT EDIT.
+//
+// To update this file, just rebuild your project or run
+// `swift package bridge-js`.
+
+/**
+ * Receives lifecycle callbacks.
+ */
+export interface Listener {
+    /**
+     * Called when an event fires.
+     * @param id The event identifier.
+     */
+    onEvent(id: number): void;
+    /**
+     * The listener's display name.
+     */
+    readonly name: string;
+}
+
+/**
+ * A primary color channel.
+ */
+export const ColorValues: {
+    readonly Red: 0;
+    readonly Green: 1;
+    readonly Blue: 2;
+};
+export type ColorTag = typeof ColorValues[keyof typeof ColorValues];
+
+/**
+ * A 2D point in space.
+ */
+export interface Point {
+    /**
+     * The horizontal position.
+     */
+    x: number;
+    /**
+     * The vertical position.
+     */
+    y: number;
+}
+export type ColorObject = typeof ColorValues & {
+    /**
+     * Returns the canonical name for a channel label.
+     * @param label The raw label.
+     * @returns The canonical channel name.
+     */
+    canonical(label: string): string;
+    /**
+     * The default channel.
+     */
+    readonly fallback: string;
+};
+
+/// Represents a Swift heap object like a class instance or an actor instance.
+export interface SwiftHeapObject {
+    /// Release the heap object.
+    ///
+    /// Note: Calling this method will release the heap object and it will no longer be accessible.
+    release(): void;
+}
+/**
+ * A greeter that keeps the target name.
+ */
+export interface Greeter extends SwiftHeapObject {
+    /**
+     * Returns a greeting for the configured name.
+     * @returns The greeting message.
+     */
+    greet(): string;
+    /**
+     * The configured name.
+     */
+    name: string;
+}
+export type Exports = {
+    /**
+     * Returns a greeting for a user.
+     * @param name The user's name.
+     * @param greeting The greeting word to use. (default: "Hello")
+     * @returns The composed greeting message.
+     */
+    greet(name: string, greeting?: string): string;
+    /**
+     * Adds two numbers together.
+     * @param a The first addend.
+     * @param b The second addend.
+     * @returns The sum of the inputs.
+     */
+    add(a: number, b: number): number;
+    /**
+     * Has blank doc lines around the summary; boundaries should be trimmed.
+     */
+    trimmed(): void;
+    /**
+     * Says hello to the world.
+     *
+     * Demonstrates that block doc comments are supported too.
+     */
+    hello(): void;
+    /**
+     * Parses an integer from text.
+     * @param text The text to parse.
+     * @returns The parsed integer.
+     * @throws A `JSException` when the text is not a valid integer.
+     */
+    parseInt(text: string): number;
+    /**
+     * Returns the JSDoc terminator *\/ embedded mid-sentence.
+     */
+    terminator(): string;
+    Color: ColorObject
+    Greeter: {
+        /**
+         * Create a greeter.
+         * @param name The name to greet.
+         */
+        new(name: string): Greeter;
+    },
+    MathUtils: {
+        /**
+         * Doubles a value, in a namespace.
+         * @param value The value to double.
+         * @returns Twice the input.
+         */
+        double(value: number): number;
+    },
+}
+export type Imports = {
+}
+export function createInstantiator(options: {
+    imports: Imports;
+}, swift: any): Promise<{
+    addImports: (importObject: WebAssembly.Imports) => void;
+    setInstance: (instance: WebAssembly.Instance) => void;
+    createExports: (instance: WebAssembly.Instance) => Exports;
+}>;
\ No newline at end of file
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DocComments.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DocComments.js
new file mode 100644
index 000000000..6d23d394f
--- /dev/null
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DocComments.js
@@ -0,0 +1,423 @@
+// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit,
+// DO NOT EDIT.
+//
+// To update this file, just rebuild your project or run
+// `swift package bridge-js`.
+
+export const ColorValues = {
+    Red: 0,
+    Green: 1,
+    Blue: 2,
+};
+
+export async function createInstantiator(options, swift) {
+    let instance;
+    let memory;
+    let setException;
+    let decodeString;
+    const textDecoder = new TextDecoder("utf-8");
+    const textEncoder = new TextEncoder("utf-8");
+    let tmpRetString;
+    let tmpRetBytes;
+    let tmpRetException;
+    let tmpRetOptionalBool;
+    let tmpRetOptionalInt;
+    let tmpRetOptionalFloat;
+    let tmpRetOptionalDouble;
+    let tmpRetOptionalHeapObject;
+    let strStack = [];
+    let i32Stack = [];
+    let i64Stack = [];
+    let f32Stack = [];
+    let f64Stack = [];
+    let ptrStack = [];
+    let taStack = [];
+    const enumHelpers = {};
+    const structHelpers = {};
+
+    let _exports = null;
+    let bjs = null;
+    const __bjs_createStructHelpers_M10TestModuleT5Point = () => ({
+        lower: (value) => {
+            f64Stack.push(value.x);
+            f64Stack.push(value.y);
+        },
+        lift: () => {
+            const f64 = f64Stack.pop();
+            const f641 = f64Stack.pop();
+            return { x: f641, y: f64 };
+        }
+    });
+
+    return {
+        /**
+         * @param {WebAssembly.Imports} importObject
+         */
+        addImports: (importObject, importsContext) => {
+            bjs = {};
+            importObject["bjs"] = bjs;
+            bjs["swift_js_return_string"] = function(ptr, len) {
+                tmpRetString = decodeString(ptr, len);
+            }
+            bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) {
+                const source = swift.memory.getObject(sourceId);
+                swift.memory.release(sourceId);
+                const bytes = new Uint8Array(memory.buffer, bytesPtr >>> 0);
+                bytes.set(source);
+            }
+            bjs["swift_js_make_js_string"] = function(ptr, len) {
+                return swift.memory.retain(decodeString(ptr, len));
+            }
+            bjs["swift_js_init_memory_with_result"] = function(ptr, len) {
+                const target = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0);
+                target.set(tmpRetBytes);
+                tmpRetBytes = undefined;
+            }
+            bjs["swift_js_throw"] = function(id) {
+                tmpRetException = swift.memory.retainByRef(id);
+            }
+            bjs["swift_js_retain"] = function(id) {
+                return swift.memory.retainByRef(id);
+            }
+            bjs["swift_js_release"] = function(id) {
+                swift.memory.release(id);
+            }
+            bjs["swift_js_push_i32"] = function(v) {
+                i32Stack.push(v | 0);
+            }
+            bjs["swift_js_push_f32"] = function(v) {
+                f32Stack.push(Math.fround(v));
+            }
+            bjs["swift_js_push_f64"] = function(v) {
+                f64Stack.push(v);
+            }
+            bjs["swift_js_push_string"] = function(ptr, len) {
+                const value = decodeString(ptr, len);
+                strStack.push(value);
+            }
+            bjs["swift_js_pop_i32"] = function() {
+                return i32Stack.pop();
+            }
+            bjs["swift_js_pop_f32"] = function() {
+                return f32Stack.pop();
+            }
+            bjs["swift_js_pop_f64"] = function() {
+                return f64Stack.pop();
+            }
+            bjs["swift_js_push_pointer"] = function(pointer) {
+                ptrStack.push(pointer);
+            }
+            bjs["swift_js_pop_pointer"] = function() {
+                return ptrStack.pop();
+            }
+            bjs["swift_js_push_i64"] = function(v) {
+                i64Stack.push(v);
+            }
+            bjs["swift_js_pop_i64"] = function() {
+                return i64Stack.pop();
+            }
+            const taCtors = [Int8Array, Uint8Array, Int16Array, Uint16Array, Int32Array, Uint32Array, Float32Array, Float64Array];
+            bjs["swift_js_push_typed_array"] = function(kind, ptr, count) {
+                const Ctor = taCtors[kind];
+                const byteLen = count * Ctor.BYTES_PER_ELEMENT;
+                const copy = memory.buffer.slice(ptr, ptr + byteLen);
+                taStack.push(Array.from(new Ctor(copy)));
+            }
+            bjs["swift_js_struct_lower_Point"] = function(objectId) {
+                structHelpers.M10TestModuleT5Point.lower(swift.memory.getObject(objectId));
+            }
+            bjs["swift_js_struct_lift_Point"] = function() {
+                const value = structHelpers.M10TestModuleT5Point.lift();
+                return swift.memory.retain(value);
+            }
+            bjs["bjs_core_register_type_handles"] = function() {};
+            bjs["bjs_TestModule_register_type_handles"] = function() {};
+            const __bjs_promiseSettlers = Symbol("JavaScriptKit.promiseSettlers");
+            bjs["swift_js_make_promise"] = function() {
+                let resolve, reject;
+                const promise = new Promise((res, rej) => { resolve = res; reject = rej; });
+                promise[__bjs_promiseSettlers] = { resolve, reject };
+                return swift.memory.retain(promise);
+            }
+            bjs["swift_js_return_optional_bool"] = function(isSome, value) {
+                if (isSome === 0) {
+                    tmpRetOptionalBool = null;
+                } else {
+                    tmpRetOptionalBool = value !== 0;
+                }
+            }
+            bjs["swift_js_return_optional_int"] = function(isSome, value) {
+                if (isSome === 0) {
+                    tmpRetOptionalInt = null;
+                } else {
+                    tmpRetOptionalInt = value | 0;
+                }
+            }
+            bjs["swift_js_return_optional_float"] = function(isSome, value) {
+                if (isSome === 0) {
+                    tmpRetOptionalFloat = null;
+                } else {
+                    tmpRetOptionalFloat = Math.fround(value);
+                }
+            }
+            bjs["swift_js_return_optional_double"] = function(isSome, value) {
+                if (isSome === 0) {
+                    tmpRetOptionalDouble = null;
+                } else {
+                    tmpRetOptionalDouble = value;
+                }
+            }
+            bjs["swift_js_return_optional_string"] = function(isSome, ptr, len) {
+                if (isSome === 0) {
+                    tmpRetString = null;
+                } else {
+                    tmpRetString = decodeString(ptr, len);
+                }
+            }
+            bjs["swift_js_return_optional_object"] = function(isSome, objectId) {
+                if (isSome === 0) {
+                    tmpRetString = null;
+                } else {
+                    tmpRetString = swift.memory.getObject(objectId);
+                }
+            }
+            bjs["swift_js_return_optional_heap_object"] = function(isSome, pointer) {
+                if (isSome === 0) {
+                    tmpRetOptionalHeapObject = null;
+                } else {
+                    tmpRetOptionalHeapObject = pointer;
+                }
+            }
+            bjs["swift_js_get_optional_int_presence"] = function() {
+                return tmpRetOptionalInt != null ? 1 : 0;
+            }
+            bjs["swift_js_get_optional_int_value"] = function() {
+                const value = tmpRetOptionalInt;
+                tmpRetOptionalInt = undefined;
+                return value;
+            }
+            bjs["swift_js_get_optional_string"] = function() {
+                const str = tmpRetString;
+                tmpRetString = undefined;
+                if (str == null) {
+                    return -1;
+                } else {
+                    const bytes = textEncoder.encode(str);
+                    tmpRetBytes = bytes;
+                    return bytes.length;
+                }
+            }
+            bjs["swift_js_get_optional_float_presence"] = function() {
+                return tmpRetOptionalFloat != null ? 1 : 0;
+            }
+            bjs["swift_js_get_optional_float_value"] = function() {
+                const value = tmpRetOptionalFloat;
+                tmpRetOptionalFloat = undefined;
+                return value;
+            }
+            bjs["swift_js_get_optional_double_presence"] = function() {
+                return tmpRetOptionalDouble != null ? 1 : 0;
+            }
+            bjs["swift_js_get_optional_double_value"] = function() {
+                const value = tmpRetOptionalDouble;
+                tmpRetOptionalDouble = undefined;
+                return value;
+            }
+            bjs["swift_js_get_optional_heap_object_pointer"] = function() {
+                const pointer = tmpRetOptionalHeapObject;
+                tmpRetOptionalHeapObject = undefined;
+                return pointer || 0;
+            }
+            bjs["swift_js_closure_unregister"] = function(funcRef) {}
+            // Wrapper functions for module: TestModule
+            if (!importObject["TestModule"]) {
+                importObject["TestModule"] = {};
+            }
+            importObject["TestModule"]["bjs_Greeter_wrap"] = function(pointer) {
+                const obj = _exports['Greeter'].__construct(pointer);
+                return swift.memory.retain(obj);
+            };
+            const TestModule = importObject["TestModule"] = importObject["TestModule"] || {};
+            TestModule["bjs_Listener_name_get"] = function bjs_Listener_name_get(self) {
+                try {
+                    let ret = swift.memory.getObject(self).name;
+                    tmpRetBytes = textEncoder.encode(ret);
+                    return tmpRetBytes.length;
+                } catch (error) {
+                    setException(error);
+                }
+            }
+            TestModule["bjs_Listener_onEvent"] = function bjs_Listener_onEvent(self, id) {
+                try {
+                    swift.memory.getObject(self).onEvent(id);
+                } catch (error) {
+                    setException(error);
+                }
+            }
+        },
+        setInstance: (i) => {
+            instance = i;
+            memory = instance.exports.memory;
+
+            decodeString = (ptr, len) => { const bytes = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); return textDecoder.decode(bytes); }
+
+            setException = (error) => {
+                instance.exports._swift_js_exception.value = swift.memory.retain(error)
+            }
+        },
+        /** @param {WebAssembly.Instance} instance */
+        createExports: (instance) => {
+            const js = swift.memory.heap;
+            const swiftHeapObjectFinalizationRegistry = (typeof FinalizationRegistry === "undefined") ? { register: () => {}, unregister: () => {} } : new FinalizationRegistry((state) => {
+                if (state.hasReleased) {
+                    return;
+                }
+                state.hasReleased = true;
+                state.identityMap?.delete(state.pointer);
+                state.deinit(state.pointer);
+            });
+
+            /// Represents a Swift heap object like a class instance or an actor instance.
+            class SwiftHeapObject {
+                static __wrap(pointer, deinit, prototype, identityCache) {
+                    pointer = pointer >>> 0;
+                    const makeFresh = (identityMap) => {
+                        const obj = Object.create(prototype);
+                        const state = { pointer, deinit, hasReleased: false, identityMap };
+                        obj.pointer = pointer;
+                        obj.__swiftHeapObjectState = state;
+                        swiftHeapObjectFinalizationRegistry.register(obj, state, state);
+                        if (identityMap) {
+                            identityMap.set(pointer, new WeakRef(obj));
+                        }
+                        return obj;
+                    };
+
+                    if (!identityCache) {
+                        return makeFresh(null);
+                    }
+
+                    const cached = identityCache.get(pointer)?.deref();
+                    if (cached && !cached.__swiftHeapObjectState.hasReleased) {
+                        deinit(pointer);
+                        return cached;
+                    }
+                    if (identityCache.has(pointer)) {
+                        identityCache.delete(pointer);
+                    }
+
+                    return makeFresh(identityCache);
+                }
+
+                release() {
+                    const state = this.__swiftHeapObjectState;
+                    if (state.hasReleased) {
+                        return;
+                    }
+                    state.hasReleased = true;
+                    swiftHeapObjectFinalizationRegistry.unregister(state);
+                    state.identityMap?.delete(state.pointer);
+                    state.deinit(state.pointer);
+                }
+            }
+            class Greeter extends SwiftHeapObject {
+                static __construct(ptr) {
+                    return SwiftHeapObject.__wrap(ptr, instance.exports.bjs_Greeter_deinit, Greeter.prototype, null);
+                }
+
+                constructor(name) {
+                    const nameBytes = textEncoder.encode(name);
+                    const nameId = swift.memory.retain(nameBytes);
+                    const ret = instance.exports.bjs_Greeter_init(nameId, nameBytes.length);
+                    return Greeter.__construct(ret);
+                }
+                greet() {
+                    instance.exports.bjs_Greeter_greet(this.pointer);
+                    const ret = tmpRetString;
+                    tmpRetString = undefined;
+                    return ret;
+                }
+                get name() {
+                    instance.exports.bjs_Greeter_name_get(this.pointer);
+                    const ret = tmpRetString;
+                    tmpRetString = undefined;
+                    return ret;
+                }
+                set name(value) {
+                    const valueBytes = textEncoder.encode(value);
+                    const valueId = swift.memory.retain(valueBytes);
+                    instance.exports.bjs_Greeter_name_set(this.pointer, valueId, valueBytes.length);
+                }
+            }
+            const __bjs_helpers_M10TestModuleT5Point = __bjs_createStructHelpers_M10TestModuleT5Point();
+            structHelpers.M10TestModuleT5Point = __bjs_helpers_M10TestModuleT5Point;
+
+            const exports = {
+                greet: function bjs_greet(name, greeting = "Hello") {
+                    const nameBytes = textEncoder.encode(name);
+                    const nameId = swift.memory.retain(nameBytes);
+                    const greetingBytes = textEncoder.encode(greeting);
+                    const greetingId = swift.memory.retain(greetingBytes);
+                    instance.exports.bjs_greet(nameId, nameBytes.length, greetingId, greetingBytes.length);
+                    const ret = tmpRetString;
+                    tmpRetString = undefined;
+                    return ret;
+                },
+                add: function bjs_add(a, b) {
+                    const ret = instance.exports.bjs_add(a, b);
+                    return ret;
+                },
+                trimmed: function bjs_trimmed() {
+                    instance.exports.bjs_trimmed();
+                },
+                hello: function bjs_hello() {
+                    instance.exports.bjs_hello();
+                },
+                parseInt: function bjs_parseInt(text) {
+                    const textBytes = textEncoder.encode(text);
+                    const textId = swift.memory.retain(textBytes);
+                    const ret = instance.exports.bjs_parseInt(textId, textBytes.length);
+                    if (tmpRetException) {
+                        const error = swift.memory.getObject(tmpRetException);
+                        swift.memory.release(tmpRetException);
+                        tmpRetException = undefined;
+                        throw error;
+                    }
+                    return ret;
+                },
+                terminator: function bjs_terminator() {
+                    instance.exports.bjs_terminator();
+                    const ret = tmpRetString;
+                    tmpRetString = undefined;
+                    return ret;
+                },
+                Color: {
+                    ...ColorValues,
+                    canonical: function(label) {
+                        const labelBytes = textEncoder.encode(label);
+                        const labelId = swift.memory.retain(labelBytes);
+                        instance.exports.bjs_Color_static_canonical(labelId, labelBytes.length);
+                        const ret = tmpRetString;
+                        tmpRetString = undefined;
+                        return ret;
+                    },
+                    get fallback() {
+                        instance.exports.bjs_Color_static_fallback_get();
+                        const ret = tmpRetString;
+                        tmpRetString = undefined;
+                        return ret;
+                    }
+                },
+                Greeter,
+                MathUtils: {
+                    double: function bjs_MathUtils_double(value) {
+                        const ret = instance.exports.bjs_MathUtils_double(value);
+                        return ret;
+                    },
+                },
+            };
+            _exports = exports;
+            return exports;
+        },
+    }
+}
\ No newline at end of file
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumAlias.d.ts b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumAlias.d.ts
new file mode 100644
index 000000000..d2772fa8b
--- /dev/null
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumAlias.d.ts
@@ -0,0 +1,30 @@
+// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit,
+// DO NOT EDIT.
+//
+// To update this file, just rebuild your project or run
+// `swift package bridge-js`.
+
+/// Represents a Swift heap object like a class instance or an actor instance.
+export interface SwiftHeapObject {
+    /// Release the heap object.
+    ///
+    /// Note: Calling this method will release the heap object and it will no longer be accessible.
+    release(): void;
+}
+export interface ColorBox extends SwiftHeapObject {
+}
+export type Exports = {
+    roundtripColor(color: ColorBox): ColorBox;
+    ColorBox: {
+        new(name: string): ColorBox;
+    },
+}
+export type Imports = {
+}
+export function createInstantiator(options: {
+    imports: Imports;
+}, swift: any): Promise<{
+    addImports: (importObject: WebAssembly.Imports) => void;
+    setInstance: (instance: WebAssembly.Instance) => void;
+    createExports: (instance: WebAssembly.Instance) => Exports;
+}>;
\ No newline at end of file
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumAlias.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumAlias.js
new file mode 100644
index 000000000..d8bc06fcf
--- /dev/null
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumAlias.js
@@ -0,0 +1,305 @@
+// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit,
+// DO NOT EDIT.
+//
+// To update this file, just rebuild your project or run
+// `swift package bridge-js`.
+
+export async function createInstantiator(options, swift) {
+    let instance;
+    let memory;
+    let setException;
+    let decodeString;
+    const textDecoder = new TextDecoder("utf-8");
+    const textEncoder = new TextEncoder("utf-8");
+    let tmpRetString;
+    let tmpRetBytes;
+    let tmpRetException;
+    let tmpRetOptionalBool;
+    let tmpRetOptionalInt;
+    let tmpRetOptionalFloat;
+    let tmpRetOptionalDouble;
+    let tmpRetOptionalHeapObject;
+    let strStack = [];
+    let i32Stack = [];
+    let i64Stack = [];
+    let f32Stack = [];
+    let f64Stack = [];
+    let ptrStack = [];
+    let taStack = [];
+    const enumHelpers = {};
+    const structHelpers = {};
+
+    let _exports = null;
+    let bjs = null;
+
+    return {
+        /**
+         * @param {WebAssembly.Imports} importObject
+         */
+        addImports: (importObject, importsContext) => {
+            bjs = {};
+            importObject["bjs"] = bjs;
+            bjs["swift_js_return_string"] = function(ptr, len) {
+                tmpRetString = decodeString(ptr, len);
+            }
+            bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) {
+                const source = swift.memory.getObject(sourceId);
+                swift.memory.release(sourceId);
+                const bytes = new Uint8Array(memory.buffer, bytesPtr >>> 0);
+                bytes.set(source);
+            }
+            bjs["swift_js_make_js_string"] = function(ptr, len) {
+                return swift.memory.retain(decodeString(ptr, len));
+            }
+            bjs["swift_js_init_memory_with_result"] = function(ptr, len) {
+                const target = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0);
+                target.set(tmpRetBytes);
+                tmpRetBytes = undefined;
+            }
+            bjs["swift_js_throw"] = function(id) {
+                tmpRetException = swift.memory.retainByRef(id);
+            }
+            bjs["swift_js_retain"] = function(id) {
+                return swift.memory.retainByRef(id);
+            }
+            bjs["swift_js_release"] = function(id) {
+                swift.memory.release(id);
+            }
+            bjs["swift_js_push_i32"] = function(v) {
+                i32Stack.push(v | 0);
+            }
+            bjs["swift_js_push_f32"] = function(v) {
+                f32Stack.push(Math.fround(v));
+            }
+            bjs["swift_js_push_f64"] = function(v) {
+                f64Stack.push(v);
+            }
+            bjs["swift_js_push_string"] = function(ptr, len) {
+                const value = decodeString(ptr, len);
+                strStack.push(value);
+            }
+            bjs["swift_js_pop_i32"] = function() {
+                return i32Stack.pop();
+            }
+            bjs["swift_js_pop_f32"] = function() {
+                return f32Stack.pop();
+            }
+            bjs["swift_js_pop_f64"] = function() {
+                return f64Stack.pop();
+            }
+            bjs["swift_js_push_pointer"] = function(pointer) {
+                ptrStack.push(pointer);
+            }
+            bjs["swift_js_pop_pointer"] = function() {
+                return ptrStack.pop();
+            }
+            bjs["swift_js_push_i64"] = function(v) {
+                i64Stack.push(v);
+            }
+            bjs["swift_js_pop_i64"] = function() {
+                return i64Stack.pop();
+            }
+            const taCtors = [Int8Array, Uint8Array, Int16Array, Uint16Array, Int32Array, Uint32Array, Float32Array, Float64Array];
+            bjs["swift_js_push_typed_array"] = function(kind, ptr, count) {
+                const Ctor = taCtors[kind];
+                const byteLen = count * Ctor.BYTES_PER_ELEMENT;
+                const copy = memory.buffer.slice(ptr, ptr + byteLen);
+                taStack.push(Array.from(new Ctor(copy)));
+            }
+            bjs["bjs_core_register_type_handles"] = function() {};
+            bjs["bjs_TestModule_register_type_handles"] = function() {};
+            const __bjs_promiseSettlers = Symbol("JavaScriptKit.promiseSettlers");
+            bjs["swift_js_make_promise"] = function() {
+                let resolve, reject;
+                const promise = new Promise((res, rej) => { resolve = res; reject = rej; });
+                promise[__bjs_promiseSettlers] = { resolve, reject };
+                return swift.memory.retain(promise);
+            }
+            bjs["swift_js_return_optional_bool"] = function(isSome, value) {
+                if (isSome === 0) {
+                    tmpRetOptionalBool = null;
+                } else {
+                    tmpRetOptionalBool = value !== 0;
+                }
+            }
+            bjs["swift_js_return_optional_int"] = function(isSome, value) {
+                if (isSome === 0) {
+                    tmpRetOptionalInt = null;
+                } else {
+                    tmpRetOptionalInt = value | 0;
+                }
+            }
+            bjs["swift_js_return_optional_float"] = function(isSome, value) {
+                if (isSome === 0) {
+                    tmpRetOptionalFloat = null;
+                } else {
+                    tmpRetOptionalFloat = Math.fround(value);
+                }
+            }
+            bjs["swift_js_return_optional_double"] = function(isSome, value) {
+                if (isSome === 0) {
+                    tmpRetOptionalDouble = null;
+                } else {
+                    tmpRetOptionalDouble = value;
+                }
+            }
+            bjs["swift_js_return_optional_string"] = function(isSome, ptr, len) {
+                if (isSome === 0) {
+                    tmpRetString = null;
+                } else {
+                    tmpRetString = decodeString(ptr, len);
+                }
+            }
+            bjs["swift_js_return_optional_object"] = function(isSome, objectId) {
+                if (isSome === 0) {
+                    tmpRetString = null;
+                } else {
+                    tmpRetString = swift.memory.getObject(objectId);
+                }
+            }
+            bjs["swift_js_return_optional_heap_object"] = function(isSome, pointer) {
+                if (isSome === 0) {
+                    tmpRetOptionalHeapObject = null;
+                } else {
+                    tmpRetOptionalHeapObject = pointer;
+                }
+            }
+            bjs["swift_js_get_optional_int_presence"] = function() {
+                return tmpRetOptionalInt != null ? 1 : 0;
+            }
+            bjs["swift_js_get_optional_int_value"] = function() {
+                const value = tmpRetOptionalInt;
+                tmpRetOptionalInt = undefined;
+                return value;
+            }
+            bjs["swift_js_get_optional_string"] = function() {
+                const str = tmpRetString;
+                tmpRetString = undefined;
+                if (str == null) {
+                    return -1;
+                } else {
+                    const bytes = textEncoder.encode(str);
+                    tmpRetBytes = bytes;
+                    return bytes.length;
+                }
+            }
+            bjs["swift_js_get_optional_float_presence"] = function() {
+                return tmpRetOptionalFloat != null ? 1 : 0;
+            }
+            bjs["swift_js_get_optional_float_value"] = function() {
+                const value = tmpRetOptionalFloat;
+                tmpRetOptionalFloat = undefined;
+                return value;
+            }
+            bjs["swift_js_get_optional_double_presence"] = function() {
+                return tmpRetOptionalDouble != null ? 1 : 0;
+            }
+            bjs["swift_js_get_optional_double_value"] = function() {
+                const value = tmpRetOptionalDouble;
+                tmpRetOptionalDouble = undefined;
+                return value;
+            }
+            bjs["swift_js_get_optional_heap_object_pointer"] = function() {
+                const pointer = tmpRetOptionalHeapObject;
+                tmpRetOptionalHeapObject = undefined;
+                return pointer || 0;
+            }
+            bjs["swift_js_closure_unregister"] = function(funcRef) {}
+            // Wrapper functions for module: TestModule
+            if (!importObject["TestModule"]) {
+                importObject["TestModule"] = {};
+            }
+            importObject["TestModule"]["bjs_ColorBox_wrap"] = function(pointer) {
+                const obj = _exports['ColorBox'].__construct(pointer);
+                return swift.memory.retain(obj);
+            };
+        },
+        setInstance: (i) => {
+            instance = i;
+            memory = instance.exports.memory;
+
+            decodeString = (ptr, len) => { const bytes = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); return textDecoder.decode(bytes); }
+
+            setException = (error) => {
+                instance.exports._swift_js_exception.value = swift.memory.retain(error)
+            }
+        },
+        /** @param {WebAssembly.Instance} instance */
+        createExports: (instance) => {
+            const js = swift.memory.heap;
+            const swiftHeapObjectFinalizationRegistry = (typeof FinalizationRegistry === "undefined") ? { register: () => {}, unregister: () => {} } : new FinalizationRegistry((state) => {
+                if (state.hasReleased) {
+                    return;
+                }
+                state.hasReleased = true;
+                state.identityMap?.delete(state.pointer);
+                state.deinit(state.pointer);
+            });
+
+            /// Represents a Swift heap object like a class instance or an actor instance.
+            class SwiftHeapObject {
+                static __wrap(pointer, deinit, prototype, identityCache) {
+                    pointer = pointer >>> 0;
+                    const makeFresh = (identityMap) => {
+                        const obj = Object.create(prototype);
+                        const state = { pointer, deinit, hasReleased: false, identityMap };
+                        obj.pointer = pointer;
+                        obj.__swiftHeapObjectState = state;
+                        swiftHeapObjectFinalizationRegistry.register(obj, state, state);
+                        if (identityMap) {
+                            identityMap.set(pointer, new WeakRef(obj));
+                        }
+                        return obj;
+                    };
+
+                    if (!identityCache) {
+                        return makeFresh(null);
+                    }
+
+                    const cached = identityCache.get(pointer)?.deref();
+                    if (cached && !cached.__swiftHeapObjectState.hasReleased) {
+                        deinit(pointer);
+                        return cached;
+                    }
+                    if (identityCache.has(pointer)) {
+                        identityCache.delete(pointer);
+                    }
+
+                    return makeFresh(identityCache);
+                }
+
+                release() {
+                    const state = this.__swiftHeapObjectState;
+                    if (state.hasReleased) {
+                        return;
+                    }
+                    state.hasReleased = true;
+                    swiftHeapObjectFinalizationRegistry.unregister(state);
+                    state.identityMap?.delete(state.pointer);
+                    state.deinit(state.pointer);
+                }
+            }
+            class ColorBox extends SwiftHeapObject {
+                static __construct(ptr) {
+                    return SwiftHeapObject.__wrap(ptr, instance.exports.bjs_ColorBox_deinit, ColorBox.prototype, null);
+                }
+
+                constructor(name) {
+                    const nameBytes = textEncoder.encode(name);
+                    const nameId = swift.memory.retain(nameBytes);
+                    const ret = instance.exports.bjs_ColorBox_init(nameId, nameBytes.length);
+                    return ColorBox.__construct(ret);
+                }
+            }
+            const exports = {
+                roundtripColor: function bjs_roundtripColor(color) {
+                    const ret = instance.exports.bjs_roundtripColor(color.pointer);
+                    return ColorBox.__construct(ret);
+                },
+                ColorBox,
+            };
+            _exports = exports;
+            return exports;
+        },
+    }
+}
\ No newline at end of file
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumAssociatedValue.d.ts b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumAssociatedValue.d.ts
index 13f77ae08..36fc92474 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumAssociatedValue.d.ts
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumAssociatedValue.d.ts
@@ -153,8 +153,6 @@ export interface SwiftHeapObject {
 export interface User extends SwiftHeapObject {
 }
 export type Exports = {
-    User: {
-    }
     handle(result: APIResultTag): void;
     getResult(): APIResultTag;
     roundtripAPIResult(result: APIResultTag): APIResultTag;
@@ -184,6 +182,8 @@ export type Exports = {
     API: {
         NetworkingResult: NetworkingResultObject
     },
+    User: {
+    },
     Utilities: {
         Result: ResultObject
     },
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumAssociatedValue.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumAssociatedValue.js
index 23819a6e8..66f85760c 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumAssociatedValue.js
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumAssociatedValue.js
@@ -112,7 +112,401 @@ export async function createInstantiator(options, swift) {
 
     let _exports = null;
     let bjs = null;
-    const __bjs_createPointHelpers = () => ({
+    const __bjs_arrayCodecCache = new WeakMap();
+    function __bjs_arrayCodec(elementCodec) {
+        let codec = __bjs_arrayCodecCache.get(elementCodec);
+        if (codec !== undefined) {
+            return codec;
+        }
+        codec = {
+            lower(value) {
+                for (let i = 0; i < value.length; i++) {
+                    elementCodec.lower(value[i]);
+                }
+                i32Stack.push(value.length);
+            },
+            lift() {
+                const count = i32Stack.pop();
+                if (count === -1) {
+                    return taStack.pop();
+                }
+                const result = new Array(count);
+                for (let i = count - 1; i >= 0; i--) {
+                    result[i] = elementCodec.lift();
+                }
+                return result;
+            },
+        };
+        __bjs_arrayCodecCache.set(elementCodec, codec);
+        return codec;
+    }
+    const __bjs_optionalCodecCache = new WeakMap();
+    const __bjs_optionalCodecUndefinedOrCache = new WeakMap();
+    function __bjs_optionalCodec(elementCodec, isUndefinedOr = false) {
+        const cache = isUndefinedOr ? __bjs_optionalCodecUndefinedOrCache : __bjs_optionalCodecCache;
+        let codec = cache.get(elementCodec);
+        if (codec !== undefined) {
+            return codec;
+        }
+        codec = {
+            lower(value) {
+                const isSome = isUndefinedOr ? value !== undefined : value != null;
+                if (isSome) {
+                    elementCodec.lower(value);
+                    i32Stack.push(1);
+                } else {
+                    i32Stack.push(0);
+                }
+            },
+            lift() {
+                if (i32Stack.pop() === 0) {
+                    return isUndefinedOr ? undefined : null;
+                }
+                return elementCodec.lift();
+            },
+        };
+        cache.set(elementCodec, codec);
+        return codec;
+    }
+    const __bjs_dictCodecCache = new WeakMap();
+    function __bjs_dictCodec(valueCodec) {
+        let codec = __bjs_dictCodecCache.get(valueCodec);
+        if (codec !== undefined) {
+            return codec;
+        }
+        codec = {
+            lower(value) {
+                const keys = Object.keys(value);
+                for (let i = 0; i < keys.length; i++) {
+                    __bjs_stringCodec.lower(keys[i]);
+                    valueCodec.lower(value[keys[i]]);
+                }
+                i32Stack.push(keys.length);
+            },
+            lift() {
+                const count = i32Stack.pop();
+                const result = {};
+                for (let i = 0; i < count; i++) {
+                    const value = valueCodec.lift();
+                    const key = __bjs_stringCodec.lift();
+                    result[key] = value;
+                }
+                return result;
+            },
+        };
+        __bjs_dictCodecCache.set(valueCodec, codec);
+        return codec;
+    }
+
+    const __bjs_stringCodec = {
+        lower: (v) => {
+            const bytes = textEncoder.encode(v);
+            const id = swift.memory.retain(bytes);
+            i32Stack.push(bytes.length);
+            i32Stack.push(id);
+        },
+        lift: () => {
+            const string = strStack.pop();
+            return string;
+        },
+    };
+    const __bjs_primitiveCodecs = {
+        Bool: {
+            lower: (v) => {
+                i32Stack.push(v ? 1 : 0);
+            },
+            lift: () => {
+                const bool = i32Stack.pop() !== 0;
+                return bool;
+            },
+        },
+        Int: {
+            lower: (v) => {
+                i32Stack.push((v | 0));
+            },
+            lift: () => {
+                const int = i32Stack.pop();
+                return int;
+            },
+        },
+        Int8: {
+            lower: (v) => {
+                i32Stack.push((v | 0));
+            },
+            lift: () => {
+                const int = i32Stack.pop();
+                return int;
+            },
+        },
+        UInt8: {
+            lower: (v) => {
+                i32Stack.push((v | 0));
+            },
+            lift: () => {
+                const int = i32Stack.pop() >>> 0;
+                return int;
+            },
+        },
+        Int16: {
+            lower: (v) => {
+                i32Stack.push((v | 0));
+            },
+            lift: () => {
+                const int = i32Stack.pop();
+                return int;
+            },
+        },
+        UInt16: {
+            lower: (v) => {
+                i32Stack.push((v | 0));
+            },
+            lift: () => {
+                const int = i32Stack.pop() >>> 0;
+                return int;
+            },
+        },
+        Int32: {
+            lower: (v) => {
+                i32Stack.push((v | 0));
+            },
+            lift: () => {
+                const int = i32Stack.pop();
+                return int;
+            },
+        },
+        UInt32: {
+            lower: (v) => {
+                i32Stack.push((v | 0));
+            },
+            lift: () => {
+                const int = i32Stack.pop() >>> 0;
+                return int;
+            },
+        },
+        UInt: {
+            lower: (v) => {
+                i32Stack.push((v | 0));
+            },
+            lift: () => {
+                const int = i32Stack.pop() >>> 0;
+                return int;
+            },
+        },
+        Int64: {
+            lower: (v) => {
+                i64Stack.push(v);
+            },
+            lift: () => {
+                const int = i64Stack.pop();
+                return int;
+            },
+        },
+        UInt64: {
+            lower: (v) => {
+                i64Stack.push(v);
+            },
+            lift: () => {
+                const int = i64Stack.pop();
+                return int;
+            },
+        },
+        Float: {
+            lower: (v) => {
+                f32Stack.push(Math.fround(v));
+            },
+            lift: () => {
+                const f32 = f32Stack.pop();
+                return f32;
+            },
+        },
+        Double: {
+            lower: (v) => {
+                f64Stack.push(v);
+            },
+            lift: () => {
+                const f64 = f64Stack.pop();
+                return f64;
+            },
+        },
+        String: __bjs_stringCodec,
+        JSValue: {
+            lower: (v) => {
+                const [vKind, vPayload1, vPayload2] = __bjs_jsValueLower(v);
+                i32Stack.push(vKind);
+                i32Stack.push(vPayload1);
+                f64Stack.push(vPayload2);
+            },
+            lift: () => {
+                const jsValuePayload2 = f64Stack.pop();
+                const jsValuePayload1 = i32Stack.pop();
+                const jsValueKind = i32Stack.pop();
+                const jsValue = __bjs_jsValueLift(jsValueKind, jsValuePayload1, jsValuePayload2);
+                return jsValue;
+            },
+        },
+    };
+
+    function __bjs_jsValueLower(value) {
+        let kind;
+        let payload1;
+        let payload2;
+        if (value === null) {
+            kind = 4;
+            payload1 = 0;
+            payload2 = 0;
+        } else {
+            switch (typeof value) {
+                case "boolean":
+                    kind = 0;
+                    payload1 = value ? 1 : 0;
+                    payload2 = 0;
+                    break;
+                case "number":
+                    kind = 2;
+                    payload1 = 0;
+                    payload2 = value;
+                    break;
+                case "string":
+                    kind = 1;
+                    payload1 = swift.memory.retain(value);
+                    payload2 = 0;
+                    break;
+                case "undefined":
+                    kind = 5;
+                    payload1 = 0;
+                    payload2 = 0;
+                    break;
+                case "object":
+                    kind = 3;
+                    payload1 = swift.memory.retain(value);
+                    payload2 = 0;
+                    break;
+                case "function":
+                    kind = 3;
+                    payload1 = swift.memory.retain(value);
+                    payload2 = 0;
+                    break;
+                case "symbol":
+                    kind = 7;
+                    payload1 = swift.memory.retain(value);
+                    payload2 = 0;
+                    break;
+                case "bigint":
+                    kind = 8;
+                    payload1 = swift.memory.retain(value);
+                    payload2 = 0;
+                    break;
+                default:
+                    throw new TypeError("Unsupported JSValue type");
+            }
+        }
+        return [kind, payload1, payload2];
+    }
+    function __bjs_jsValueLift(kind, payload1, payload2) {
+        let jsValue;
+        switch (kind) {
+            case 0:
+                jsValue = payload1 !== 0;
+                break;
+            case 1:
+                jsValue = swift.memory.getObject(payload1);
+                break;
+            case 2:
+                jsValue = payload2;
+                break;
+            case 3:
+                jsValue = swift.memory.getObject(payload1);
+                break;
+            case 4:
+                jsValue = null;
+                break;
+            case 5:
+                jsValue = undefined;
+                break;
+            case 7:
+                jsValue = swift.memory.getObject(payload1);
+                break;
+            case 8:
+                jsValue = swift.memory.getObject(payload1);
+                break;
+            default:
+                throw new TypeError("Unsupported JSValue kind " + kind);
+        }
+        return jsValue;
+    }
+
+    const __bjs_codec_Optional_String = __bjs_optionalCodec(__bjs_stringCodec);
+    const __bjs_codec_Optional_Bool = __bjs_optionalCodec(__bjs_primitiveCodecs.Bool);
+    const __bjs_codec_Optional_Int = __bjs_optionalCodec(__bjs_primitiveCodecs.Int);
+    const __bjs_codec_M10TestModuleT9Precision = {
+        lower: (v) => {
+            f32Stack.push(Math.fround(v));
+        },
+        lift: () => {
+            const rawValue = f32Stack.pop();
+            return rawValue;
+        },
+    };
+    const __bjs_codec_Optional_M10TestModuleT9Precision = __bjs_optionalCodec(__bjs_codec_M10TestModuleT9Precision);
+    const __bjs_codec_M10TestModuleT17CardinalDirection = {
+        lower: (v) => {
+            i32Stack.push((v | 0));
+        },
+        lift: () => {
+            const caseId = i32Stack.pop();
+            return caseId;
+        },
+    };
+    const __bjs_codec_Optional_M10TestModuleT17CardinalDirection = __bjs_optionalCodec(__bjs_codec_M10TestModuleT17CardinalDirection);
+    const __bjs_codec_Array_Int = __bjs_arrayCodec(__bjs_primitiveCodecs.Int);
+    const __bjs_codec_M10TestModuleT5Point = {
+        lower: (v) => {
+            structHelpers.M10TestModuleT5Point.lower(v);
+        },
+        lift: () => {
+            const struct = structHelpers.M10TestModuleT5Point.lift();
+            return struct;
+        },
+    };
+    const __bjs_codec_Optional_M10TestModuleT5Point = __bjs_optionalCodec(__bjs_codec_M10TestModuleT5Point);
+    const __bjs_codec_M10TestModuleT4User = {
+        lower: (v) => {
+            ptrStack.push(v.pointer);
+        },
+        lift: () => {
+            const ptr = ptrStack.pop();
+            const obj = _exports['User'].__construct(ptr);
+            return obj;
+        },
+    };
+    const __bjs_codec_Optional_M10TestModuleT4User = __bjs_optionalCodec(__bjs_codec_M10TestModuleT4User);
+    const __bjs_codec_JSObject = {
+        lower: (v) => {
+            const objId = swift.memory.retain(v);
+            i32Stack.push(objId);
+        },
+        lift: () => {
+            const objId = i32Stack.pop();
+            const obj = swift.memory.getObject(objId);
+            swift.memory.release(objId);
+            return obj;
+        },
+    };
+    const __bjs_codec_Optional_JSObject = __bjs_optionalCodec(__bjs_codec_JSObject);
+    const __bjs_codec_M10TestModuleT9APIResult = {
+        lower: (v) => {
+            const caseId = enumHelpers.M10TestModuleT9APIResult.lower(v);
+            i32Stack.push(caseId);
+        },
+        lift: () => {
+            const enumValue = enumHelpers.M10TestModuleT9APIResult.lift(i32Stack.pop());
+            return enumValue;
+        },
+    };
+    const __bjs_codec_Optional_M10TestModuleT9APIResult = __bjs_optionalCodec(__bjs_codec_M10TestModuleT9APIResult);
+    const __bjs_codec_Optional_Array_Int = __bjs_optionalCodec(__bjs_codec_Array_Int);
+
+    const __bjs_createStructHelpers_M10TestModuleT5Point = () => ({
         lower: (value) => {
             f64Stack.push(value.x);
             f64Stack.push(value.y);
@@ -123,7 +517,7 @@ export async function createInstantiator(options, swift) {
             return { x: f641, y: f64 };
         }
     });
-    const __bjs_createAPIResultValuesHelpers = () => ({
+    const __bjs_createEnumHelpers_M10TestModuleT9APIResult = () => ({
         lower: (value) => {
             const enumTag = value.tag;
             switch (enumTag) {
@@ -184,7 +578,7 @@ export async function createInstantiator(options, swift) {
             }
         }
     });
-    const __bjs_createComplexResultValuesHelpers = () => ({
+    const __bjs_createEnumHelpers_M10TestModuleT13ComplexResult = () => ({
         lower: (value) => {
             const enumTag = value.tag;
             switch (enumTag) {
@@ -286,7 +680,7 @@ export async function createInstantiator(options, swift) {
             }
         }
     });
-    const __bjs_createResultValuesHelpers = () => ({
+    const __bjs_createEnumHelpers_M10TestModuleT9UtilitiesT6Result = () => ({
         lower: (value) => {
             const enumTag = value.tag;
             switch (enumTag) {
@@ -339,7 +733,7 @@ export async function createInstantiator(options, swift) {
             }
         }
     });
-    const __bjs_createNetworkingResultValuesHelpers = () => ({
+    const __bjs_createEnumHelpers_M10TestModuleT16NetworkingResult = () => ({
         lower: (value) => {
             const enumTag = value.tag;
             switch (enumTag) {
@@ -377,53 +771,23 @@ export async function createInstantiator(options, swift) {
             }
         }
     });
-    const __bjs_createAPIOptionalResultValuesHelpers = () => ({
+    const __bjs_createEnumHelpers_M10TestModuleT17APIOptionalResult = () => ({
         lower: (value) => {
             const enumTag = value.tag;
             switch (enumTag) {
                 case APIOptionalResultValues.Tag.Success: {
-                    const isSome = value.param0 != null ? 1 : 0;
-                    if (isSome) {
-                        const bytes = textEncoder.encode(value.param0);
-                        const id = swift.memory.retain(bytes);
-                        i32Stack.push(bytes.length);
-                        i32Stack.push(id);
-                    }
-                    i32Stack.push(isSome);
+                    __bjs_codec_Optional_String.lower(value.param0);
                     return APIOptionalResultValues.Tag.Success;
                 }
                 case APIOptionalResultValues.Tag.Failure: {
-                    const isSome = value.param1 != null ? 1 : 0;
-                    if (isSome) {
-                        i32Stack.push(value.param1 ? 1 : 0);
-                    }
-                    i32Stack.push(isSome);
-                    const isSome1 = value.param0 != null ? 1 : 0;
-                    if (isSome1) {
-                        i32Stack.push((value.param0 | 0));
-                    }
-                    i32Stack.push(isSome1);
+                    __bjs_codec_Optional_Bool.lower(value.param1);
+                    __bjs_codec_Optional_Int.lower(value.param0);
                     return APIOptionalResultValues.Tag.Failure;
                 }
                 case APIOptionalResultValues.Tag.Status: {
-                    const isSome = value.param2 != null ? 1 : 0;
-                    if (isSome) {
-                        const bytes = textEncoder.encode(value.param2);
-                        const id = swift.memory.retain(bytes);
-                        i32Stack.push(bytes.length);
-                        i32Stack.push(id);
-                    }
-                    i32Stack.push(isSome);
-                    const isSome1 = value.param1 != null ? 1 : 0;
-                    if (isSome1) {
-                        i32Stack.push((value.param1 | 0));
-                    }
-                    i32Stack.push(isSome1);
-                    const isSome2 = value.param0 != null ? 1 : 0;
-                    if (isSome2) {
-                        i32Stack.push(value.param0 ? 1 : 0);
-                    }
-                    i32Stack.push(isSome2);
+                    __bjs_codec_Optional_String.lower(value.param2);
+                    __bjs_codec_Optional_Int.lower(value.param1);
+                    __bjs_codec_Optional_Bool.lower(value.param0);
                     return APIOptionalResultValues.Tag.Status;
                 }
                 default: throw new Error("Unknown APIOptionalResultValues tag: " + String(enumTag));
@@ -433,67 +797,25 @@ export async function createInstantiator(options, swift) {
             tag = tag | 0;
             switch (tag) {
                 case APIOptionalResultValues.Tag.Success: {
-                    const isSome = i32Stack.pop();
-                    let optValue;
-                    if (isSome === 0) {
-                        optValue = null;
-                    } else {
-                        const string = strStack.pop();
-                        optValue = string;
-                    }
+                    const optValue = __bjs_codec_Optional_String.lift();
                     return { tag: APIOptionalResultValues.Tag.Success, param0: optValue };
                 }
                 case APIOptionalResultValues.Tag.Failure: {
-                    const isSome = i32Stack.pop();
-                    let optValue;
-                    if (isSome === 0) {
-                        optValue = null;
-                    } else {
-                        const bool = i32Stack.pop() !== 0;
-                        optValue = bool;
-                    }
-                    const isSome1 = i32Stack.pop();
-                    let optValue1;
-                    if (isSome1 === 0) {
-                        optValue1 = null;
-                    } else {
-                        const int = i32Stack.pop();
-                        optValue1 = int;
-                    }
+                    const optValue = __bjs_codec_Optional_Bool.lift();
+                    const optValue1 = __bjs_codec_Optional_Int.lift();
                     return { tag: APIOptionalResultValues.Tag.Failure, param0: optValue1, param1: optValue };
                 }
                 case APIOptionalResultValues.Tag.Status: {
-                    const isSome = i32Stack.pop();
-                    let optValue;
-                    if (isSome === 0) {
-                        optValue = null;
-                    } else {
-                        const string = strStack.pop();
-                        optValue = string;
-                    }
-                    const isSome1 = i32Stack.pop();
-                    let optValue1;
-                    if (isSome1 === 0) {
-                        optValue1 = null;
-                    } else {
-                        const int = i32Stack.pop();
-                        optValue1 = int;
-                    }
-                    const isSome2 = i32Stack.pop();
-                    let optValue2;
-                    if (isSome2 === 0) {
-                        optValue2 = null;
-                    } else {
-                        const bool = i32Stack.pop() !== 0;
-                        optValue2 = bool;
-                    }
+                    const optValue = __bjs_codec_Optional_String.lift();
+                    const optValue1 = __bjs_codec_Optional_Int.lift();
+                    const optValue2 = __bjs_codec_Optional_Bool.lift();
                     return { tag: APIOptionalResultValues.Tag.Status, param0: optValue2, param1: optValue1, param2: optValue };
                 }
                 default: throw new Error("Unknown APIOptionalResultValues tag returned from Swift: " + String(tag));
             }
         }
     });
-    const __bjs_createTypedPayloadResultValuesHelpers = () => ({
+    const __bjs_createEnumHelpers_M10TestModuleT18TypedPayloadResult = () => ({
         lower: (value) => {
             const enumTag = value.tag;
             switch (enumTag) {
@@ -506,19 +828,11 @@ export async function createInstantiator(options, swift) {
                     return TypedPayloadResultValues.Tag.Direction;
                 }
                 case TypedPayloadResultValues.Tag.OptPrecision: {
-                    const isSome = value.param0 != null ? 1 : 0;
-                    if (isSome) {
-                        f32Stack.push(Math.fround(value.param0));
-                    }
-                    i32Stack.push(isSome);
+                    __bjs_codec_Optional_M10TestModuleT9Precision.lower(value.param0);
                     return TypedPayloadResultValues.Tag.OptPrecision;
                 }
                 case TypedPayloadResultValues.Tag.OptDirection: {
-                    const isSome = value.param0 != null ? 1 : 0;
-                    if (isSome) {
-                        i32Stack.push((value.param0 | 0));
-                    }
-                    i32Stack.push(isSome);
+                    __bjs_codec_Optional_M10TestModuleT17CardinalDirection.lower(value.param0);
                     return TypedPayloadResultValues.Tag.OptDirection;
                 }
                 case TypedPayloadResultValues.Tag.Empty: {
@@ -539,25 +853,11 @@ export async function createInstantiator(options, swift) {
                     return { tag: TypedPayloadResultValues.Tag.Direction, param0: caseId };
                 }
                 case TypedPayloadResultValues.Tag.OptPrecision: {
-                    const isSome = i32Stack.pop();
-                    let optValue;
-                    if (isSome === 0) {
-                        optValue = null;
-                    } else {
-                        const rawValue = f32Stack.pop();
-                        optValue = rawValue;
-                    }
+                    const optValue = __bjs_codec_Optional_M10TestModuleT9Precision.lift();
                     return { tag: TypedPayloadResultValues.Tag.OptPrecision, param0: optValue };
                 }
                 case TypedPayloadResultValues.Tag.OptDirection: {
-                    const isSome = i32Stack.pop();
-                    let optValue;
-                    if (isSome === 0) {
-                        optValue = null;
-                    } else {
-                        const caseId = i32Stack.pop();
-                        optValue = caseId;
-                    }
+                    const optValue = __bjs_codec_Optional_M10TestModuleT17CardinalDirection.lift();
                     return { tag: TypedPayloadResultValues.Tag.OptDirection, param0: optValue };
                 }
                 case TypedPayloadResultValues.Tag.Empty: return { tag: TypedPayloadResultValues.Tag.Empty };
@@ -565,12 +865,12 @@ export async function createInstantiator(options, swift) {
             }
         }
     });
-    const __bjs_createAllTypesResultValuesHelpers = () => ({
+    const __bjs_createEnumHelpers_M10TestModuleT14AllTypesResult = () => ({
         lower: (value) => {
             const enumTag = value.tag;
             switch (enumTag) {
                 case AllTypesResultValues.Tag.StructPayload: {
-                    structHelpers.Point.lower(value.param0);
+                    structHelpers.M10TestModuleT5Point.lower(value.param0);
                     return AllTypesResultValues.Tag.StructPayload;
                 }
                 case AllTypesResultValues.Tag.ClassPayload: {
@@ -583,15 +883,12 @@ export async function createInstantiator(options, swift) {
                     return AllTypesResultValues.Tag.JsObjectPayload;
                 }
                 case AllTypesResultValues.Tag.NestedEnum: {
-                    const caseId = enumHelpers.APIResult.lower(value.param0);
+                    const caseId = enumHelpers.M10TestModuleT9APIResult.lower(value.param0);
                     i32Stack.push(caseId);
                     return AllTypesResultValues.Tag.NestedEnum;
                 }
                 case AllTypesResultValues.Tag.ArrayPayload: {
-                    for (const elem of value.param0) {
-                        i32Stack.push((elem | 0));
-                    }
-                    i32Stack.push(value.param0.length);
+                    __bjs_codec_Array_Int.lower(value.param0);
                     return AllTypesResultValues.Tag.ArrayPayload;
                 }
                 case AllTypesResultValues.Tag.Empty: {
@@ -604,7 +901,7 @@ export async function createInstantiator(options, swift) {
             tag = tag | 0;
             switch (tag) {
                 case AllTypesResultValues.Tag.StructPayload: {
-                    const struct = structHelpers.Point.lift();
+                    const struct = structHelpers.M10TestModuleT5Point.lift();
                     return { tag: AllTypesResultValues.Tag.StructPayload, param0: struct };
                 }
                 case AllTypesResultValues.Tag.ClassPayload: {
@@ -619,22 +916,11 @@ export async function createInstantiator(options, swift) {
                     return { tag: AllTypesResultValues.Tag.JsObjectPayload, param0: obj };
                 }
                 case AllTypesResultValues.Tag.NestedEnum: {
-                    const enumValue = enumHelpers.APIResult.lift(i32Stack.pop());
+                    const enumValue = enumHelpers.M10TestModuleT9APIResult.lift(i32Stack.pop());
                     return { tag: AllTypesResultValues.Tag.NestedEnum, param0: enumValue };
                 }
                 case AllTypesResultValues.Tag.ArrayPayload: {
-                    const arrayLen = i32Stack.pop();
-                    let arrayResult;
-                    if (arrayLen === -1) {
-                        arrayResult = taStack.pop();
-                    } else {
-                        arrayResult = [];
-                        for (let i = 0; i < arrayLen; i++) {
-                            const int = i32Stack.pop();
-                            arrayResult.push(int);
-                        }
-                        arrayResult.reverse();
-                    }
+                    const arrayResult = __bjs_codec_Array_Int.lift();
                     return { tag: AllTypesResultValues.Tag.ArrayPayload, param0: arrayResult };
                 }
                 case AllTypesResultValues.Tag.Empty: return { tag: AllTypesResultValues.Tag.Empty };
@@ -642,54 +928,28 @@ export async function createInstantiator(options, swift) {
             }
         }
     });
-    const __bjs_createOptionalAllTypesResultValuesHelpers = () => ({
+    const __bjs_createEnumHelpers_M10TestModuleT22OptionalAllTypesResult = () => ({
         lower: (value) => {
             const enumTag = value.tag;
             switch (enumTag) {
                 case OptionalAllTypesResultValues.Tag.OptStruct: {
-                    const isSome = value.param0 != null ? 1 : 0;
-                    if (isSome) {
-                        structHelpers.Point.lower(value.param0);
-                    }
-                    i32Stack.push(isSome);
+                    __bjs_codec_Optional_M10TestModuleT5Point.lower(value.param0);
                     return OptionalAllTypesResultValues.Tag.OptStruct;
                 }
                 case OptionalAllTypesResultValues.Tag.OptClass: {
-                    const isSome = value.param0 != null ? 1 : 0;
-                    if (isSome) {
-                        ptrStack.push(value.param0.pointer);
-                    }
-                    i32Stack.push(isSome);
+                    __bjs_codec_Optional_M10TestModuleT4User.lower(value.param0);
                     return OptionalAllTypesResultValues.Tag.OptClass;
                 }
                 case OptionalAllTypesResultValues.Tag.OptJSObject: {
-                    const isSome = value.param0 != null ? 1 : 0;
-                    if (isSome) {
-                        const objId = swift.memory.retain(value.param0);
-                        i32Stack.push(objId);
-                    }
-                    i32Stack.push(isSome);
+                    __bjs_codec_Optional_JSObject.lower(value.param0);
                     return OptionalAllTypesResultValues.Tag.OptJSObject;
                 }
                 case OptionalAllTypesResultValues.Tag.OptNestedEnum: {
-                    const isSome = value.param0 != null ? 1 : 0;
-                    if (isSome) {
-                        const caseId = enumHelpers.APIResult.lower(value.param0);
-                        i32Stack.push(caseId);
-                    } else {
-                        i32Stack.push(-1);
-                    }
+                    __bjs_codec_Optional_M10TestModuleT9APIResult.lower(value.param0);
                     return OptionalAllTypesResultValues.Tag.OptNestedEnum;
                 }
                 case OptionalAllTypesResultValues.Tag.OptArray: {
-                    const isSome = value.param0 != null ? 1 : 0;
-                    if (isSome) {
-                        for (const elem of value.param0) {
-                            i32Stack.push((elem | 0));
-                        }
-                        i32Stack.push(value.param0.length);
-                    }
-                    i32Stack.push(isSome);
+                    __bjs_codec_Optional_Array_Int.lower(value.param0);
                     return OptionalAllTypesResultValues.Tag.OptArray;
                 }
                 case OptionalAllTypesResultValues.Tag.Empty: {
@@ -702,71 +962,23 @@ export async function createInstantiator(options, swift) {
             tag = tag | 0;
             switch (tag) {
                 case OptionalAllTypesResultValues.Tag.OptStruct: {
-                    const isSome = i32Stack.pop();
-                    let optValue;
-                    if (isSome === 0) {
-                        optValue = null;
-                    } else {
-                        const struct = structHelpers.Point.lift();
-                        optValue = struct;
-                    }
+                    const optValue = __bjs_codec_Optional_M10TestModuleT5Point.lift();
                     return { tag: OptionalAllTypesResultValues.Tag.OptStruct, param0: optValue };
                 }
                 case OptionalAllTypesResultValues.Tag.OptClass: {
-                    const isSome = i32Stack.pop();
-                    let optValue;
-                    if (isSome === 0) {
-                        optValue = null;
-                    } else {
-                        const ptr = ptrStack.pop();
-                        const obj = _exports['User'].__construct(ptr);
-                        optValue = obj;
-                    }
+                    const optValue = __bjs_codec_Optional_M10TestModuleT4User.lift();
                     return { tag: OptionalAllTypesResultValues.Tag.OptClass, param0: optValue };
                 }
                 case OptionalAllTypesResultValues.Tag.OptJSObject: {
-                    const isSome = i32Stack.pop();
-                    let optValue;
-                    if (isSome === 0) {
-                        optValue = null;
-                    } else {
-                        const objId = i32Stack.pop();
-                        const obj = swift.memory.getObject(objId);
-                        swift.memory.release(objId);
-                        optValue = obj;
-                    }
+                    const optValue = __bjs_codec_Optional_JSObject.lift();
                     return { tag: OptionalAllTypesResultValues.Tag.OptJSObject, param0: optValue };
                 }
                 case OptionalAllTypesResultValues.Tag.OptNestedEnum: {
-                    const caseId = i32Stack.pop();
-                    let optValue;
-                    if (caseId === -1) {
-                        optValue = null;
-                    } else {
-                        optValue = enumHelpers.APIResult.lift(caseId);
-                    }
+                    const optValue = __bjs_codec_Optional_M10TestModuleT9APIResult.lift();
                     return { tag: OptionalAllTypesResultValues.Tag.OptNestedEnum, param0: optValue };
                 }
                 case OptionalAllTypesResultValues.Tag.OptArray: {
-                    const isSome = i32Stack.pop();
-                    let optValue;
-                    if (isSome === 0) {
-                        optValue = null;
-                    } else {
-                        const arrayLen = i32Stack.pop();
-                        let arrayResult;
-                        if (arrayLen === -1) {
-                            arrayResult = taStack.pop();
-                        } else {
-                            arrayResult = [];
-                            for (let i = 0; i < arrayLen; i++) {
-                                const int = i32Stack.pop();
-                                arrayResult.push(int);
-                            }
-                            arrayResult.reverse();
-                        }
-                        optValue = arrayResult;
-                    }
+                    const optValue = __bjs_codec_Optional_Array_Int.lift();
                     return { tag: OptionalAllTypesResultValues.Tag.OptArray, param0: optValue };
                 }
                 case OptionalAllTypesResultValues.Tag.Empty: return { tag: OptionalAllTypesResultValues.Tag.Empty };
@@ -788,14 +1000,14 @@ export async function createInstantiator(options, swift) {
             bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) {
                 const source = swift.memory.getObject(sourceId);
                 swift.memory.release(sourceId);
-                const bytes = new Uint8Array(memory.buffer, bytesPtr);
+                const bytes = new Uint8Array(memory.buffer, bytesPtr >>> 0);
                 bytes.set(source);
             }
             bjs["swift_js_make_js_string"] = function(ptr, len) {
                 return swift.memory.retain(decodeString(ptr, len));
             }
             bjs["swift_js_init_memory_with_result"] = function(ptr, len) {
-                const target = new Uint8Array(memory.buffer, ptr, len);
+                const target = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0);
                 target.set(tmpRetBytes);
                 tmpRetBytes = undefined;
             }
@@ -850,12 +1062,21 @@ export async function createInstantiator(options, swift) {
                 taStack.push(Array.from(new Ctor(copy)));
             }
             bjs["swift_js_struct_lower_Point"] = function(objectId) {
-                structHelpers.Point.lower(swift.memory.getObject(objectId));
+                structHelpers.M10TestModuleT5Point.lower(swift.memory.getObject(objectId));
             }
             bjs["swift_js_struct_lift_Point"] = function() {
-                const value = structHelpers.Point.lift();
+                const value = structHelpers.M10TestModuleT5Point.lift();
                 return swift.memory.retain(value);
             }
+            bjs["bjs_core_register_type_handles"] = function() {};
+            bjs["bjs_TestModule_register_type_handles"] = function() {};
+            const __bjs_promiseSettlers = Symbol("JavaScriptKit.promiseSettlers");
+            bjs["swift_js_make_promise"] = function() {
+                let resolve, reject;
+                const promise = new Promise((res, rej) => { resolve = res; reject = rej; });
+                promise[__bjs_promiseSettlers] = { resolve, reject };
+                return swift.memory.retain(promise);
+            }
             bjs["swift_js_return_optional_bool"] = function(isSome, value) {
                 if (isSome === 0) {
                     tmpRetOptionalBool = null;
@@ -980,6 +1201,7 @@ export async function createInstantiator(options, swift) {
             /// Represents a Swift heap object like a class instance or an actor instance.
             class SwiftHeapObject {
                 static __wrap(pointer, deinit, prototype, identityCache) {
+                    pointer = pointer >>> 0;
                     const makeFresh = (identityMap) => {
                         const obj = Object.create(prototype);
                         const state = { pointer, deinit, hasReleased: false, identityMap };
@@ -1025,140 +1247,139 @@ export async function createInstantiator(options, swift) {
                 }
 
             }
-            const PointHelpers = __bjs_createPointHelpers();
-            structHelpers.Point = PointHelpers;
+            const __bjs_helpers_M10TestModuleT5Point = __bjs_createStructHelpers_M10TestModuleT5Point();
+            structHelpers.M10TestModuleT5Point = __bjs_helpers_M10TestModuleT5Point;
 
-            const APIResultHelpers = __bjs_createAPIResultValuesHelpers();
-            enumHelpers.APIResult = APIResultHelpers;
+            const __bjs_helpers_M10TestModuleT9APIResult = __bjs_createEnumHelpers_M10TestModuleT9APIResult();
+            enumHelpers.M10TestModuleT9APIResult = __bjs_helpers_M10TestModuleT9APIResult;
 
-            const ComplexResultHelpers = __bjs_createComplexResultValuesHelpers();
-            enumHelpers.ComplexResult = ComplexResultHelpers;
+            const __bjs_helpers_M10TestModuleT13ComplexResult = __bjs_createEnumHelpers_M10TestModuleT13ComplexResult();
+            enumHelpers.M10TestModuleT13ComplexResult = __bjs_helpers_M10TestModuleT13ComplexResult;
 
-            const ResultHelpers = __bjs_createResultValuesHelpers();
-            enumHelpers.Result = ResultHelpers;
+            const __bjs_helpers_M10TestModuleT9UtilitiesT6Result = __bjs_createEnumHelpers_M10TestModuleT9UtilitiesT6Result();
+            enumHelpers.M10TestModuleT9UtilitiesT6Result = __bjs_helpers_M10TestModuleT9UtilitiesT6Result;
 
-            const NetworkingResultHelpers = __bjs_createNetworkingResultValuesHelpers();
-            enumHelpers.NetworkingResult = NetworkingResultHelpers;
+            const __bjs_helpers_M10TestModuleT16NetworkingResult = __bjs_createEnumHelpers_M10TestModuleT16NetworkingResult();
+            enumHelpers.M10TestModuleT16NetworkingResult = __bjs_helpers_M10TestModuleT16NetworkingResult;
 
-            const APIOptionalResultHelpers = __bjs_createAPIOptionalResultValuesHelpers();
-            enumHelpers.APIOptionalResult = APIOptionalResultHelpers;
+            const __bjs_helpers_M10TestModuleT17APIOptionalResult = __bjs_createEnumHelpers_M10TestModuleT17APIOptionalResult();
+            enumHelpers.M10TestModuleT17APIOptionalResult = __bjs_helpers_M10TestModuleT17APIOptionalResult;
 
-            const TypedPayloadResultHelpers = __bjs_createTypedPayloadResultValuesHelpers();
-            enumHelpers.TypedPayloadResult = TypedPayloadResultHelpers;
+            const __bjs_helpers_M10TestModuleT18TypedPayloadResult = __bjs_createEnumHelpers_M10TestModuleT18TypedPayloadResult();
+            enumHelpers.M10TestModuleT18TypedPayloadResult = __bjs_helpers_M10TestModuleT18TypedPayloadResult;
 
-            const AllTypesResultHelpers = __bjs_createAllTypesResultValuesHelpers();
-            enumHelpers.AllTypesResult = AllTypesResultHelpers;
+            const __bjs_helpers_M10TestModuleT14AllTypesResult = __bjs_createEnumHelpers_M10TestModuleT14AllTypesResult();
+            enumHelpers.M10TestModuleT14AllTypesResult = __bjs_helpers_M10TestModuleT14AllTypesResult;
 
-            const OptionalAllTypesResultHelpers = __bjs_createOptionalAllTypesResultValuesHelpers();
-            enumHelpers.OptionalAllTypesResult = OptionalAllTypesResultHelpers;
+            const __bjs_helpers_M10TestModuleT22OptionalAllTypesResult = __bjs_createEnumHelpers_M10TestModuleT22OptionalAllTypesResult();
+            enumHelpers.M10TestModuleT22OptionalAllTypesResult = __bjs_helpers_M10TestModuleT22OptionalAllTypesResult;
 
             const exports = {
-                User,
                 handle: function bjs_handle(result) {
-                    const resultCaseId = enumHelpers.APIResult.lower(result);
+                    const resultCaseId = enumHelpers.M10TestModuleT9APIResult.lower(result);
                     instance.exports.bjs_handle(resultCaseId);
                 },
                 getResult: function bjs_getResult() {
                     instance.exports.bjs_getResult();
-                    const ret = enumHelpers.APIResult.lift(i32Stack.pop());
+                    const ret = enumHelpers.M10TestModuleT9APIResult.lift(i32Stack.pop());
                     return ret;
                 },
                 roundtripAPIResult: function bjs_roundtripAPIResult(result) {
-                    const resultCaseId = enumHelpers.APIResult.lower(result);
+                    const resultCaseId = enumHelpers.M10TestModuleT9APIResult.lower(result);
                     instance.exports.bjs_roundtripAPIResult(resultCaseId);
-                    const ret = enumHelpers.APIResult.lift(i32Stack.pop());
+                    const ret = enumHelpers.M10TestModuleT9APIResult.lift(i32Stack.pop());
                     return ret;
                 },
                 roundTripOptionalAPIResult: function bjs_roundTripOptionalAPIResult(result) {
                     const isSome = result != null;
                     let result1;
                     if (isSome) {
-                        const resultCaseId = enumHelpers.APIResult.lower(result);
+                        const resultCaseId = enumHelpers.M10TestModuleT9APIResult.lower(result);
                         result1 = resultCaseId;
                     } else {
                         result1 = 0;
                     }
                     instance.exports.bjs_roundTripOptionalAPIResult(+isSome, result1);
                     const tag = i32Stack.pop();
-                    const optResult = tag === -1 ? null : enumHelpers.APIResult.lift(tag);
+                    const optResult = tag === -1 ? null : enumHelpers.M10TestModuleT9APIResult.lift(tag);
                     return optResult;
                 },
                 handleComplex: function bjs_handleComplex(result) {
-                    const resultCaseId = enumHelpers.ComplexResult.lower(result);
+                    const resultCaseId = enumHelpers.M10TestModuleT13ComplexResult.lower(result);
                     instance.exports.bjs_handleComplex(resultCaseId);
                 },
                 getComplexResult: function bjs_getComplexResult() {
                     instance.exports.bjs_getComplexResult();
-                    const ret = enumHelpers.ComplexResult.lift(i32Stack.pop());
+                    const ret = enumHelpers.M10TestModuleT13ComplexResult.lift(i32Stack.pop());
                     return ret;
                 },
                 roundtripComplexResult: function bjs_roundtripComplexResult(result) {
-                    const resultCaseId = enumHelpers.ComplexResult.lower(result);
+                    const resultCaseId = enumHelpers.M10TestModuleT13ComplexResult.lower(result);
                     instance.exports.bjs_roundtripComplexResult(resultCaseId);
-                    const ret = enumHelpers.ComplexResult.lift(i32Stack.pop());
+                    const ret = enumHelpers.M10TestModuleT13ComplexResult.lift(i32Stack.pop());
                     return ret;
                 },
                 roundTripOptionalComplexResult: function bjs_roundTripOptionalComplexResult(result) {
                     const isSome = result != null;
                     let result1;
                     if (isSome) {
-                        const resultCaseId = enumHelpers.ComplexResult.lower(result);
+                        const resultCaseId = enumHelpers.M10TestModuleT13ComplexResult.lower(result);
                         result1 = resultCaseId;
                     } else {
                         result1 = 0;
                     }
                     instance.exports.bjs_roundTripOptionalComplexResult(+isSome, result1);
                     const tag = i32Stack.pop();
-                    const optResult = tag === -1 ? null : enumHelpers.ComplexResult.lift(tag);
+                    const optResult = tag === -1 ? null : enumHelpers.M10TestModuleT13ComplexResult.lift(tag);
                     return optResult;
                 },
                 roundTripOptionalUtilitiesResult: function bjs_roundTripOptionalUtilitiesResult(result) {
                     const isSome = result != null;
                     let result1;
                     if (isSome) {
-                        const resultCaseId = enumHelpers.Result.lower(result);
+                        const resultCaseId = enumHelpers.M10TestModuleT9UtilitiesT6Result.lower(result);
                         result1 = resultCaseId;
                     } else {
                         result1 = 0;
                     }
                     instance.exports.bjs_roundTripOptionalUtilitiesResult(+isSome, result1);
                     const tag = i32Stack.pop();
-                    const optResult = tag === -1 ? null : enumHelpers.Result.lift(tag);
+                    const optResult = tag === -1 ? null : enumHelpers.M10TestModuleT9UtilitiesT6Result.lift(tag);
                     return optResult;
                 },
                 roundTripOptionalNetworkingResult: function bjs_roundTripOptionalNetworkingResult(result) {
                     const isSome = result != null;
                     let result1;
                     if (isSome) {
-                        const resultCaseId = enumHelpers.NetworkingResult.lower(result);
+                        const resultCaseId = enumHelpers.M10TestModuleT16NetworkingResult.lower(result);
                         result1 = resultCaseId;
                     } else {
                         result1 = 0;
                     }
                     instance.exports.bjs_roundTripOptionalNetworkingResult(+isSome, result1);
                     const tag = i32Stack.pop();
-                    const optResult = tag === -1 ? null : enumHelpers.NetworkingResult.lift(tag);
+                    const optResult = tag === -1 ? null : enumHelpers.M10TestModuleT16NetworkingResult.lift(tag);
                     return optResult;
                 },
                 roundTripOptionalAPIOptionalResult: function bjs_roundTripOptionalAPIOptionalResult(result) {
                     const isSome = result != null;
                     let result1;
                     if (isSome) {
-                        const resultCaseId = enumHelpers.APIOptionalResult.lower(result);
+                        const resultCaseId = enumHelpers.M10TestModuleT17APIOptionalResult.lower(result);
                         result1 = resultCaseId;
                     } else {
                         result1 = 0;
                     }
                     instance.exports.bjs_roundTripOptionalAPIOptionalResult(+isSome, result1);
                     const tag = i32Stack.pop();
-                    const optResult = tag === -1 ? null : enumHelpers.APIOptionalResult.lift(tag);
+                    const optResult = tag === -1 ? null : enumHelpers.M10TestModuleT17APIOptionalResult.lift(tag);
                     return optResult;
                 },
                 compareAPIResults: function bjs_compareAPIResults(result1, result2) {
                     const isSome = result1 != null;
                     let result;
                     if (isSome) {
-                        const result1CaseId = enumHelpers.APIOptionalResult.lower(result1);
+                        const result1CaseId = enumHelpers.M10TestModuleT17APIOptionalResult.lower(result1);
                         result = result1CaseId;
                     } else {
                         result = 0;
@@ -1166,74 +1387,74 @@ export async function createInstantiator(options, swift) {
                     const isSome1 = result2 != null;
                     let result3;
                     if (isSome1) {
-                        const result2CaseId = enumHelpers.APIOptionalResult.lower(result2);
+                        const result2CaseId = enumHelpers.M10TestModuleT17APIOptionalResult.lower(result2);
                         result3 = result2CaseId;
                     } else {
                         result3 = 0;
                     }
                     instance.exports.bjs_compareAPIResults(+isSome, result, +isSome1, result3);
                     const tag = i32Stack.pop();
-                    const optResult = tag === -1 ? null : enumHelpers.APIOptionalResult.lift(tag);
+                    const optResult = tag === -1 ? null : enumHelpers.M10TestModuleT17APIOptionalResult.lift(tag);
                     return optResult;
                 },
                 roundTripTypedPayloadResult: function bjs_roundTripTypedPayloadResult(result) {
-                    const resultCaseId = enumHelpers.TypedPayloadResult.lower(result);
+                    const resultCaseId = enumHelpers.M10TestModuleT18TypedPayloadResult.lower(result);
                     instance.exports.bjs_roundTripTypedPayloadResult(resultCaseId);
-                    const ret = enumHelpers.TypedPayloadResult.lift(i32Stack.pop());
+                    const ret = enumHelpers.M10TestModuleT18TypedPayloadResult.lift(i32Stack.pop());
                     return ret;
                 },
                 roundTripOptionalTypedPayloadResult: function bjs_roundTripOptionalTypedPayloadResult(result) {
                     const isSome = result != null;
                     let result1;
                     if (isSome) {
-                        const resultCaseId = enumHelpers.TypedPayloadResult.lower(result);
+                        const resultCaseId = enumHelpers.M10TestModuleT18TypedPayloadResult.lower(result);
                         result1 = resultCaseId;
                     } else {
                         result1 = 0;
                     }
                     instance.exports.bjs_roundTripOptionalTypedPayloadResult(+isSome, result1);
                     const tag = i32Stack.pop();
-                    const optResult = tag === -1 ? null : enumHelpers.TypedPayloadResult.lift(tag);
+                    const optResult = tag === -1 ? null : enumHelpers.M10TestModuleT18TypedPayloadResult.lift(tag);
                     return optResult;
                 },
                 roundTripAllTypesResult: function bjs_roundTripAllTypesResult(result) {
-                    const resultCaseId = enumHelpers.AllTypesResult.lower(result);
+                    const resultCaseId = enumHelpers.M10TestModuleT14AllTypesResult.lower(result);
                     instance.exports.bjs_roundTripAllTypesResult(resultCaseId);
-                    const ret = enumHelpers.AllTypesResult.lift(i32Stack.pop());
+                    const ret = enumHelpers.M10TestModuleT14AllTypesResult.lift(i32Stack.pop());
                     return ret;
                 },
                 roundTripOptionalAllTypesResult: function bjs_roundTripOptionalAllTypesResult(result) {
                     const isSome = result != null;
                     let result1;
                     if (isSome) {
-                        const resultCaseId = enumHelpers.AllTypesResult.lower(result);
+                        const resultCaseId = enumHelpers.M10TestModuleT14AllTypesResult.lower(result);
                         result1 = resultCaseId;
                     } else {
                         result1 = 0;
                     }
                     instance.exports.bjs_roundTripOptionalAllTypesResult(+isSome, result1);
                     const tag = i32Stack.pop();
-                    const optResult = tag === -1 ? null : enumHelpers.AllTypesResult.lift(tag);
+                    const optResult = tag === -1 ? null : enumHelpers.M10TestModuleT14AllTypesResult.lift(tag);
                     return optResult;
                 },
                 roundTripOptionalPayloadResult: function bjs_roundTripOptionalPayloadResult(result) {
-                    const resultCaseId = enumHelpers.OptionalAllTypesResult.lower(result);
+                    const resultCaseId = enumHelpers.M10TestModuleT22OptionalAllTypesResult.lower(result);
                     instance.exports.bjs_roundTripOptionalPayloadResult(resultCaseId);
-                    const ret = enumHelpers.OptionalAllTypesResult.lift(i32Stack.pop());
+                    const ret = enumHelpers.M10TestModuleT22OptionalAllTypesResult.lift(i32Stack.pop());
                     return ret;
                 },
                 roundTripOptionalPayloadResultOpt: function bjs_roundTripOptionalPayloadResultOpt(result) {
                     const isSome = result != null;
                     let result1;
                     if (isSome) {
-                        const resultCaseId = enumHelpers.OptionalAllTypesResult.lower(result);
+                        const resultCaseId = enumHelpers.M10TestModuleT22OptionalAllTypesResult.lower(result);
                         result1 = resultCaseId;
                     } else {
                         result1 = 0;
                     }
                     instance.exports.bjs_roundTripOptionalPayloadResultOpt(+isSome, result1);
                     const tag = i32Stack.pop();
-                    const optResult = tag === -1 ? null : enumHelpers.OptionalAllTypesResult.lift(tag);
+                    const optResult = tag === -1 ? null : enumHelpers.M10TestModuleT22OptionalAllTypesResult.lift(tag);
                     return optResult;
                 },
                 APIResult: APIResultValues,
@@ -1247,6 +1468,7 @@ export async function createInstantiator(options, swift) {
                 API: {
                     NetworkingResult: NetworkingResultValues,
                 },
+                User,
                 Utilities: {
                     Result: ResultValues,
                 },
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumAssociatedValueImport.d.ts b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumAssociatedValueImport.d.ts
new file mode 100644
index 000000000..d29256af4
--- /dev/null
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumAssociatedValueImport.d.ts
@@ -0,0 +1,39 @@
+// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit,
+// DO NOT EDIT.
+//
+// To update this file, just rebuild your project or run
+// `swift package bridge-js`.
+
+export const PayloadSignalValues: {
+    readonly Tag: {
+        readonly Start: 0;
+        readonly Stop: 1;
+        readonly Idle: 2;
+    };
+};
+
+export type PayloadSignalTag =
+  { tag: typeof PayloadSignalValues.Tag.Start; param0: string } | { tag: typeof PayloadSignalValues.Tag.Stop; param0: number } | { tag: typeof PayloadSignalValues.Tag.Idle }
+
+export type PayloadSignalObject = typeof PayloadSignalValues;
+
+export interface PayloadSignalControls {
+    send(signal: PayloadSignalTag): void;
+    current(): PayloadSignalTag;
+    roundTripOptional(signal: PayloadSignalTag | null): PayloadSignalTag | null;
+}
+export type Exports = {
+    PayloadSignal: PayloadSignalObject
+}
+export type Imports = {
+    PayloadSignalControls: {
+        roundTrip(signal: PayloadSignalTag): PayloadSignalTag;
+    }
+}
+export function createInstantiator(options: {
+    imports: Imports;
+}, swift: any): Promise<{
+    addImports: (importObject: WebAssembly.Imports) => void;
+    setInstance: (instance: WebAssembly.Instance) => void;
+    createExports: (instance: WebAssembly.Instance) => Exports;
+}>;
\ No newline at end of file
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumAssociatedValueImport.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumAssociatedValueImport.js
new file mode 100644
index 000000000..2b36953bb
--- /dev/null
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumAssociatedValueImport.js
@@ -0,0 +1,326 @@
+// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit,
+// DO NOT EDIT.
+//
+// To update this file, just rebuild your project or run
+// `swift package bridge-js`.
+
+export const PayloadSignalValues = {
+    Tag: {
+        Start: 0,
+        Stop: 1,
+        Idle: 2,
+    },
+};
+export async function createInstantiator(options, swift) {
+    let instance;
+    let memory;
+    let setException;
+    let decodeString;
+    const textDecoder = new TextDecoder("utf-8");
+    const textEncoder = new TextEncoder("utf-8");
+    let tmpRetString;
+    let tmpRetBytes;
+    let tmpRetException;
+    let tmpRetOptionalBool;
+    let tmpRetOptionalInt;
+    let tmpRetOptionalFloat;
+    let tmpRetOptionalDouble;
+    let tmpRetOptionalHeapObject;
+    let strStack = [];
+    let i32Stack = [];
+    let i64Stack = [];
+    let f32Stack = [];
+    let f64Stack = [];
+    let ptrStack = [];
+    let taStack = [];
+    const enumHelpers = {};
+    const structHelpers = {};
+
+    let _exports = null;
+    let bjs = null;
+    const __bjs_createEnumHelpers_M10TestModuleT13PayloadSignal = () => ({
+        lower: (value) => {
+            const enumTag = value.tag;
+            switch (enumTag) {
+                case PayloadSignalValues.Tag.Start: {
+                    const bytes = textEncoder.encode(value.param0);
+                    const id = swift.memory.retain(bytes);
+                    i32Stack.push(bytes.length);
+                    i32Stack.push(id);
+                    return PayloadSignalValues.Tag.Start;
+                }
+                case PayloadSignalValues.Tag.Stop: {
+                    i32Stack.push((value.param0 | 0));
+                    return PayloadSignalValues.Tag.Stop;
+                }
+                case PayloadSignalValues.Tag.Idle: {
+                    return PayloadSignalValues.Tag.Idle;
+                }
+                default: throw new Error("Unknown PayloadSignalValues tag: " + String(enumTag));
+            }
+        },
+        lift: (tag) => {
+            tag = tag | 0;
+            switch (tag) {
+                case PayloadSignalValues.Tag.Start: {
+                    const string = strStack.pop();
+                    return { tag: PayloadSignalValues.Tag.Start, param0: string };
+                }
+                case PayloadSignalValues.Tag.Stop: {
+                    const int = i32Stack.pop();
+                    return { tag: PayloadSignalValues.Tag.Stop, param0: int };
+                }
+                case PayloadSignalValues.Tag.Idle: return { tag: PayloadSignalValues.Tag.Idle };
+                default: throw new Error("Unknown PayloadSignalValues tag returned from Swift: " + String(tag));
+            }
+        }
+    });
+
+    return {
+        /**
+         * @param {WebAssembly.Imports} importObject
+         */
+        addImports: (importObject, importsContext) => {
+            bjs = {};
+            importObject["bjs"] = bjs;
+            const imports = options.getImports(importsContext);
+            bjs["swift_js_return_string"] = function(ptr, len) {
+                tmpRetString = decodeString(ptr, len);
+            }
+            bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) {
+                const source = swift.memory.getObject(sourceId);
+                swift.memory.release(sourceId);
+                const bytes = new Uint8Array(memory.buffer, bytesPtr >>> 0);
+                bytes.set(source);
+            }
+            bjs["swift_js_make_js_string"] = function(ptr, len) {
+                return swift.memory.retain(decodeString(ptr, len));
+            }
+            bjs["swift_js_init_memory_with_result"] = function(ptr, len) {
+                const target = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0);
+                target.set(tmpRetBytes);
+                tmpRetBytes = undefined;
+            }
+            bjs["swift_js_throw"] = function(id) {
+                tmpRetException = swift.memory.retainByRef(id);
+            }
+            bjs["swift_js_retain"] = function(id) {
+                return swift.memory.retainByRef(id);
+            }
+            bjs["swift_js_release"] = function(id) {
+                swift.memory.release(id);
+            }
+            bjs["swift_js_push_i32"] = function(v) {
+                i32Stack.push(v | 0);
+            }
+            bjs["swift_js_push_f32"] = function(v) {
+                f32Stack.push(Math.fround(v));
+            }
+            bjs["swift_js_push_f64"] = function(v) {
+                f64Stack.push(v);
+            }
+            bjs["swift_js_push_string"] = function(ptr, len) {
+                const value = decodeString(ptr, len);
+                strStack.push(value);
+            }
+            bjs["swift_js_pop_i32"] = function() {
+                return i32Stack.pop();
+            }
+            bjs["swift_js_pop_f32"] = function() {
+                return f32Stack.pop();
+            }
+            bjs["swift_js_pop_f64"] = function() {
+                return f64Stack.pop();
+            }
+            bjs["swift_js_push_pointer"] = function(pointer) {
+                ptrStack.push(pointer);
+            }
+            bjs["swift_js_pop_pointer"] = function() {
+                return ptrStack.pop();
+            }
+            bjs["swift_js_push_i64"] = function(v) {
+                i64Stack.push(v);
+            }
+            bjs["swift_js_pop_i64"] = function() {
+                return i64Stack.pop();
+            }
+            const taCtors = [Int8Array, Uint8Array, Int16Array, Uint16Array, Int32Array, Uint32Array, Float32Array, Float64Array];
+            bjs["swift_js_push_typed_array"] = function(kind, ptr, count) {
+                const Ctor = taCtors[kind];
+                const byteLen = count * Ctor.BYTES_PER_ELEMENT;
+                const copy = memory.buffer.slice(ptr, ptr + byteLen);
+                taStack.push(Array.from(new Ctor(copy)));
+            }
+            bjs["bjs_core_register_type_handles"] = function() {};
+            bjs["bjs_TestModule_register_type_handles"] = function() {};
+            const __bjs_promiseSettlers = Symbol("JavaScriptKit.promiseSettlers");
+            bjs["swift_js_make_promise"] = function() {
+                let resolve, reject;
+                const promise = new Promise((res, rej) => { resolve = res; reject = rej; });
+                promise[__bjs_promiseSettlers] = { resolve, reject };
+                return swift.memory.retain(promise);
+            }
+            bjs["swift_js_return_optional_bool"] = function(isSome, value) {
+                if (isSome === 0) {
+                    tmpRetOptionalBool = null;
+                } else {
+                    tmpRetOptionalBool = value !== 0;
+                }
+            }
+            bjs["swift_js_return_optional_int"] = function(isSome, value) {
+                if (isSome === 0) {
+                    tmpRetOptionalInt = null;
+                } else {
+                    tmpRetOptionalInt = value | 0;
+                }
+            }
+            bjs["swift_js_return_optional_float"] = function(isSome, value) {
+                if (isSome === 0) {
+                    tmpRetOptionalFloat = null;
+                } else {
+                    tmpRetOptionalFloat = Math.fround(value);
+                }
+            }
+            bjs["swift_js_return_optional_double"] = function(isSome, value) {
+                if (isSome === 0) {
+                    tmpRetOptionalDouble = null;
+                } else {
+                    tmpRetOptionalDouble = value;
+                }
+            }
+            bjs["swift_js_return_optional_string"] = function(isSome, ptr, len) {
+                if (isSome === 0) {
+                    tmpRetString = null;
+                } else {
+                    tmpRetString = decodeString(ptr, len);
+                }
+            }
+            bjs["swift_js_return_optional_object"] = function(isSome, objectId) {
+                if (isSome === 0) {
+                    tmpRetString = null;
+                } else {
+                    tmpRetString = swift.memory.getObject(objectId);
+                }
+            }
+            bjs["swift_js_return_optional_heap_object"] = function(isSome, pointer) {
+                if (isSome === 0) {
+                    tmpRetOptionalHeapObject = null;
+                } else {
+                    tmpRetOptionalHeapObject = pointer;
+                }
+            }
+            bjs["swift_js_get_optional_int_presence"] = function() {
+                return tmpRetOptionalInt != null ? 1 : 0;
+            }
+            bjs["swift_js_get_optional_int_value"] = function() {
+                const value = tmpRetOptionalInt;
+                tmpRetOptionalInt = undefined;
+                return value;
+            }
+            bjs["swift_js_get_optional_string"] = function() {
+                const str = tmpRetString;
+                tmpRetString = undefined;
+                if (str == null) {
+                    return -1;
+                } else {
+                    const bytes = textEncoder.encode(str);
+                    tmpRetBytes = bytes;
+                    return bytes.length;
+                }
+            }
+            bjs["swift_js_get_optional_float_presence"] = function() {
+                return tmpRetOptionalFloat != null ? 1 : 0;
+            }
+            bjs["swift_js_get_optional_float_value"] = function() {
+                const value = tmpRetOptionalFloat;
+                tmpRetOptionalFloat = undefined;
+                return value;
+            }
+            bjs["swift_js_get_optional_double_presence"] = function() {
+                return tmpRetOptionalDouble != null ? 1 : 0;
+            }
+            bjs["swift_js_get_optional_double_value"] = function() {
+                const value = tmpRetOptionalDouble;
+                tmpRetOptionalDouble = undefined;
+                return value;
+            }
+            bjs["swift_js_get_optional_heap_object_pointer"] = function() {
+                const pointer = tmpRetOptionalHeapObject;
+                tmpRetOptionalHeapObject = undefined;
+                return pointer || 0;
+            }
+            bjs["swift_js_closure_unregister"] = function(funcRef) {}
+            const TestModule = importObject["TestModule"] = importObject["TestModule"] || {};
+            TestModule["bjs_PayloadSignalControls_roundTrip_static"] = function bjs_PayloadSignalControls_roundTrip_static(signal) {
+                try {
+                    const enumValue = enumHelpers.M10TestModuleT13PayloadSignal.lift(signal);
+                    let ret = imports.PayloadSignalControls.roundTrip(enumValue);
+                    const caseId = enumHelpers.M10TestModuleT13PayloadSignal.lower(ret);
+                    return caseId;
+                } catch (error) {
+                    setException(error);
+                }
+            }
+            TestModule["bjs_PayloadSignalControls_send"] = function bjs_PayloadSignalControls_send(self, signal) {
+                try {
+                    const enumValue = enumHelpers.M10TestModuleT13PayloadSignal.lift(signal);
+                    swift.memory.getObject(self).send(enumValue);
+                } catch (error) {
+                    setException(error);
+                }
+            }
+            TestModule["bjs_PayloadSignalControls_current"] = function bjs_PayloadSignalControls_current(self) {
+                try {
+                    let ret = swift.memory.getObject(self).current();
+                    const caseId = enumHelpers.M10TestModuleT13PayloadSignal.lower(ret);
+                    return caseId;
+                } catch (error) {
+                    setException(error);
+                }
+            }
+            TestModule["bjs_PayloadSignalControls_roundTripOptional"] = function bjs_PayloadSignalControls_roundTripOptional(self, signalIsSome, signalCaseId) {
+                try {
+                    let optResult;
+                    if (signalIsSome) {
+                        const enumValue = enumHelpers.M10TestModuleT13PayloadSignal.lift(signalCaseId);
+                        optResult = enumValue;
+                    } else {
+                        optResult = null;
+                    }
+                    let ret = swift.memory.getObject(self).roundTripOptional(optResult);
+                    const isSome = ret != null;
+                    if (isSome) {
+                        const caseId = enumHelpers.M10TestModuleT13PayloadSignal.lower(ret);
+                        return caseId;
+                    } else {
+                        return -1;
+                    }
+                } catch (error) {
+                    setException(error);
+                }
+            }
+        },
+        setInstance: (i) => {
+            instance = i;
+            memory = instance.exports.memory;
+
+            decodeString = (ptr, len) => { const bytes = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); return textDecoder.decode(bytes); }
+
+            setException = (error) => {
+                instance.exports._swift_js_exception.value = swift.memory.retain(error)
+            }
+        },
+        /** @param {WebAssembly.Instance} instance */
+        createExports: (instance) => {
+            const js = swift.memory.heap;
+            const __bjs_helpers_M10TestModuleT13PayloadSignal = __bjs_createEnumHelpers_M10TestModuleT13PayloadSignal();
+            enumHelpers.M10TestModuleT13PayloadSignal = __bjs_helpers_M10TestModuleT13PayloadSignal;
+
+            const exports = {
+                PayloadSignal: PayloadSignalValues,
+            };
+            _exports = exports;
+            return exports;
+        },
+    }
+}
\ No newline at end of file
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumCase.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumCase.js
index 5272717ec..838e3062b 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumCase.js
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumCase.js
@@ -69,14 +69,14 @@ export async function createInstantiator(options, swift) {
             bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) {
                 const source = swift.memory.getObject(sourceId);
                 swift.memory.release(sourceId);
-                const bytes = new Uint8Array(memory.buffer, bytesPtr);
+                const bytes = new Uint8Array(memory.buffer, bytesPtr >>> 0);
                 bytes.set(source);
             }
             bjs["swift_js_make_js_string"] = function(ptr, len) {
                 return swift.memory.retain(decodeString(ptr, len));
             }
             bjs["swift_js_init_memory_with_result"] = function(ptr, len) {
-                const target = new Uint8Array(memory.buffer, ptr, len);
+                const target = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0);
                 target.set(tmpRetBytes);
                 tmpRetBytes = undefined;
             }
@@ -130,6 +130,15 @@ export async function createInstantiator(options, swift) {
                 const copy = memory.buffer.slice(ptr, ptr + byteLen);
                 taStack.push(Array.from(new Ctor(copy)));
             }
+            bjs["bjs_core_register_type_handles"] = function() {};
+            bjs["bjs_TestModule_register_type_handles"] = function() {};
+            const __bjs_promiseSettlers = Symbol("JavaScriptKit.promiseSettlers");
+            bjs["swift_js_make_promise"] = function() {
+                let resolve, reject;
+                const promise = new Promise((res, rej) => { resolve = res; reject = rej; });
+                promise[__bjs_promiseSettlers] = { resolve, reject };
+                return swift.memory.retain(promise);
+            }
             bjs["swift_js_return_optional_bool"] = function(isSome, value) {
                 if (isSome === 0) {
                     tmpRetOptionalBool = null;
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumCaseImport.d.ts b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumCaseImport.d.ts
new file mode 100644
index 000000000..fe48c9174
--- /dev/null
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumCaseImport.d.ts
@@ -0,0 +1,33 @@
+// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit,
+// DO NOT EDIT.
+//
+// To update this file, just rebuild your project or run
+// `swift package bridge-js`.
+
+export const SignalValues: {
+    readonly Start: 0;
+    readonly Stop: 1;
+};
+export type SignalTag = typeof SignalValues[keyof typeof SignalValues];
+
+export type SignalObject = typeof SignalValues;
+
+export interface SignalControls {
+    send(signal: SignalTag): void;
+    current(): SignalTag;
+}
+export type Exports = {
+    Signal: SignalObject
+}
+export type Imports = {
+    SignalControls: {
+        roundTrip(signal: SignalTag): SignalTag;
+    }
+}
+export function createInstantiator(options: {
+    imports: Imports;
+}, swift: any): Promise<{
+    addImports: (importObject: WebAssembly.Imports) => void;
+    setInstance: (instance: WebAssembly.Instance) => void;
+    createExports: (instance: WebAssembly.Instance) => Exports;
+}>;
\ No newline at end of file
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumCaseImport.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumCaseImport.js
new file mode 100644
index 000000000..bde5fc31f
--- /dev/null
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumCaseImport.js
@@ -0,0 +1,261 @@
+// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit,
+// DO NOT EDIT.
+//
+// To update this file, just rebuild your project or run
+// `swift package bridge-js`.
+
+export const SignalValues = {
+    Start: 0,
+    Stop: 1,
+};
+
+export async function createInstantiator(options, swift) {
+    let instance;
+    let memory;
+    let setException;
+    let decodeString;
+    const textDecoder = new TextDecoder("utf-8");
+    const textEncoder = new TextEncoder("utf-8");
+    let tmpRetString;
+    let tmpRetBytes;
+    let tmpRetException;
+    let tmpRetOptionalBool;
+    let tmpRetOptionalInt;
+    let tmpRetOptionalFloat;
+    let tmpRetOptionalDouble;
+    let tmpRetOptionalHeapObject;
+    let strStack = [];
+    let i32Stack = [];
+    let i64Stack = [];
+    let f32Stack = [];
+    let f64Stack = [];
+    let ptrStack = [];
+    let taStack = [];
+    const enumHelpers = {};
+    const structHelpers = {};
+
+    let _exports = null;
+    let bjs = null;
+
+    return {
+        /**
+         * @param {WebAssembly.Imports} importObject
+         */
+        addImports: (importObject, importsContext) => {
+            bjs = {};
+            importObject["bjs"] = bjs;
+            const imports = options.getImports(importsContext);
+            bjs["swift_js_return_string"] = function(ptr, len) {
+                tmpRetString = decodeString(ptr, len);
+            }
+            bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) {
+                const source = swift.memory.getObject(sourceId);
+                swift.memory.release(sourceId);
+                const bytes = new Uint8Array(memory.buffer, bytesPtr >>> 0);
+                bytes.set(source);
+            }
+            bjs["swift_js_make_js_string"] = function(ptr, len) {
+                return swift.memory.retain(decodeString(ptr, len));
+            }
+            bjs["swift_js_init_memory_with_result"] = function(ptr, len) {
+                const target = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0);
+                target.set(tmpRetBytes);
+                tmpRetBytes = undefined;
+            }
+            bjs["swift_js_throw"] = function(id) {
+                tmpRetException = swift.memory.retainByRef(id);
+            }
+            bjs["swift_js_retain"] = function(id) {
+                return swift.memory.retainByRef(id);
+            }
+            bjs["swift_js_release"] = function(id) {
+                swift.memory.release(id);
+            }
+            bjs["swift_js_push_i32"] = function(v) {
+                i32Stack.push(v | 0);
+            }
+            bjs["swift_js_push_f32"] = function(v) {
+                f32Stack.push(Math.fround(v));
+            }
+            bjs["swift_js_push_f64"] = function(v) {
+                f64Stack.push(v);
+            }
+            bjs["swift_js_push_string"] = function(ptr, len) {
+                const value = decodeString(ptr, len);
+                strStack.push(value);
+            }
+            bjs["swift_js_pop_i32"] = function() {
+                return i32Stack.pop();
+            }
+            bjs["swift_js_pop_f32"] = function() {
+                return f32Stack.pop();
+            }
+            bjs["swift_js_pop_f64"] = function() {
+                return f64Stack.pop();
+            }
+            bjs["swift_js_push_pointer"] = function(pointer) {
+                ptrStack.push(pointer);
+            }
+            bjs["swift_js_pop_pointer"] = function() {
+                return ptrStack.pop();
+            }
+            bjs["swift_js_push_i64"] = function(v) {
+                i64Stack.push(v);
+            }
+            bjs["swift_js_pop_i64"] = function() {
+                return i64Stack.pop();
+            }
+            const taCtors = [Int8Array, Uint8Array, Int16Array, Uint16Array, Int32Array, Uint32Array, Float32Array, Float64Array];
+            bjs["swift_js_push_typed_array"] = function(kind, ptr, count) {
+                const Ctor = taCtors[kind];
+                const byteLen = count * Ctor.BYTES_PER_ELEMENT;
+                const copy = memory.buffer.slice(ptr, ptr + byteLen);
+                taStack.push(Array.from(new Ctor(copy)));
+            }
+            bjs["bjs_core_register_type_handles"] = function() {};
+            bjs["bjs_TestModule_register_type_handles"] = function() {};
+            const __bjs_promiseSettlers = Symbol("JavaScriptKit.promiseSettlers");
+            bjs["swift_js_make_promise"] = function() {
+                let resolve, reject;
+                const promise = new Promise((res, rej) => { resolve = res; reject = rej; });
+                promise[__bjs_promiseSettlers] = { resolve, reject };
+                return swift.memory.retain(promise);
+            }
+            bjs["swift_js_return_optional_bool"] = function(isSome, value) {
+                if (isSome === 0) {
+                    tmpRetOptionalBool = null;
+                } else {
+                    tmpRetOptionalBool = value !== 0;
+                }
+            }
+            bjs["swift_js_return_optional_int"] = function(isSome, value) {
+                if (isSome === 0) {
+                    tmpRetOptionalInt = null;
+                } else {
+                    tmpRetOptionalInt = value | 0;
+                }
+            }
+            bjs["swift_js_return_optional_float"] = function(isSome, value) {
+                if (isSome === 0) {
+                    tmpRetOptionalFloat = null;
+                } else {
+                    tmpRetOptionalFloat = Math.fround(value);
+                }
+            }
+            bjs["swift_js_return_optional_double"] = function(isSome, value) {
+                if (isSome === 0) {
+                    tmpRetOptionalDouble = null;
+                } else {
+                    tmpRetOptionalDouble = value;
+                }
+            }
+            bjs["swift_js_return_optional_string"] = function(isSome, ptr, len) {
+                if (isSome === 0) {
+                    tmpRetString = null;
+                } else {
+                    tmpRetString = decodeString(ptr, len);
+                }
+            }
+            bjs["swift_js_return_optional_object"] = function(isSome, objectId) {
+                if (isSome === 0) {
+                    tmpRetString = null;
+                } else {
+                    tmpRetString = swift.memory.getObject(objectId);
+                }
+            }
+            bjs["swift_js_return_optional_heap_object"] = function(isSome, pointer) {
+                if (isSome === 0) {
+                    tmpRetOptionalHeapObject = null;
+                } else {
+                    tmpRetOptionalHeapObject = pointer;
+                }
+            }
+            bjs["swift_js_get_optional_int_presence"] = function() {
+                return tmpRetOptionalInt != null ? 1 : 0;
+            }
+            bjs["swift_js_get_optional_int_value"] = function() {
+                const value = tmpRetOptionalInt;
+                tmpRetOptionalInt = undefined;
+                return value;
+            }
+            bjs["swift_js_get_optional_string"] = function() {
+                const str = tmpRetString;
+                tmpRetString = undefined;
+                if (str == null) {
+                    return -1;
+                } else {
+                    const bytes = textEncoder.encode(str);
+                    tmpRetBytes = bytes;
+                    return bytes.length;
+                }
+            }
+            bjs["swift_js_get_optional_float_presence"] = function() {
+                return tmpRetOptionalFloat != null ? 1 : 0;
+            }
+            bjs["swift_js_get_optional_float_value"] = function() {
+                const value = tmpRetOptionalFloat;
+                tmpRetOptionalFloat = undefined;
+                return value;
+            }
+            bjs["swift_js_get_optional_double_presence"] = function() {
+                return tmpRetOptionalDouble != null ? 1 : 0;
+            }
+            bjs["swift_js_get_optional_double_value"] = function() {
+                const value = tmpRetOptionalDouble;
+                tmpRetOptionalDouble = undefined;
+                return value;
+            }
+            bjs["swift_js_get_optional_heap_object_pointer"] = function() {
+                const pointer = tmpRetOptionalHeapObject;
+                tmpRetOptionalHeapObject = undefined;
+                return pointer || 0;
+            }
+            bjs["swift_js_closure_unregister"] = function(funcRef) {}
+            const TestModule = importObject["TestModule"] = importObject["TestModule"] || {};
+            TestModule["bjs_SignalControls_roundTrip_static"] = function bjs_SignalControls_roundTrip_static(signal) {
+                try {
+                    let ret = imports.SignalControls.roundTrip(signal);
+                    return ret;
+                } catch (error) {
+                    setException(error);
+                    return 0
+                }
+            }
+            TestModule["bjs_SignalControls_send"] = function bjs_SignalControls_send(self, signal) {
+                try {
+                    swift.memory.getObject(self).send(signal);
+                } catch (error) {
+                    setException(error);
+                }
+            }
+            TestModule["bjs_SignalControls_current"] = function bjs_SignalControls_current(self) {
+                try {
+                    let ret = swift.memory.getObject(self).current();
+                    return ret;
+                } catch (error) {
+                    setException(error);
+                    return 0
+                }
+            }
+        },
+        setInstance: (i) => {
+            instance = i;
+            memory = instance.exports.memory;
+
+            decodeString = (ptr, len) => { const bytes = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); return textDecoder.decode(bytes); }
+
+            setException = (error) => {
+                instance.exports._swift_js_exception.value = swift.memory.retain(error)
+            }
+        },
+        /** @param {WebAssembly.Instance} instance */
+        createExports: (instance) => {
+            const js = swift.memory.heap;
+            const exports = {
+                Signal: SignalValues,
+            };
+            _exports = exports;
+            return exports;
+        },
+    }
+}
\ No newline at end of file
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Global.d.ts b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Global.d.ts
index b78f0cecd..0ca8b16b9 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Global.d.ts
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Global.d.ts
@@ -39,11 +39,6 @@ declare global {
     }
     namespace Networking {
         namespace API {
-            class HTTPServer {
-                constructor();
-                call(method: Networking.API.MethodTag): void;
-                release(): void;
-            }
             const MethodValues: {
                 readonly Get: 0;
                 readonly Post: 1;
@@ -51,19 +46,24 @@ declare global {
                 readonly Delete: 3;
             };
             type MethodTag = typeof MethodValues[keyof typeof MethodValues];
+            class HTTPServer {
+                constructor();
+                call(method: Networking.API.MethodTag): void;
+                release(): void;
+            }
         }
         namespace APIV2 {
             namespace Internal {
-                class TestServer {
-                    constructor();
-                    call(method: Networking.APIV2.Internal.SupportedMethodTag): void;
-                    release(): void;
-                }
                 const SupportedMethodValues: {
                     readonly Get: 0;
                     readonly Post: 1;
                 };
                 type SupportedMethodTag = typeof SupportedMethodValues[keyof typeof SupportedMethodValues];
+                class TestServer {
+                    constructor();
+                    call(method: Networking.APIV2.Internal.SupportedMethodTag): void;
+                    release(): void;
+                }
             }
         }
     }
@@ -114,21 +114,21 @@ export type Exports = {
     Formatting: {
         Converter: {
             new(): Converter;
-        }
+        },
     },
     Networking: {
         API: {
+            Method: MethodObject
             HTTPServer: {
                 new(): HTTPServer;
-            }
-            Method: MethodObject
+            },
         },
         APIV2: {
             Internal: {
+                SupportedMethod: SupportedMethodObject
                 TestServer: {
                     new(): TestServer;
-                }
-                SupportedMethod: SupportedMethodObject
+                },
             },
         },
     },
@@ -144,7 +144,7 @@ export type Exports = {
     Utils: {
         Converter: {
             new(): Converter;
-        }
+        },
     },
 }
 export type Imports = {
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Global.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Global.js
index ecf121aa4..0a691374b 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Global.js
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Global.js
@@ -89,14 +89,14 @@ export async function createInstantiator(options, swift) {
             bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) {
                 const source = swift.memory.getObject(sourceId);
                 swift.memory.release(sourceId);
-                const bytes = new Uint8Array(memory.buffer, bytesPtr);
+                const bytes = new Uint8Array(memory.buffer, bytesPtr >>> 0);
                 bytes.set(source);
             }
             bjs["swift_js_make_js_string"] = function(ptr, len) {
                 return swift.memory.retain(decodeString(ptr, len));
             }
             bjs["swift_js_init_memory_with_result"] = function(ptr, len) {
-                const target = new Uint8Array(memory.buffer, ptr, len);
+                const target = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0);
                 target.set(tmpRetBytes);
                 tmpRetBytes = undefined;
             }
@@ -150,6 +150,15 @@ export async function createInstantiator(options, swift) {
                 const copy = memory.buffer.slice(ptr, ptr + byteLen);
                 taStack.push(Array.from(new Ctor(copy)));
             }
+            bjs["bjs_core_register_type_handles"] = function() {};
+            bjs["bjs_TestModule_register_type_handles"] = function() {};
+            const __bjs_promiseSettlers = Symbol("JavaScriptKit.promiseSettlers");
+            bjs["swift_js_make_promise"] = function() {
+                let resolve, reject;
+                const promise = new Promise((res, rej) => { resolve = res; reject = rej; });
+                promise[__bjs_promiseSettlers] = { resolve, reject };
+                return swift.memory.retain(promise);
+            }
             bjs["swift_js_return_optional_bool"] = function(isSome, value) {
                 if (isSome === 0) {
                     tmpRetOptionalBool = null;
@@ -286,6 +295,7 @@ export async function createInstantiator(options, swift) {
             /// Represents a Swift heap object like a class instance or an actor instance.
             class SwiftHeapObject {
                 static __wrap(pointer, deinit, prototype, identityCache) {
+                    pointer = pointer >>> 0;
                     const makeFresh = (identityMap) => {
                         const obj = Object.create(prototype);
                         const state = { pointer, deinit, hasReleased: false, identityMap };
@@ -430,13 +440,13 @@ export async function createInstantiator(options, swift) {
                 },
                 Networking: {
                     API: {
-                        HTTPServer,
                         Method: MethodValues,
+                        HTTPServer,
                     },
                     APIV2: {
                         Internal: {
-                            TestServer,
                             SupportedMethod: SupportedMethodValues,
+                            TestServer,
                         },
                     },
                 },
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.d.ts b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.d.ts
index 23d872d27..b5a85a082 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.d.ts
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.d.ts
@@ -75,21 +75,21 @@ export type Exports = {
     Formatting: {
         Converter: {
             new(): Converter;
-        }
+        },
     },
     Networking: {
         API: {
+            Method: MethodObject
             HTTPServer: {
                 new(): HTTPServer;
-            }
-            Method: MethodObject
+            },
         },
         APIV2: {
             Internal: {
+                SupportedMethod: SupportedMethodObject
                 TestServer: {
                     new(): TestServer;
-                }
-                SupportedMethod: SupportedMethodObject
+                },
             },
         },
     },
@@ -105,7 +105,7 @@ export type Exports = {
     Utils: {
         Converter: {
             new(): Converter;
-        }
+        },
     },
 }
 export type Imports = {
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.js
index 247a11e54..03f0a8d9a 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.js
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.js
@@ -70,14 +70,14 @@ export async function createInstantiator(options, swift) {
             bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) {
                 const source = swift.memory.getObject(sourceId);
                 swift.memory.release(sourceId);
-                const bytes = new Uint8Array(memory.buffer, bytesPtr);
+                const bytes = new Uint8Array(memory.buffer, bytesPtr >>> 0);
                 bytes.set(source);
             }
             bjs["swift_js_make_js_string"] = function(ptr, len) {
                 return swift.memory.retain(decodeString(ptr, len));
             }
             bjs["swift_js_init_memory_with_result"] = function(ptr, len) {
-                const target = new Uint8Array(memory.buffer, ptr, len);
+                const target = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0);
                 target.set(tmpRetBytes);
                 tmpRetBytes = undefined;
             }
@@ -131,6 +131,15 @@ export async function createInstantiator(options, swift) {
                 const copy = memory.buffer.slice(ptr, ptr + byteLen);
                 taStack.push(Array.from(new Ctor(copy)));
             }
+            bjs["bjs_core_register_type_handles"] = function() {};
+            bjs["bjs_TestModule_register_type_handles"] = function() {};
+            const __bjs_promiseSettlers = Symbol("JavaScriptKit.promiseSettlers");
+            bjs["swift_js_make_promise"] = function() {
+                let resolve, reject;
+                const promise = new Promise((res, rej) => { resolve = res; reject = rej; });
+                promise[__bjs_promiseSettlers] = { resolve, reject };
+                return swift.memory.retain(promise);
+            }
             bjs["swift_js_return_optional_bool"] = function(isSome, value) {
                 if (isSome === 0) {
                     tmpRetOptionalBool = null;
@@ -267,6 +276,7 @@ export async function createInstantiator(options, swift) {
             /// Represents a Swift heap object like a class instance or an actor instance.
             class SwiftHeapObject {
                 static __wrap(pointer, deinit, prototype, identityCache) {
+                    pointer = pointer >>> 0;
                     const makeFresh = (identityMap) => {
                         const obj = Object.create(prototype);
                         const state = { pointer, deinit, hasReleased: false, identityMap };
@@ -381,13 +391,13 @@ export async function createInstantiator(options, swift) {
                 },
                 Networking: {
                     API: {
-                        HTTPServer,
                         Method: MethodValues,
+                        HTTPServer,
                     },
                     APIV2: {
                         Internal: {
-                            TestServer,
                             SupportedMethod: SupportedMethodValues,
+                            TestServer,
                         },
                     },
                 },
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumRawType.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumRawType.js
index b004e3b74..09e03e44a 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumRawType.js
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumRawType.js
@@ -106,6 +106,350 @@ export async function createInstantiator(options, swift) {
 
     let _exports = null;
     let bjs = null;
+    const __bjs_arrayCodecCache = new WeakMap();
+    function __bjs_arrayCodec(elementCodec) {
+        let codec = __bjs_arrayCodecCache.get(elementCodec);
+        if (codec !== undefined) {
+            return codec;
+        }
+        codec = {
+            lower(value) {
+                for (let i = 0; i < value.length; i++) {
+                    elementCodec.lower(value[i]);
+                }
+                i32Stack.push(value.length);
+            },
+            lift() {
+                const count = i32Stack.pop();
+                if (count === -1) {
+                    return taStack.pop();
+                }
+                const result = new Array(count);
+                for (let i = count - 1; i >= 0; i--) {
+                    result[i] = elementCodec.lift();
+                }
+                return result;
+            },
+        };
+        __bjs_arrayCodecCache.set(elementCodec, codec);
+        return codec;
+    }
+    const __bjs_optionalCodecCache = new WeakMap();
+    const __bjs_optionalCodecUndefinedOrCache = new WeakMap();
+    function __bjs_optionalCodec(elementCodec, isUndefinedOr = false) {
+        const cache = isUndefinedOr ? __bjs_optionalCodecUndefinedOrCache : __bjs_optionalCodecCache;
+        let codec = cache.get(elementCodec);
+        if (codec !== undefined) {
+            return codec;
+        }
+        codec = {
+            lower(value) {
+                const isSome = isUndefinedOr ? value !== undefined : value != null;
+                if (isSome) {
+                    elementCodec.lower(value);
+                    i32Stack.push(1);
+                } else {
+                    i32Stack.push(0);
+                }
+            },
+            lift() {
+                if (i32Stack.pop() === 0) {
+                    return isUndefinedOr ? undefined : null;
+                }
+                return elementCodec.lift();
+            },
+        };
+        cache.set(elementCodec, codec);
+        return codec;
+    }
+    const __bjs_dictCodecCache = new WeakMap();
+    function __bjs_dictCodec(valueCodec) {
+        let codec = __bjs_dictCodecCache.get(valueCodec);
+        if (codec !== undefined) {
+            return codec;
+        }
+        codec = {
+            lower(value) {
+                const keys = Object.keys(value);
+                for (let i = 0; i < keys.length; i++) {
+                    __bjs_stringCodec.lower(keys[i]);
+                    valueCodec.lower(value[keys[i]]);
+                }
+                i32Stack.push(keys.length);
+            },
+            lift() {
+                const count = i32Stack.pop();
+                const result = {};
+                for (let i = 0; i < count; i++) {
+                    const value = valueCodec.lift();
+                    const key = __bjs_stringCodec.lift();
+                    result[key] = value;
+                }
+                return result;
+            },
+        };
+        __bjs_dictCodecCache.set(valueCodec, codec);
+        return codec;
+    }
+
+    const __bjs_stringCodec = {
+        lower: (v) => {
+            const bytes = textEncoder.encode(v);
+            const id = swift.memory.retain(bytes);
+            i32Stack.push(bytes.length);
+            i32Stack.push(id);
+        },
+        lift: () => {
+            const string = strStack.pop();
+            return string;
+        },
+    };
+    const __bjs_primitiveCodecs = {
+        Bool: {
+            lower: (v) => {
+                i32Stack.push(v ? 1 : 0);
+            },
+            lift: () => {
+                const bool = i32Stack.pop() !== 0;
+                return bool;
+            },
+        },
+        Int: {
+            lower: (v) => {
+                i32Stack.push((v | 0));
+            },
+            lift: () => {
+                const int = i32Stack.pop();
+                return int;
+            },
+        },
+        Int8: {
+            lower: (v) => {
+                i32Stack.push((v | 0));
+            },
+            lift: () => {
+                const int = i32Stack.pop();
+                return int;
+            },
+        },
+        UInt8: {
+            lower: (v) => {
+                i32Stack.push((v | 0));
+            },
+            lift: () => {
+                const int = i32Stack.pop() >>> 0;
+                return int;
+            },
+        },
+        Int16: {
+            lower: (v) => {
+                i32Stack.push((v | 0));
+            },
+            lift: () => {
+                const int = i32Stack.pop();
+                return int;
+            },
+        },
+        UInt16: {
+            lower: (v) => {
+                i32Stack.push((v | 0));
+            },
+            lift: () => {
+                const int = i32Stack.pop() >>> 0;
+                return int;
+            },
+        },
+        Int32: {
+            lower: (v) => {
+                i32Stack.push((v | 0));
+            },
+            lift: () => {
+                const int = i32Stack.pop();
+                return int;
+            },
+        },
+        UInt32: {
+            lower: (v) => {
+                i32Stack.push((v | 0));
+            },
+            lift: () => {
+                const int = i32Stack.pop() >>> 0;
+                return int;
+            },
+        },
+        UInt: {
+            lower: (v) => {
+                i32Stack.push((v | 0));
+            },
+            lift: () => {
+                const int = i32Stack.pop() >>> 0;
+                return int;
+            },
+        },
+        Int64: {
+            lower: (v) => {
+                i64Stack.push(v);
+            },
+            lift: () => {
+                const int = i64Stack.pop();
+                return int;
+            },
+        },
+        UInt64: {
+            lower: (v) => {
+                i64Stack.push(v);
+            },
+            lift: () => {
+                const int = i64Stack.pop();
+                return int;
+            },
+        },
+        Float: {
+            lower: (v) => {
+                f32Stack.push(Math.fround(v));
+            },
+            lift: () => {
+                const f32 = f32Stack.pop();
+                return f32;
+            },
+        },
+        Double: {
+            lower: (v) => {
+                f64Stack.push(v);
+            },
+            lift: () => {
+                const f64 = f64Stack.pop();
+                return f64;
+            },
+        },
+        String: __bjs_stringCodec,
+        JSValue: {
+            lower: (v) => {
+                const [vKind, vPayload1, vPayload2] = __bjs_jsValueLower(v);
+                i32Stack.push(vKind);
+                i32Stack.push(vPayload1);
+                f64Stack.push(vPayload2);
+            },
+            lift: () => {
+                const jsValuePayload2 = f64Stack.pop();
+                const jsValuePayload1 = i32Stack.pop();
+                const jsValueKind = i32Stack.pop();
+                const jsValue = __bjs_jsValueLift(jsValueKind, jsValuePayload1, jsValuePayload2);
+                return jsValue;
+            },
+        },
+    };
+
+    function __bjs_jsValueLower(value) {
+        let kind;
+        let payload1;
+        let payload2;
+        if (value === null) {
+            kind = 4;
+            payload1 = 0;
+            payload2 = 0;
+        } else {
+            switch (typeof value) {
+                case "boolean":
+                    kind = 0;
+                    payload1 = value ? 1 : 0;
+                    payload2 = 0;
+                    break;
+                case "number":
+                    kind = 2;
+                    payload1 = 0;
+                    payload2 = value;
+                    break;
+                case "string":
+                    kind = 1;
+                    payload1 = swift.memory.retain(value);
+                    payload2 = 0;
+                    break;
+                case "undefined":
+                    kind = 5;
+                    payload1 = 0;
+                    payload2 = 0;
+                    break;
+                case "object":
+                    kind = 3;
+                    payload1 = swift.memory.retain(value);
+                    payload2 = 0;
+                    break;
+                case "function":
+                    kind = 3;
+                    payload1 = swift.memory.retain(value);
+                    payload2 = 0;
+                    break;
+                case "symbol":
+                    kind = 7;
+                    payload1 = swift.memory.retain(value);
+                    payload2 = 0;
+                    break;
+                case "bigint":
+                    kind = 8;
+                    payload1 = swift.memory.retain(value);
+                    payload2 = 0;
+                    break;
+                default:
+                    throw new TypeError("Unsupported JSValue type");
+            }
+        }
+        return [kind, payload1, payload2];
+    }
+    function __bjs_jsValueLift(kind, payload1, payload2) {
+        let jsValue;
+        switch (kind) {
+            case 0:
+                jsValue = payload1 !== 0;
+                break;
+            case 1:
+                jsValue = swift.memory.getObject(payload1);
+                break;
+            case 2:
+                jsValue = payload2;
+                break;
+            case 3:
+                jsValue = swift.memory.getObject(payload1);
+                break;
+            case 4:
+                jsValue = null;
+                break;
+            case 5:
+                jsValue = undefined;
+                break;
+            case 7:
+                jsValue = swift.memory.getObject(payload1);
+                break;
+            case 8:
+                jsValue = swift.memory.getObject(payload1);
+                break;
+            default:
+                throw new TypeError("Unsupported JSValue kind " + kind);
+        }
+        return jsValue;
+    }
+
+    const __bjs_codec_M10TestModuleT8FileSize = {
+        lower: (v) => {
+            i64Stack.push(v);
+        },
+        lift: () => {
+            const rawValue = i64Stack.pop();
+            return rawValue;
+        },
+    };
+    const __bjs_codec_Optional_M10TestModuleT8FileSize = __bjs_optionalCodec(__bjs_codec_M10TestModuleT8FileSize);
+    const __bjs_codec_M10TestModuleT9SessionId = {
+        lower: (v) => {
+            i64Stack.push(v);
+        },
+        lift: () => {
+            const rawValue = i64Stack.pop();
+            return rawValue;
+        },
+    };
+    const __bjs_codec_Optional_M10TestModuleT9SessionId = __bjs_optionalCodec(__bjs_codec_M10TestModuleT9SessionId);
+
 
     return {
         /**
@@ -121,14 +465,14 @@ export async function createInstantiator(options, swift) {
             bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) {
                 const source = swift.memory.getObject(sourceId);
                 swift.memory.release(sourceId);
-                const bytes = new Uint8Array(memory.buffer, bytesPtr);
+                const bytes = new Uint8Array(memory.buffer, bytesPtr >>> 0);
                 bytes.set(source);
             }
             bjs["swift_js_make_js_string"] = function(ptr, len) {
                 return swift.memory.retain(decodeString(ptr, len));
             }
             bjs["swift_js_init_memory_with_result"] = function(ptr, len) {
-                const target = new Uint8Array(memory.buffer, ptr, len);
+                const target = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0);
                 target.set(tmpRetBytes);
                 tmpRetBytes = undefined;
             }
@@ -182,6 +526,15 @@ export async function createInstantiator(options, swift) {
                 const copy = memory.buffer.slice(ptr, ptr + byteLen);
                 taStack.push(Array.from(new Ctor(copy)));
             }
+            bjs["bjs_core_register_type_handles"] = function() {};
+            bjs["bjs_TestModule_register_type_handles"] = function() {};
+            const __bjs_promiseSettlers = Symbol("JavaScriptKit.promiseSettlers");
+            bjs["swift_js_make_promise"] = function() {
+                let resolve, reject;
+                const promise = new Promise((res, rej) => { resolve = res; reject = rej; });
+                promise[__bjs_promiseSettlers] = { resolve, reject };
+                return swift.memory.retain(promise);
+            }
             bjs["swift_js_return_optional_bool"] = function(isSome, value) {
                 if (isSome === 0) {
                     tmpRetOptionalBool = null;
@@ -440,16 +793,9 @@ export async function createInstantiator(options, swift) {
                 },
                 roundTripOptionalFileSize: function bjs_roundTripOptionalFileSize(input) {
                     const isSome = input != null;
-                    instance.exports.bjs_roundTripOptionalFileSize(+isSome, isSome ? input : 0);
-                    const isSome1 = i32Stack.pop();
-                    let optResult;
-                    if (isSome1) {
-                        const rawValue = i64Stack.pop();
-                        optResult = rawValue;
-                    } else {
-                        optResult = null;
-                    }
-                    return optResult;
+                    instance.exports.bjs_roundTripOptionalFileSize(+isSome, isSome ? input : 0n);
+                    const optValue = __bjs_codec_Optional_M10TestModuleT8FileSize.lift();
+                    return optValue;
                 },
                 setUserId: function bjs_setUserId(id) {
                     instance.exports.bjs_setUserId(id);
@@ -488,16 +834,9 @@ export async function createInstantiator(options, swift) {
                 },
                 roundTripOptionalSessionId: function bjs_roundTripOptionalSessionId(input) {
                     const isSome = input != null;
-                    instance.exports.bjs_roundTripOptionalSessionId(+isSome, isSome ? input : 0);
-                    const isSome1 = i32Stack.pop();
-                    let optResult;
-                    if (isSome1) {
-                        const rawValue = i64Stack.pop();
-                        optResult = rawValue;
-                    } else {
-                        optResult = null;
-                    }
-                    return optResult;
+                    instance.exports.bjs_roundTripOptionalSessionId(+isSome, isSome ? input : 0n);
+                    const optValue = __bjs_codec_Optional_M10TestModuleT9SessionId.lift();
+                    return optValue;
                 },
                 setPrecision: function bjs_setPrecision(precision) {
                     instance.exports.bjs_setPrecision(precision);
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ExtensionNestedTypes.d.ts b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ExtensionNestedTypes.d.ts
new file mode 100644
index 000000000..df59ccefd
--- /dev/null
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ExtensionNestedTypes.d.ts
@@ -0,0 +1,82 @@
+// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit,
+// DO NOT EDIT.
+//
+// To update this file, just rebuild your project or run
+// `swift package bridge-js`.
+
+export const MessageValues: {
+    readonly Tag: {
+        readonly Update: 0;
+        readonly Delete: 1;
+    };
+};
+
+export type MessageTag =
+  { tag: typeof MessageValues.Tag.Update; param0: UpdateTag } | { tag: typeof MessageValues.Tag.Delete }
+
+export const UpdateValues: {
+    readonly Flip: 0;
+    readonly Rotate: 1;
+};
+export type UpdateTag = typeof UpdateValues[keyof typeof UpdateValues];
+
+export type MessageObject = typeof MessageValues;
+
+export type GenreObject = typeof Library.GenreValues;
+
+export type UpdateObject = typeof UpdateValues;
+
+export namespace Library {
+    const GenreValues: {
+        readonly Fiction: "fiction";
+        readonly Reference: "reference";
+    };
+    type GenreTag = typeof GenreValues[keyof typeof GenreValues];
+    export interface Shelf {
+        label: string;
+        describeShelf(): string;
+    }
+    export namespace Shelf {
+        export interface Divider {
+            slot: number;
+        }
+    }
+}
+/// Represents a Swift heap object like a class instance or an actor instance.
+export interface SwiftHeapObject {
+    /// Release the heap object.
+    ///
+    /// Note: Calling this method will release the heap object and it will no longer be accessible.
+    release(): void;
+}
+export interface Library extends SwiftHeapObject {
+    describe(): string;
+    rename(title: string): string;
+    shelf(label: string): Library.Shelf;
+    name: string;
+}
+export type Exports = {
+    roundTripMessage(message: MessageTag): MessageTag;
+    Message: MessageObject
+    Update: UpdateObject
+    Library: {
+        new(name: string): Library;
+        Genre: GenreObject
+        Shelf: {
+            init(label: string): Library.Shelf;
+            readonly capacity: number;
+            Divider: {
+                init(slot: number): Library.Shelf.Divider;
+            },
+        },
+    },
+}
+export type Imports = {
+}
+export function createInstantiator(options: {
+    imports: Imports;
+}, swift: any): Promise<{
+    addImports: (importObject: WebAssembly.Imports) => void;
+    setInstance: (instance: WebAssembly.Instance) => void;
+    createExports: (instance: WebAssembly.Instance) => Exports;
+}>;
\ No newline at end of file
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ExtensionNestedTypes.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ExtensionNestedTypes.js
new file mode 100644
index 000000000..d031ff64b
--- /dev/null
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ExtensionNestedTypes.js
@@ -0,0 +1,457 @@
+// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit,
+// DO NOT EDIT.
+//
+// To update this file, just rebuild your project or run
+// `swift package bridge-js`.
+
+export const MessageValues = {
+    Tag: {
+        Update: 0,
+        Delete: 1,
+    },
+};
+export const GenreValues = {
+    Fiction: "fiction",
+    Reference: "reference",
+};
+
+export const UpdateValues = {
+    Flip: 0,
+    Rotate: 1,
+};
+
+export async function createInstantiator(options, swift) {
+    let instance;
+    let memory;
+    let setException;
+    let decodeString;
+    const textDecoder = new TextDecoder("utf-8");
+    const textEncoder = new TextEncoder("utf-8");
+    let tmpRetString;
+    let tmpRetBytes;
+    let tmpRetException;
+    let tmpRetOptionalBool;
+    let tmpRetOptionalInt;
+    let tmpRetOptionalFloat;
+    let tmpRetOptionalDouble;
+    let tmpRetOptionalHeapObject;
+    let strStack = [];
+    let i32Stack = [];
+    let i64Stack = [];
+    let f32Stack = [];
+    let f64Stack = [];
+    let ptrStack = [];
+    let taStack = [];
+    const enumHelpers = {};
+    const structHelpers = {};
+
+    let _exports = null;
+    let bjs = null;
+    const __bjs_createStructHelpers_M10TestModuleT7LibraryT5Shelf = () => ({
+        lower: (value) => {
+            const bytes = textEncoder.encode(value.label);
+            const id = swift.memory.retain(bytes);
+            i32Stack.push(bytes.length);
+            i32Stack.push(id);
+        },
+        lift: () => {
+            const string = strStack.pop();
+            const instance1 = { label: string };
+            instance1.describeShelf = function() {
+                structHelpers.M10TestModuleT7LibraryT5Shelf.lower(this);
+                const ret = instance.exports.bjs_Library_Shelf_describeShelf();
+                const ret1 = tmpRetString;
+                tmpRetString = undefined;
+                return ret1;
+            }.bind(instance1);
+            return instance1;
+        }
+    });
+    const __bjs_createStructHelpers_M10TestModuleT7LibraryT5ShelfT7Divider = () => ({
+        lower: (value) => {
+            i32Stack.push((value.slot | 0));
+        },
+        lift: () => {
+            const int = i32Stack.pop();
+            return { slot: int };
+        }
+    });
+    const __bjs_createEnumHelpers_M10TestModuleT7Message = () => ({
+        lower: (value) => {
+            const enumTag = value.tag;
+            switch (enumTag) {
+                case MessageValues.Tag.Update: {
+                    i32Stack.push((value.param0 | 0));
+                    return MessageValues.Tag.Update;
+                }
+                case MessageValues.Tag.Delete: {
+                    return MessageValues.Tag.Delete;
+                }
+                default: throw new Error("Unknown MessageValues tag: " + String(enumTag));
+            }
+        },
+        lift: (tag) => {
+            tag = tag | 0;
+            switch (tag) {
+                case MessageValues.Tag.Update: {
+                    const caseId = i32Stack.pop();
+                    return { tag: MessageValues.Tag.Update, param0: caseId };
+                }
+                case MessageValues.Tag.Delete: return { tag: MessageValues.Tag.Delete };
+                default: throw new Error("Unknown MessageValues tag returned from Swift: " + String(tag));
+            }
+        }
+    });
+
+    return {
+        /**
+         * @param {WebAssembly.Imports} importObject
+         */
+        addImports: (importObject, importsContext) => {
+            bjs = {};
+            importObject["bjs"] = bjs;
+            bjs["swift_js_return_string"] = function(ptr, len) {
+                tmpRetString = decodeString(ptr, len);
+            }
+            bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) {
+                const source = swift.memory.getObject(sourceId);
+                swift.memory.release(sourceId);
+                const bytes = new Uint8Array(memory.buffer, bytesPtr >>> 0);
+                bytes.set(source);
+            }
+            bjs["swift_js_make_js_string"] = function(ptr, len) {
+                return swift.memory.retain(decodeString(ptr, len));
+            }
+            bjs["swift_js_init_memory_with_result"] = function(ptr, len) {
+                const target = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0);
+                target.set(tmpRetBytes);
+                tmpRetBytes = undefined;
+            }
+            bjs["swift_js_throw"] = function(id) {
+                tmpRetException = swift.memory.retainByRef(id);
+            }
+            bjs["swift_js_retain"] = function(id) {
+                return swift.memory.retainByRef(id);
+            }
+            bjs["swift_js_release"] = function(id) {
+                swift.memory.release(id);
+            }
+            bjs["swift_js_push_i32"] = function(v) {
+                i32Stack.push(v | 0);
+            }
+            bjs["swift_js_push_f32"] = function(v) {
+                f32Stack.push(Math.fround(v));
+            }
+            bjs["swift_js_push_f64"] = function(v) {
+                f64Stack.push(v);
+            }
+            bjs["swift_js_push_string"] = function(ptr, len) {
+                const value = decodeString(ptr, len);
+                strStack.push(value);
+            }
+            bjs["swift_js_pop_i32"] = function() {
+                return i32Stack.pop();
+            }
+            bjs["swift_js_pop_f32"] = function() {
+                return f32Stack.pop();
+            }
+            bjs["swift_js_pop_f64"] = function() {
+                return f64Stack.pop();
+            }
+            bjs["swift_js_push_pointer"] = function(pointer) {
+                ptrStack.push(pointer);
+            }
+            bjs["swift_js_pop_pointer"] = function() {
+                return ptrStack.pop();
+            }
+            bjs["swift_js_push_i64"] = function(v) {
+                i64Stack.push(v);
+            }
+            bjs["swift_js_pop_i64"] = function() {
+                return i64Stack.pop();
+            }
+            const taCtors = [Int8Array, Uint8Array, Int16Array, Uint16Array, Int32Array, Uint32Array, Float32Array, Float64Array];
+            bjs["swift_js_push_typed_array"] = function(kind, ptr, count) {
+                const Ctor = taCtors[kind];
+                const byteLen = count * Ctor.BYTES_PER_ELEMENT;
+                const copy = memory.buffer.slice(ptr, ptr + byteLen);
+                taStack.push(Array.from(new Ctor(copy)));
+            }
+            bjs["swift_js_struct_lower_Library_Shelf"] = function(objectId) {
+                structHelpers.M10TestModuleT7LibraryT5Shelf.lower(swift.memory.getObject(objectId));
+            }
+            bjs["swift_js_struct_lift_Library_Shelf"] = function() {
+                const value = structHelpers.M10TestModuleT7LibraryT5Shelf.lift();
+                return swift.memory.retain(value);
+            }
+            bjs["swift_js_struct_lower_Library_Shelf_Divider"] = function(objectId) {
+                structHelpers.M10TestModuleT7LibraryT5ShelfT7Divider.lower(swift.memory.getObject(objectId));
+            }
+            bjs["swift_js_struct_lift_Library_Shelf_Divider"] = function() {
+                const value = structHelpers.M10TestModuleT7LibraryT5ShelfT7Divider.lift();
+                return swift.memory.retain(value);
+            }
+            bjs["bjs_core_register_type_handles"] = function() {};
+            bjs["bjs_TestModule_register_type_handles"] = function() {};
+            const __bjs_promiseSettlers = Symbol("JavaScriptKit.promiseSettlers");
+            bjs["swift_js_make_promise"] = function() {
+                let resolve, reject;
+                const promise = new Promise((res, rej) => { resolve = res; reject = rej; });
+                promise[__bjs_promiseSettlers] = { resolve, reject };
+                return swift.memory.retain(promise);
+            }
+            bjs["swift_js_return_optional_bool"] = function(isSome, value) {
+                if (isSome === 0) {
+                    tmpRetOptionalBool = null;
+                } else {
+                    tmpRetOptionalBool = value !== 0;
+                }
+            }
+            bjs["swift_js_return_optional_int"] = function(isSome, value) {
+                if (isSome === 0) {
+                    tmpRetOptionalInt = null;
+                } else {
+                    tmpRetOptionalInt = value | 0;
+                }
+            }
+            bjs["swift_js_return_optional_float"] = function(isSome, value) {
+                if (isSome === 0) {
+                    tmpRetOptionalFloat = null;
+                } else {
+                    tmpRetOptionalFloat = Math.fround(value);
+                }
+            }
+            bjs["swift_js_return_optional_double"] = function(isSome, value) {
+                if (isSome === 0) {
+                    tmpRetOptionalDouble = null;
+                } else {
+                    tmpRetOptionalDouble = value;
+                }
+            }
+            bjs["swift_js_return_optional_string"] = function(isSome, ptr, len) {
+                if (isSome === 0) {
+                    tmpRetString = null;
+                } else {
+                    tmpRetString = decodeString(ptr, len);
+                }
+            }
+            bjs["swift_js_return_optional_object"] = function(isSome, objectId) {
+                if (isSome === 0) {
+                    tmpRetString = null;
+                } else {
+                    tmpRetString = swift.memory.getObject(objectId);
+                }
+            }
+            bjs["swift_js_return_optional_heap_object"] = function(isSome, pointer) {
+                if (isSome === 0) {
+                    tmpRetOptionalHeapObject = null;
+                } else {
+                    tmpRetOptionalHeapObject = pointer;
+                }
+            }
+            bjs["swift_js_get_optional_int_presence"] = function() {
+                return tmpRetOptionalInt != null ? 1 : 0;
+            }
+            bjs["swift_js_get_optional_int_value"] = function() {
+                const value = tmpRetOptionalInt;
+                tmpRetOptionalInt = undefined;
+                return value;
+            }
+            bjs["swift_js_get_optional_string"] = function() {
+                const str = tmpRetString;
+                tmpRetString = undefined;
+                if (str == null) {
+                    return -1;
+                } else {
+                    const bytes = textEncoder.encode(str);
+                    tmpRetBytes = bytes;
+                    return bytes.length;
+                }
+            }
+            bjs["swift_js_get_optional_float_presence"] = function() {
+                return tmpRetOptionalFloat != null ? 1 : 0;
+            }
+            bjs["swift_js_get_optional_float_value"] = function() {
+                const value = tmpRetOptionalFloat;
+                tmpRetOptionalFloat = undefined;
+                return value;
+            }
+            bjs["swift_js_get_optional_double_presence"] = function() {
+                return tmpRetOptionalDouble != null ? 1 : 0;
+            }
+            bjs["swift_js_get_optional_double_value"] = function() {
+                const value = tmpRetOptionalDouble;
+                tmpRetOptionalDouble = undefined;
+                return value;
+            }
+            bjs["swift_js_get_optional_heap_object_pointer"] = function() {
+                const pointer = tmpRetOptionalHeapObject;
+                tmpRetOptionalHeapObject = undefined;
+                return pointer || 0;
+            }
+            bjs["swift_js_closure_unregister"] = function(funcRef) {}
+            // Wrapper functions for module: TestModule
+            if (!importObject["TestModule"]) {
+                importObject["TestModule"] = {};
+            }
+            importObject["TestModule"]["bjs_Library_wrap"] = function(pointer) {
+                const obj = _exports['Library'].__construct(pointer);
+                return swift.memory.retain(obj);
+            };
+        },
+        setInstance: (i) => {
+            instance = i;
+            memory = instance.exports.memory;
+
+            decodeString = (ptr, len) => { const bytes = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); return textDecoder.decode(bytes); }
+
+            setException = (error) => {
+                instance.exports._swift_js_exception.value = swift.memory.retain(error)
+            }
+        },
+        /** @param {WebAssembly.Instance} instance */
+        createExports: (instance) => {
+            const js = swift.memory.heap;
+            const swiftHeapObjectFinalizationRegistry = (typeof FinalizationRegistry === "undefined") ? { register: () => {}, unregister: () => {} } : new FinalizationRegistry((state) => {
+                if (state.hasReleased) {
+                    return;
+                }
+                state.hasReleased = true;
+                state.identityMap?.delete(state.pointer);
+                state.deinit(state.pointer);
+            });
+
+            /// Represents a Swift heap object like a class instance or an actor instance.
+            class SwiftHeapObject {
+                static __wrap(pointer, deinit, prototype, identityCache) {
+                    pointer = pointer >>> 0;
+                    const makeFresh = (identityMap) => {
+                        const obj = Object.create(prototype);
+                        const state = { pointer, deinit, hasReleased: false, identityMap };
+                        obj.pointer = pointer;
+                        obj.__swiftHeapObjectState = state;
+                        swiftHeapObjectFinalizationRegistry.register(obj, state, state);
+                        if (identityMap) {
+                            identityMap.set(pointer, new WeakRef(obj));
+                        }
+                        return obj;
+                    };
+
+                    if (!identityCache) {
+                        return makeFresh(null);
+                    }
+
+                    const cached = identityCache.get(pointer)?.deref();
+                    if (cached && !cached.__swiftHeapObjectState.hasReleased) {
+                        deinit(pointer);
+                        return cached;
+                    }
+                    if (identityCache.has(pointer)) {
+                        identityCache.delete(pointer);
+                    }
+
+                    return makeFresh(identityCache);
+                }
+
+                release() {
+                    const state = this.__swiftHeapObjectState;
+                    if (state.hasReleased) {
+                        return;
+                    }
+                    state.hasReleased = true;
+                    swiftHeapObjectFinalizationRegistry.unregister(state);
+                    state.identityMap?.delete(state.pointer);
+                    state.deinit(state.pointer);
+                }
+            }
+            class Library extends SwiftHeapObject {
+                static __construct(ptr) {
+                    return SwiftHeapObject.__wrap(ptr, instance.exports.bjs_Library_deinit, Library.prototype, null);
+                }
+
+                constructor(name) {
+                    const nameBytes = textEncoder.encode(name);
+                    const nameId = swift.memory.retain(nameBytes);
+                    const ret = instance.exports.bjs_Library_init(nameId, nameBytes.length);
+                    return Library.__construct(ret);
+                }
+                describe() {
+                    instance.exports.bjs_Library_describe(this.pointer);
+                    const ret = tmpRetString;
+                    tmpRetString = undefined;
+                    return ret;
+                }
+                rename(title) {
+                    const titleBytes = textEncoder.encode(title);
+                    const titleId = swift.memory.retain(titleBytes);
+                    instance.exports.bjs_Library_rename(this.pointer, titleId, titleBytes.length);
+                    const ret = tmpRetString;
+                    tmpRetString = undefined;
+                    return ret;
+                }
+                shelf(label) {
+                    const labelBytes = textEncoder.encode(label);
+                    const labelId = swift.memory.retain(labelBytes);
+                    instance.exports.bjs_Library_shelf(this.pointer, labelId, labelBytes.length);
+                    const structValue = structHelpers.M10TestModuleT7LibraryT5Shelf.lift();
+                    return structValue;
+                }
+                get name() {
+                    instance.exports.bjs_Library_name_get(this.pointer);
+                    const ret = tmpRetString;
+                    tmpRetString = undefined;
+                    return ret;
+                }
+                set name(value) {
+                    const valueBytes = textEncoder.encode(value);
+                    const valueId = swift.memory.retain(valueBytes);
+                    instance.exports.bjs_Library_name_set(this.pointer, valueId, valueBytes.length);
+                }
+            }
+            const __bjs_helpers_M10TestModuleT7LibraryT5Shelf = __bjs_createStructHelpers_M10TestModuleT7LibraryT5Shelf();
+            structHelpers.M10TestModuleT7LibraryT5Shelf = __bjs_helpers_M10TestModuleT7LibraryT5Shelf;
+
+            const __bjs_helpers_M10TestModuleT7LibraryT5ShelfT7Divider = __bjs_createStructHelpers_M10TestModuleT7LibraryT5ShelfT7Divider();
+            structHelpers.M10TestModuleT7LibraryT5ShelfT7Divider = __bjs_helpers_M10TestModuleT7LibraryT5ShelfT7Divider;
+
+            const __bjs_helpers_M10TestModuleT7Message = __bjs_createEnumHelpers_M10TestModuleT7Message();
+            enumHelpers.M10TestModuleT7Message = __bjs_helpers_M10TestModuleT7Message;
+
+            const exports = {
+                roundTripMessage: function bjs_roundTripMessage(message) {
+                    const messageCaseId = enumHelpers.M10TestModuleT7Message.lower(message);
+                    instance.exports.bjs_roundTripMessage(messageCaseId);
+                    const ret = enumHelpers.M10TestModuleT7Message.lift(i32Stack.pop());
+                    return ret;
+                },
+                Message: MessageValues,
+                Update: UpdateValues,
+                Library: Object.assign(Library, {
+                    Genre: GenreValues,
+                    Shelf: {
+                        init: function(label) {
+                            const labelBytes = textEncoder.encode(label);
+                            const labelId = swift.memory.retain(labelBytes);
+                            instance.exports.bjs_Library_Shelf_init(labelId, labelBytes.length);
+                            const structValue = structHelpers.M10TestModuleT7LibraryT5Shelf.lift();
+                            return structValue;
+                        },
+                        get capacity() {
+                            const ret = instance.exports.bjs_Library_Shelf_static_capacity_get();
+                            return ret;
+                        },
+                        Divider: {
+                            init: function(slot) {
+                                instance.exports.bjs_Library_Shelf_Divider_init(slot);
+                                const structValue = structHelpers.M10TestModuleT7LibraryT5ShelfT7Divider.lift();
+                                return structValue;
+                            },
+                        },
+                    },
+                }),
+            };
+            _exports = exports;
+            return exports;
+        },
+    }
+}
\ No newline at end of file
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ExtensionOrderIndependence.d.ts b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ExtensionOrderIndependence.d.ts
new file mode 100644
index 000000000..2b16f6a6d
--- /dev/null
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ExtensionOrderIndependence.d.ts
@@ -0,0 +1,38 @@
+// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit,
+// DO NOT EDIT.
+//
+// To update this file, just rebuild your project or run
+// `swift package bridge-js`.
+
+export namespace Depot {
+    export interface Crate {
+        label: string;
+        describeCrate(): string;
+    }
+}
+/// Represents a Swift heap object like a class instance or an actor instance.
+export interface SwiftHeapObject {
+    /// Release the heap object.
+    ///
+    /// Note: Calling this method will release the heap object and it will no longer be accessible.
+    release(): void;
+}
+export interface Depot extends SwiftHeapObject {
+}
+export type Exports = {
+    Depot: {
+        new(): Depot;
+        Crate: {
+            init(label: string): Depot.Crate;
+        },
+    },
+}
+export type Imports = {
+}
+export function createInstantiator(options: {
+    imports: Imports;
+}, swift: any): Promise<{
+    addImports: (importObject: WebAssembly.Imports) => void;
+    setInstance: (instance: WebAssembly.Instance) => void;
+    createExports: (instance: WebAssembly.Instance) => Exports;
+}>;
\ No newline at end of file
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ExtensionOrderIndependence.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ExtensionOrderIndependence.js
new file mode 100644
index 000000000..6cc339d24
--- /dev/null
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ExtensionOrderIndependence.js
@@ -0,0 +1,339 @@
+// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit,
+// DO NOT EDIT.
+//
+// To update this file, just rebuild your project or run
+// `swift package bridge-js`.
+
+export async function createInstantiator(options, swift) {
+    let instance;
+    let memory;
+    let setException;
+    let decodeString;
+    const textDecoder = new TextDecoder("utf-8");
+    const textEncoder = new TextEncoder("utf-8");
+    let tmpRetString;
+    let tmpRetBytes;
+    let tmpRetException;
+    let tmpRetOptionalBool;
+    let tmpRetOptionalInt;
+    let tmpRetOptionalFloat;
+    let tmpRetOptionalDouble;
+    let tmpRetOptionalHeapObject;
+    let strStack = [];
+    let i32Stack = [];
+    let i64Stack = [];
+    let f32Stack = [];
+    let f64Stack = [];
+    let ptrStack = [];
+    let taStack = [];
+    const enumHelpers = {};
+    const structHelpers = {};
+
+    let _exports = null;
+    let bjs = null;
+    const __bjs_createStructHelpers_M10TestModuleT5DepotT5Crate = () => ({
+        lower: (value) => {
+            const bytes = textEncoder.encode(value.label);
+            const id = swift.memory.retain(bytes);
+            i32Stack.push(bytes.length);
+            i32Stack.push(id);
+        },
+        lift: () => {
+            const string = strStack.pop();
+            const instance1 = { label: string };
+            instance1.describeCrate = function() {
+                structHelpers.M10TestModuleT5DepotT5Crate.lower(this);
+                const ret = instance.exports.bjs_Depot_Crate_describeCrate();
+                const ret1 = tmpRetString;
+                tmpRetString = undefined;
+                return ret1;
+            }.bind(instance1);
+            return instance1;
+        }
+    });
+
+    return {
+        /**
+         * @param {WebAssembly.Imports} importObject
+         */
+        addImports: (importObject, importsContext) => {
+            bjs = {};
+            importObject["bjs"] = bjs;
+            bjs["swift_js_return_string"] = function(ptr, len) {
+                tmpRetString = decodeString(ptr, len);
+            }
+            bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) {
+                const source = swift.memory.getObject(sourceId);
+                swift.memory.release(sourceId);
+                const bytes = new Uint8Array(memory.buffer, bytesPtr >>> 0);
+                bytes.set(source);
+            }
+            bjs["swift_js_make_js_string"] = function(ptr, len) {
+                return swift.memory.retain(decodeString(ptr, len));
+            }
+            bjs["swift_js_init_memory_with_result"] = function(ptr, len) {
+                const target = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0);
+                target.set(tmpRetBytes);
+                tmpRetBytes = undefined;
+            }
+            bjs["swift_js_throw"] = function(id) {
+                tmpRetException = swift.memory.retainByRef(id);
+            }
+            bjs["swift_js_retain"] = function(id) {
+                return swift.memory.retainByRef(id);
+            }
+            bjs["swift_js_release"] = function(id) {
+                swift.memory.release(id);
+            }
+            bjs["swift_js_push_i32"] = function(v) {
+                i32Stack.push(v | 0);
+            }
+            bjs["swift_js_push_f32"] = function(v) {
+                f32Stack.push(Math.fround(v));
+            }
+            bjs["swift_js_push_f64"] = function(v) {
+                f64Stack.push(v);
+            }
+            bjs["swift_js_push_string"] = function(ptr, len) {
+                const value = decodeString(ptr, len);
+                strStack.push(value);
+            }
+            bjs["swift_js_pop_i32"] = function() {
+                return i32Stack.pop();
+            }
+            bjs["swift_js_pop_f32"] = function() {
+                return f32Stack.pop();
+            }
+            bjs["swift_js_pop_f64"] = function() {
+                return f64Stack.pop();
+            }
+            bjs["swift_js_push_pointer"] = function(pointer) {
+                ptrStack.push(pointer);
+            }
+            bjs["swift_js_pop_pointer"] = function() {
+                return ptrStack.pop();
+            }
+            bjs["swift_js_push_i64"] = function(v) {
+                i64Stack.push(v);
+            }
+            bjs["swift_js_pop_i64"] = function() {
+                return i64Stack.pop();
+            }
+            const taCtors = [Int8Array, Uint8Array, Int16Array, Uint16Array, Int32Array, Uint32Array, Float32Array, Float64Array];
+            bjs["swift_js_push_typed_array"] = function(kind, ptr, count) {
+                const Ctor = taCtors[kind];
+                const byteLen = count * Ctor.BYTES_PER_ELEMENT;
+                const copy = memory.buffer.slice(ptr, ptr + byteLen);
+                taStack.push(Array.from(new Ctor(copy)));
+            }
+            bjs["swift_js_struct_lower_Depot_Crate"] = function(objectId) {
+                structHelpers.M10TestModuleT5DepotT5Crate.lower(swift.memory.getObject(objectId));
+            }
+            bjs["swift_js_struct_lift_Depot_Crate"] = function() {
+                const value = structHelpers.M10TestModuleT5DepotT5Crate.lift();
+                return swift.memory.retain(value);
+            }
+            bjs["bjs_core_register_type_handles"] = function() {};
+            bjs["bjs_TestModule_register_type_handles"] = function() {};
+            const __bjs_promiseSettlers = Symbol("JavaScriptKit.promiseSettlers");
+            bjs["swift_js_make_promise"] = function() {
+                let resolve, reject;
+                const promise = new Promise((res, rej) => { resolve = res; reject = rej; });
+                promise[__bjs_promiseSettlers] = { resolve, reject };
+                return swift.memory.retain(promise);
+            }
+            bjs["swift_js_return_optional_bool"] = function(isSome, value) {
+                if (isSome === 0) {
+                    tmpRetOptionalBool = null;
+                } else {
+                    tmpRetOptionalBool = value !== 0;
+                }
+            }
+            bjs["swift_js_return_optional_int"] = function(isSome, value) {
+                if (isSome === 0) {
+                    tmpRetOptionalInt = null;
+                } else {
+                    tmpRetOptionalInt = value | 0;
+                }
+            }
+            bjs["swift_js_return_optional_float"] = function(isSome, value) {
+                if (isSome === 0) {
+                    tmpRetOptionalFloat = null;
+                } else {
+                    tmpRetOptionalFloat = Math.fround(value);
+                }
+            }
+            bjs["swift_js_return_optional_double"] = function(isSome, value) {
+                if (isSome === 0) {
+                    tmpRetOptionalDouble = null;
+                } else {
+                    tmpRetOptionalDouble = value;
+                }
+            }
+            bjs["swift_js_return_optional_string"] = function(isSome, ptr, len) {
+                if (isSome === 0) {
+                    tmpRetString = null;
+                } else {
+                    tmpRetString = decodeString(ptr, len);
+                }
+            }
+            bjs["swift_js_return_optional_object"] = function(isSome, objectId) {
+                if (isSome === 0) {
+                    tmpRetString = null;
+                } else {
+                    tmpRetString = swift.memory.getObject(objectId);
+                }
+            }
+            bjs["swift_js_return_optional_heap_object"] = function(isSome, pointer) {
+                if (isSome === 0) {
+                    tmpRetOptionalHeapObject = null;
+                } else {
+                    tmpRetOptionalHeapObject = pointer;
+                }
+            }
+            bjs["swift_js_get_optional_int_presence"] = function() {
+                return tmpRetOptionalInt != null ? 1 : 0;
+            }
+            bjs["swift_js_get_optional_int_value"] = function() {
+                const value = tmpRetOptionalInt;
+                tmpRetOptionalInt = undefined;
+                return value;
+            }
+            bjs["swift_js_get_optional_string"] = function() {
+                const str = tmpRetString;
+                tmpRetString = undefined;
+                if (str == null) {
+                    return -1;
+                } else {
+                    const bytes = textEncoder.encode(str);
+                    tmpRetBytes = bytes;
+                    return bytes.length;
+                }
+            }
+            bjs["swift_js_get_optional_float_presence"] = function() {
+                return tmpRetOptionalFloat != null ? 1 : 0;
+            }
+            bjs["swift_js_get_optional_float_value"] = function() {
+                const value = tmpRetOptionalFloat;
+                tmpRetOptionalFloat = undefined;
+                return value;
+            }
+            bjs["swift_js_get_optional_double_presence"] = function() {
+                return tmpRetOptionalDouble != null ? 1 : 0;
+            }
+            bjs["swift_js_get_optional_double_value"] = function() {
+                const value = tmpRetOptionalDouble;
+                tmpRetOptionalDouble = undefined;
+                return value;
+            }
+            bjs["swift_js_get_optional_heap_object_pointer"] = function() {
+                const pointer = tmpRetOptionalHeapObject;
+                tmpRetOptionalHeapObject = undefined;
+                return pointer || 0;
+            }
+            bjs["swift_js_closure_unregister"] = function(funcRef) {}
+            // Wrapper functions for module: TestModule
+            if (!importObject["TestModule"]) {
+                importObject["TestModule"] = {};
+            }
+            importObject["TestModule"]["bjs_Depot_wrap"] = function(pointer) {
+                const obj = _exports['Depot'].__construct(pointer);
+                return swift.memory.retain(obj);
+            };
+        },
+        setInstance: (i) => {
+            instance = i;
+            memory = instance.exports.memory;
+
+            decodeString = (ptr, len) => { const bytes = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); return textDecoder.decode(bytes); }
+
+            setException = (error) => {
+                instance.exports._swift_js_exception.value = swift.memory.retain(error)
+            }
+        },
+        /** @param {WebAssembly.Instance} instance */
+        createExports: (instance) => {
+            const js = swift.memory.heap;
+            const swiftHeapObjectFinalizationRegistry = (typeof FinalizationRegistry === "undefined") ? { register: () => {}, unregister: () => {} } : new FinalizationRegistry((state) => {
+                if (state.hasReleased) {
+                    return;
+                }
+                state.hasReleased = true;
+                state.identityMap?.delete(state.pointer);
+                state.deinit(state.pointer);
+            });
+
+            /// Represents a Swift heap object like a class instance or an actor instance.
+            class SwiftHeapObject {
+                static __wrap(pointer, deinit, prototype, identityCache) {
+                    pointer = pointer >>> 0;
+                    const makeFresh = (identityMap) => {
+                        const obj = Object.create(prototype);
+                        const state = { pointer, deinit, hasReleased: false, identityMap };
+                        obj.pointer = pointer;
+                        obj.__swiftHeapObjectState = state;
+                        swiftHeapObjectFinalizationRegistry.register(obj, state, state);
+                        if (identityMap) {
+                            identityMap.set(pointer, new WeakRef(obj));
+                        }
+                        return obj;
+                    };
+
+                    if (!identityCache) {
+                        return makeFresh(null);
+                    }
+
+                    const cached = identityCache.get(pointer)?.deref();
+                    if (cached && !cached.__swiftHeapObjectState.hasReleased) {
+                        deinit(pointer);
+                        return cached;
+                    }
+                    if (identityCache.has(pointer)) {
+                        identityCache.delete(pointer);
+                    }
+
+                    return makeFresh(identityCache);
+                }
+
+                release() {
+                    const state = this.__swiftHeapObjectState;
+                    if (state.hasReleased) {
+                        return;
+                    }
+                    state.hasReleased = true;
+                    swiftHeapObjectFinalizationRegistry.unregister(state);
+                    state.identityMap?.delete(state.pointer);
+                    state.deinit(state.pointer);
+                }
+            }
+            class Depot extends SwiftHeapObject {
+                static __construct(ptr) {
+                    return SwiftHeapObject.__wrap(ptr, instance.exports.bjs_Depot_deinit, Depot.prototype, null);
+                }
+
+                constructor() {
+                    const ret = instance.exports.bjs_Depot_init();
+                    return Depot.__construct(ret);
+                }
+            }
+            const __bjs_helpers_M10TestModuleT5DepotT5Crate = __bjs_createStructHelpers_M10TestModuleT5DepotT5Crate();
+            structHelpers.M10TestModuleT5DepotT5Crate = __bjs_helpers_M10TestModuleT5DepotT5Crate;
+
+            const exports = {
+                Depot: Object.assign(Depot, {
+                    Crate: {
+                        init: function(label) {
+                            const labelBytes = textEncoder.encode(label);
+                            const labelId = swift.memory.retain(labelBytes);
+                            instance.exports.bjs_Depot_Crate_init(labelId, labelBytes.length);
+                            const structValue = structHelpers.M10TestModuleT5DepotT5Crate.lift();
+                            return structValue;
+                        },
+                    },
+                }),
+            };
+            _exports = exports;
+            return exports;
+        },
+    }
+}
\ No newline at end of file
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ExtensionScopeParity.d.ts b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ExtensionScopeParity.d.ts
new file mode 100644
index 000000000..9097d0270
--- /dev/null
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ExtensionScopeParity.d.ts
@@ -0,0 +1,52 @@
+// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit,
+// DO NOT EDIT.
+//
+// To update this file, just rebuild your project or run
+// `swift package bridge-js`.
+
+export const SignalValues: {
+    readonly Ready: "ready";
+};
+export type SignalTag = typeof SignalValues[keyof typeof SignalValues];
+
+export interface Meta {
+    note: string;
+}
+export type SignalObject = typeof SignalValues;
+
+/// Represents a Swift heap object like a class instance or an actor instance.
+export interface SwiftHeapObject {
+    /// Release the heap object.
+    ///
+    /// Note: Calling this method will release the heap object and it will no longer be accessible.
+    release(): void;
+}
+export interface Mallet extends SwiftHeapObject {
+}
+export interface Hammer extends SwiftHeapObject {
+}
+export type Exports = {
+    Signal: SignalObject
+    Meta: {
+        init(note: string): Meta;
+    },
+    app: {
+        Toolbox: {
+            Hammer: {
+                new(): Hammer;
+            },
+            Mallet: {
+                new(): Mallet;
+            },
+        },
+    },
+}
+export type Imports = {
+}
+export function createInstantiator(options: {
+    imports: Imports;
+}, swift: any): Promise<{
+    addImports: (importObject: WebAssembly.Imports) => void;
+    setInstance: (instance: WebAssembly.Instance) => void;
+    createExports: (instance: WebAssembly.Instance) => Exports;
+}>;
\ No newline at end of file
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ExtensionScopeParity.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ExtensionScopeParity.js
new file mode 100644
index 000000000..6b8ae44b1
--- /dev/null
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ExtensionScopeParity.js
@@ -0,0 +1,354 @@
+// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit,
+// DO NOT EDIT.
+//
+// To update this file, just rebuild your project or run
+// `swift package bridge-js`.
+
+export const SignalValues = {
+    Ready: "ready",
+};
+
+export async function createInstantiator(options, swift) {
+    let instance;
+    let memory;
+    let setException;
+    let decodeString;
+    const textDecoder = new TextDecoder("utf-8");
+    const textEncoder = new TextEncoder("utf-8");
+    let tmpRetString;
+    let tmpRetBytes;
+    let tmpRetException;
+    let tmpRetOptionalBool;
+    let tmpRetOptionalInt;
+    let tmpRetOptionalFloat;
+    let tmpRetOptionalDouble;
+    let tmpRetOptionalHeapObject;
+    let strStack = [];
+    let i32Stack = [];
+    let i64Stack = [];
+    let f32Stack = [];
+    let f64Stack = [];
+    let ptrStack = [];
+    let taStack = [];
+    const enumHelpers = {};
+    const structHelpers = {};
+
+    let _exports = null;
+    let bjs = null;
+    const __bjs_createStructHelpers_M10TestModuleT6SignalT4Meta = () => ({
+        lower: (value) => {
+            const bytes = textEncoder.encode(value.note);
+            const id = swift.memory.retain(bytes);
+            i32Stack.push(bytes.length);
+            i32Stack.push(id);
+        },
+        lift: () => {
+            const string = strStack.pop();
+            return { note: string };
+        }
+    });
+
+    return {
+        /**
+         * @param {WebAssembly.Imports} importObject
+         */
+        addImports: (importObject, importsContext) => {
+            bjs = {};
+            importObject["bjs"] = bjs;
+            bjs["swift_js_return_string"] = function(ptr, len) {
+                tmpRetString = decodeString(ptr, len);
+            }
+            bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) {
+                const source = swift.memory.getObject(sourceId);
+                swift.memory.release(sourceId);
+                const bytes = new Uint8Array(memory.buffer, bytesPtr >>> 0);
+                bytes.set(source);
+            }
+            bjs["swift_js_make_js_string"] = function(ptr, len) {
+                return swift.memory.retain(decodeString(ptr, len));
+            }
+            bjs["swift_js_init_memory_with_result"] = function(ptr, len) {
+                const target = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0);
+                target.set(tmpRetBytes);
+                tmpRetBytes = undefined;
+            }
+            bjs["swift_js_throw"] = function(id) {
+                tmpRetException = swift.memory.retainByRef(id);
+            }
+            bjs["swift_js_retain"] = function(id) {
+                return swift.memory.retainByRef(id);
+            }
+            bjs["swift_js_release"] = function(id) {
+                swift.memory.release(id);
+            }
+            bjs["swift_js_push_i32"] = function(v) {
+                i32Stack.push(v | 0);
+            }
+            bjs["swift_js_push_f32"] = function(v) {
+                f32Stack.push(Math.fround(v));
+            }
+            bjs["swift_js_push_f64"] = function(v) {
+                f64Stack.push(v);
+            }
+            bjs["swift_js_push_string"] = function(ptr, len) {
+                const value = decodeString(ptr, len);
+                strStack.push(value);
+            }
+            bjs["swift_js_pop_i32"] = function() {
+                return i32Stack.pop();
+            }
+            bjs["swift_js_pop_f32"] = function() {
+                return f32Stack.pop();
+            }
+            bjs["swift_js_pop_f64"] = function() {
+                return f64Stack.pop();
+            }
+            bjs["swift_js_push_pointer"] = function(pointer) {
+                ptrStack.push(pointer);
+            }
+            bjs["swift_js_pop_pointer"] = function() {
+                return ptrStack.pop();
+            }
+            bjs["swift_js_push_i64"] = function(v) {
+                i64Stack.push(v);
+            }
+            bjs["swift_js_pop_i64"] = function() {
+                return i64Stack.pop();
+            }
+            const taCtors = [Int8Array, Uint8Array, Int16Array, Uint16Array, Int32Array, Uint32Array, Float32Array, Float64Array];
+            bjs["swift_js_push_typed_array"] = function(kind, ptr, count) {
+                const Ctor = taCtors[kind];
+                const byteLen = count * Ctor.BYTES_PER_ELEMENT;
+                const copy = memory.buffer.slice(ptr, ptr + byteLen);
+                taStack.push(Array.from(new Ctor(copy)));
+            }
+            bjs["swift_js_struct_lower_Meta"] = function(objectId) {
+                structHelpers.M10TestModuleT6SignalT4Meta.lower(swift.memory.getObject(objectId));
+            }
+            bjs["swift_js_struct_lift_Meta"] = function() {
+                const value = structHelpers.M10TestModuleT6SignalT4Meta.lift();
+                return swift.memory.retain(value);
+            }
+            bjs["bjs_core_register_type_handles"] = function() {};
+            bjs["bjs_TestModule_register_type_handles"] = function() {};
+            const __bjs_promiseSettlers = Symbol("JavaScriptKit.promiseSettlers");
+            bjs["swift_js_make_promise"] = function() {
+                let resolve, reject;
+                const promise = new Promise((res, rej) => { resolve = res; reject = rej; });
+                promise[__bjs_promiseSettlers] = { resolve, reject };
+                return swift.memory.retain(promise);
+            }
+            bjs["swift_js_return_optional_bool"] = function(isSome, value) {
+                if (isSome === 0) {
+                    tmpRetOptionalBool = null;
+                } else {
+                    tmpRetOptionalBool = value !== 0;
+                }
+            }
+            bjs["swift_js_return_optional_int"] = function(isSome, value) {
+                if (isSome === 0) {
+                    tmpRetOptionalInt = null;
+                } else {
+                    tmpRetOptionalInt = value | 0;
+                }
+            }
+            bjs["swift_js_return_optional_float"] = function(isSome, value) {
+                if (isSome === 0) {
+                    tmpRetOptionalFloat = null;
+                } else {
+                    tmpRetOptionalFloat = Math.fround(value);
+                }
+            }
+            bjs["swift_js_return_optional_double"] = function(isSome, value) {
+                if (isSome === 0) {
+                    tmpRetOptionalDouble = null;
+                } else {
+                    tmpRetOptionalDouble = value;
+                }
+            }
+            bjs["swift_js_return_optional_string"] = function(isSome, ptr, len) {
+                if (isSome === 0) {
+                    tmpRetString = null;
+                } else {
+                    tmpRetString = decodeString(ptr, len);
+                }
+            }
+            bjs["swift_js_return_optional_object"] = function(isSome, objectId) {
+                if (isSome === 0) {
+                    tmpRetString = null;
+                } else {
+                    tmpRetString = swift.memory.getObject(objectId);
+                }
+            }
+            bjs["swift_js_return_optional_heap_object"] = function(isSome, pointer) {
+                if (isSome === 0) {
+                    tmpRetOptionalHeapObject = null;
+                } else {
+                    tmpRetOptionalHeapObject = pointer;
+                }
+            }
+            bjs["swift_js_get_optional_int_presence"] = function() {
+                return tmpRetOptionalInt != null ? 1 : 0;
+            }
+            bjs["swift_js_get_optional_int_value"] = function() {
+                const value = tmpRetOptionalInt;
+                tmpRetOptionalInt = undefined;
+                return value;
+            }
+            bjs["swift_js_get_optional_string"] = function() {
+                const str = tmpRetString;
+                tmpRetString = undefined;
+                if (str == null) {
+                    return -1;
+                } else {
+                    const bytes = textEncoder.encode(str);
+                    tmpRetBytes = bytes;
+                    return bytes.length;
+                }
+            }
+            bjs["swift_js_get_optional_float_presence"] = function() {
+                return tmpRetOptionalFloat != null ? 1 : 0;
+            }
+            bjs["swift_js_get_optional_float_value"] = function() {
+                const value = tmpRetOptionalFloat;
+                tmpRetOptionalFloat = undefined;
+                return value;
+            }
+            bjs["swift_js_get_optional_double_presence"] = function() {
+                return tmpRetOptionalDouble != null ? 1 : 0;
+            }
+            bjs["swift_js_get_optional_double_value"] = function() {
+                const value = tmpRetOptionalDouble;
+                tmpRetOptionalDouble = undefined;
+                return value;
+            }
+            bjs["swift_js_get_optional_heap_object_pointer"] = function() {
+                const pointer = tmpRetOptionalHeapObject;
+                tmpRetOptionalHeapObject = undefined;
+                return pointer || 0;
+            }
+            bjs["swift_js_closure_unregister"] = function(funcRef) {}
+            // Wrapper functions for module: TestModule
+            if (!importObject["TestModule"]) {
+                importObject["TestModule"] = {};
+            }
+            importObject["TestModule"]["bjs_app_Toolbox_Hammer_wrap"] = function(pointer) {
+                const obj = _exports.app.Toolbox.Hammer.__construct(pointer);
+                return swift.memory.retain(obj);
+            };
+            importObject["TestModule"]["bjs_app_Toolbox_Mallet_wrap"] = function(pointer) {
+                const obj = _exports.app.Toolbox.Mallet.__construct(pointer);
+                return swift.memory.retain(obj);
+            };
+        },
+        setInstance: (i) => {
+            instance = i;
+            memory = instance.exports.memory;
+
+            decodeString = (ptr, len) => { const bytes = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); return textDecoder.decode(bytes); }
+
+            setException = (error) => {
+                instance.exports._swift_js_exception.value = swift.memory.retain(error)
+            }
+        },
+        /** @param {WebAssembly.Instance} instance */
+        createExports: (instance) => {
+            const js = swift.memory.heap;
+            const swiftHeapObjectFinalizationRegistry = (typeof FinalizationRegistry === "undefined") ? { register: () => {}, unregister: () => {} } : new FinalizationRegistry((state) => {
+                if (state.hasReleased) {
+                    return;
+                }
+                state.hasReleased = true;
+                state.identityMap?.delete(state.pointer);
+                state.deinit(state.pointer);
+            });
+
+            /// Represents a Swift heap object like a class instance or an actor instance.
+            class SwiftHeapObject {
+                static __wrap(pointer, deinit, prototype, identityCache) {
+                    pointer = pointer >>> 0;
+                    const makeFresh = (identityMap) => {
+                        const obj = Object.create(prototype);
+                        const state = { pointer, deinit, hasReleased: false, identityMap };
+                        obj.pointer = pointer;
+                        obj.__swiftHeapObjectState = state;
+                        swiftHeapObjectFinalizationRegistry.register(obj, state, state);
+                        if (identityMap) {
+                            identityMap.set(pointer, new WeakRef(obj));
+                        }
+                        return obj;
+                    };
+
+                    if (!identityCache) {
+                        return makeFresh(null);
+                    }
+
+                    const cached = identityCache.get(pointer)?.deref();
+                    if (cached && !cached.__swiftHeapObjectState.hasReleased) {
+                        deinit(pointer);
+                        return cached;
+                    }
+                    if (identityCache.has(pointer)) {
+                        identityCache.delete(pointer);
+                    }
+
+                    return makeFresh(identityCache);
+                }
+
+                release() {
+                    const state = this.__swiftHeapObjectState;
+                    if (state.hasReleased) {
+                        return;
+                    }
+                    state.hasReleased = true;
+                    swiftHeapObjectFinalizationRegistry.unregister(state);
+                    state.identityMap?.delete(state.pointer);
+                    state.deinit(state.pointer);
+                }
+            }
+            class Mallet extends SwiftHeapObject {
+                static __construct(ptr) {
+                    return SwiftHeapObject.__wrap(ptr, instance.exports.bjs_app_Toolbox_Mallet_deinit, Mallet.prototype, null);
+                }
+
+                constructor() {
+                    const ret = instance.exports.bjs_app_Toolbox_Mallet_init();
+                    return Mallet.__construct(ret);
+                }
+            }
+            class Hammer extends SwiftHeapObject {
+                static __construct(ptr) {
+                    return SwiftHeapObject.__wrap(ptr, instance.exports.bjs_app_Toolbox_Hammer_deinit, Hammer.prototype, null);
+                }
+
+                constructor() {
+                    const ret = instance.exports.bjs_app_Toolbox_Hammer_init();
+                    return Hammer.__construct(ret);
+                }
+            }
+            const __bjs_helpers_M10TestModuleT6SignalT4Meta = __bjs_createStructHelpers_M10TestModuleT6SignalT4Meta();
+            structHelpers.M10TestModuleT6SignalT4Meta = __bjs_helpers_M10TestModuleT6SignalT4Meta;
+
+            const exports = {
+                Signal: SignalValues,
+                Meta: {
+                    init: function(note) {
+                        const noteBytes = textEncoder.encode(note);
+                        const noteId = swift.memory.retain(noteBytes);
+                        instance.exports.bjs_Meta_init(noteId, noteBytes.length);
+                        const structValue = structHelpers.M10TestModuleT6SignalT4Meta.lift();
+                        return structValue;
+                    },
+                },
+                app: {
+                    Toolbox: {
+                        Hammer,
+                        Mallet,
+                    },
+                },
+            };
+            _exports = exports;
+            return exports;
+        },
+    }
+}
\ No newline at end of file
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/FixedWidthIntegers.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/FixedWidthIntegers.js
index 4aa424d68..56a31b784 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/FixedWidthIntegers.js
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/FixedWidthIntegers.js
@@ -46,14 +46,14 @@ export async function createInstantiator(options, swift) {
             bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) {
                 const source = swift.memory.getObject(sourceId);
                 swift.memory.release(sourceId);
-                const bytes = new Uint8Array(memory.buffer, bytesPtr);
+                const bytes = new Uint8Array(memory.buffer, bytesPtr >>> 0);
                 bytes.set(source);
             }
             bjs["swift_js_make_js_string"] = function(ptr, len) {
                 return swift.memory.retain(decodeString(ptr, len));
             }
             bjs["swift_js_init_memory_with_result"] = function(ptr, len) {
-                const target = new Uint8Array(memory.buffer, ptr, len);
+                const target = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0);
                 target.set(tmpRetBytes);
                 tmpRetBytes = undefined;
             }
@@ -107,6 +107,14 @@ export async function createInstantiator(options, swift) {
                 const copy = memory.buffer.slice(ptr, ptr + byteLen);
                 taStack.push(Array.from(new Ctor(copy)));
             }
+            bjs["bjs_core_register_type_handles"] = function() {};
+            const __bjs_promiseSettlers = Symbol("JavaScriptKit.promiseSettlers");
+            bjs["swift_js_make_promise"] = function() {
+                let resolve, reject;
+                const promise = new Promise((res, rej) => { resolve = res; reject = rej; });
+                promise[__bjs_promiseSettlers] = { resolve, reject };
+                return swift.memory.retain(promise);
+            }
             bjs["swift_js_return_optional_bool"] = function(isSome, value) {
                 if (isSome === 0) {
                     tmpRetOptionalBool = null;
@@ -258,7 +266,7 @@ export async function createInstantiator(options, swift) {
                     return ret;
                 } catch (error) {
                     setException(error);
-                    return 0
+                    return 0n
                 }
             }
             TestModule["bjs_roundTripUInt64"] = function bjs_roundTripUInt64(v) {
@@ -267,7 +275,7 @@ export async function createInstantiator(options, swift) {
                     return ret;
                 } catch (error) {
                     setException(error);
-                    return 0
+                    return 0n
                 }
             }
         },
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/GenericImports.d.ts b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/GenericImports.d.ts
new file mode 100644
index 000000000..026713ce3
--- /dev/null
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/GenericImports.d.ts
@@ -0,0 +1,87 @@
+// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit,
+// DO NOT EDIT.
+//
+// To update this file, just rebuild your project or run
+// `swift package bridge-js`.
+
+export const GenericColorValues: {
+    readonly Red: 0;
+    readonly Green: 1;
+};
+export type GenericColorTag = typeof GenericColorValues[keyof typeof GenericColorValues];
+
+export const GenericModeValues: {
+    readonly Light: "light";
+    readonly Dark: "dark";
+};
+export type GenericModeTag = typeof GenericModeValues[keyof typeof GenericModeValues];
+
+export const GenericTaggedValues: {
+    readonly Tag: {
+        readonly Number: 0;
+        readonly Text: 1;
+    };
+};
+
+export type GenericTaggedTag =
+  { tag: typeof GenericTaggedValues.Tag.Number; value: number } | { tag: typeof GenericTaggedValues.Tag.Text; value: string }
+
+export interface GenericPoint {
+    x: number;
+    y: number;
+}
+export type GenericColorObject = typeof GenericColorValues;
+
+export type GenericModeObject = typeof GenericModeValues;
+
+export type GenericTaggedObject = typeof GenericTaggedValues;
+
+/// Represents a Swift heap object like a class instance or an actor instance.
+export interface SwiftHeapObject {
+    /// Release the heap object.
+    ///
+    /// Note: Calling this method will release the heap object and it will no longer be accessible.
+    release(): void;
+}
+export interface GenericImportBox extends SwiftHeapObject {
+    get(): number;
+    value: number;
+}
+export interface GenericPairFactory {
+}
+export interface GenericConsumer {
+    accept<T>(value: T): void;
+    identity<T>(value: T): T;
+}
+export type Exports = {
+    GenericColor: GenericColorObject
+    GenericMode: GenericModeObject
+    GenericTagged: GenericTaggedObject
+    GenericImportBox: {
+        new(value: number): GenericImportBox;
+    },
+}
+export type Imports = {
+    genericRoundTrip<T>(value: T): T;
+    genericParse<T>(json: string): T;
+    importGenericCombine<T, U>(a: T, b: U): U;
+    importGenericCaseDistinct<T, t>(a: T, b: t): T;
+    importGenericArray<T>(values: T[]): T[];
+    importGenericOptional<T>(value: T | null): T | null;
+    importGenericDictionary<T>(values: Record<string, T>): Record<string, T>;
+    importGenericAfterOptionalArray<T>(values: number[] | null, value: T): T;
+    GenericPairFactory: {
+        new<T, U>(tag: string, first: T, second: U): GenericPairFactory;
+    }
+    GenericConsumer: {
+        new<T>(value: T): GenericConsumer;
+        box<T>(value: T): T;
+    }
+}
+export function createInstantiator(options: {
+    imports: Imports;
+}, swift: any): Promise<{
+    addImports: (importObject: WebAssembly.Imports) => void;
+    setInstance: (instance: WebAssembly.Instance) => void;
+    createExports: (instance: WebAssembly.Instance) => Exports;
+}>;
\ No newline at end of file
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/GenericImports.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/GenericImports.js
new file mode 100644
index 000000000..d8b1fdf15
--- /dev/null
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/GenericImports.js
@@ -0,0 +1,941 @@
+// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit,
+// DO NOT EDIT.
+//
+// To update this file, just rebuild your project or run
+// `swift package bridge-js`.
+
+export const GenericColorValues = {
+    Red: 0,
+    Green: 1,
+};
+
+export const GenericModeValues = {
+    Light: "light",
+    Dark: "dark",
+};
+
+export const GenericTaggedValues = {
+    Tag: {
+        Number: 0,
+        Text: 1,
+    },
+};
+export async function createInstantiator(options, swift) {
+    let instance;
+    let memory;
+    let setException;
+    let decodeString;
+    const textDecoder = new TextDecoder("utf-8");
+    const textEncoder = new TextEncoder("utf-8");
+    let tmpRetString;
+    let tmpRetBytes;
+    let tmpRetException;
+    let tmpRetOptionalBool;
+    let tmpRetOptionalInt;
+    let tmpRetOptionalFloat;
+    let tmpRetOptionalDouble;
+    let tmpRetOptionalHeapObject;
+    let strStack = [];
+    let i32Stack = [];
+    let i64Stack = [];
+    let f32Stack = [];
+    let f64Stack = [];
+    let ptrStack = [];
+    let taStack = [];
+    const enumHelpers = {};
+    const structHelpers = {};
+    const __bjs_codecByTypeId = new Map();
+    let __bjs_typeHandlesRegistered = false;
+    function __bjs_registerTypeHandles() {
+        if (__bjs_typeHandlesRegistered) {
+            return;
+        }
+        __bjs_typeHandlesRegistered = true;
+        instance.exports["bjs_core_register_type_handles"]();
+        instance.exports["bjs_TestModule_register_type_handles"]();
+    }
+    function __bjs_codecForTypeId(typeId) {
+        __bjs_registerTypeHandles();
+        const codec = __bjs_codecByTypeId.get(typeId);
+        if (!codec) {
+            throw new Error("BridgeJS: no codec registered for type ID " + typeId);
+        }
+        return codec;
+    }
+
+    let _exports = null;
+    let bjs = null;
+    const __bjs_arrayCodecCache = new WeakMap();
+    function __bjs_arrayCodec(elementCodec) {
+        let codec = __bjs_arrayCodecCache.get(elementCodec);
+        if (codec !== undefined) {
+            return codec;
+        }
+        codec = {
+            lower(value) {
+                for (let i = 0; i < value.length; i++) {
+                    elementCodec.lower(value[i]);
+                }
+                i32Stack.push(value.length);
+            },
+            lift() {
+                const count = i32Stack.pop();
+                if (count === -1) {
+                    return taStack.pop();
+                }
+                const result = new Array(count);
+                for (let i = count - 1; i >= 0; i--) {
+                    result[i] = elementCodec.lift();
+                }
+                return result;
+            },
+        };
+        __bjs_arrayCodecCache.set(elementCodec, codec);
+        return codec;
+    }
+    const __bjs_optionalCodecCache = new WeakMap();
+    const __bjs_optionalCodecUndefinedOrCache = new WeakMap();
+    function __bjs_optionalCodec(elementCodec, isUndefinedOr = false) {
+        const cache = isUndefinedOr ? __bjs_optionalCodecUndefinedOrCache : __bjs_optionalCodecCache;
+        let codec = cache.get(elementCodec);
+        if (codec !== undefined) {
+            return codec;
+        }
+        codec = {
+            lower(value) {
+                const isSome = isUndefinedOr ? value !== undefined : value != null;
+                if (isSome) {
+                    elementCodec.lower(value);
+                    i32Stack.push(1);
+                } else {
+                    i32Stack.push(0);
+                }
+            },
+            lift() {
+                if (i32Stack.pop() === 0) {
+                    return isUndefinedOr ? undefined : null;
+                }
+                return elementCodec.lift();
+            },
+        };
+        cache.set(elementCodec, codec);
+        return codec;
+    }
+    const __bjs_dictCodecCache = new WeakMap();
+    function __bjs_dictCodec(valueCodec) {
+        let codec = __bjs_dictCodecCache.get(valueCodec);
+        if (codec !== undefined) {
+            return codec;
+        }
+        codec = {
+            lower(value) {
+                const keys = Object.keys(value);
+                for (let i = 0; i < keys.length; i++) {
+                    __bjs_stringCodec.lower(keys[i]);
+                    valueCodec.lower(value[keys[i]]);
+                }
+                i32Stack.push(keys.length);
+            },
+            lift() {
+                const count = i32Stack.pop();
+                const result = {};
+                for (let i = 0; i < count; i++) {
+                    const value = valueCodec.lift();
+                    const key = __bjs_stringCodec.lift();
+                    result[key] = value;
+                }
+                return result;
+            },
+        };
+        __bjs_dictCodecCache.set(valueCodec, codec);
+        return codec;
+    }
+
+    const __bjs_stringCodec = {
+        lower: (v) => {
+            const bytes = textEncoder.encode(v);
+            const id = swift.memory.retain(bytes);
+            i32Stack.push(bytes.length);
+            i32Stack.push(id);
+        },
+        lift: () => {
+            const string = strStack.pop();
+            return string;
+        },
+    };
+    const __bjs_primitiveCodecs = {
+        Bool: {
+            lower: (v) => {
+                i32Stack.push(v ? 1 : 0);
+            },
+            lift: () => {
+                const bool = i32Stack.pop() !== 0;
+                return bool;
+            },
+        },
+        Int: {
+            lower: (v) => {
+                i32Stack.push((v | 0));
+            },
+            lift: () => {
+                const int = i32Stack.pop();
+                return int;
+            },
+        },
+        Int8: {
+            lower: (v) => {
+                i32Stack.push((v | 0));
+            },
+            lift: () => {
+                const int = i32Stack.pop();
+                return int;
+            },
+        },
+        UInt8: {
+            lower: (v) => {
+                i32Stack.push((v | 0));
+            },
+            lift: () => {
+                const int = i32Stack.pop() >>> 0;
+                return int;
+            },
+        },
+        Int16: {
+            lower: (v) => {
+                i32Stack.push((v | 0));
+            },
+            lift: () => {
+                const int = i32Stack.pop();
+                return int;
+            },
+        },
+        UInt16: {
+            lower: (v) => {
+                i32Stack.push((v | 0));
+            },
+            lift: () => {
+                const int = i32Stack.pop() >>> 0;
+                return int;
+            },
+        },
+        Int32: {
+            lower: (v) => {
+                i32Stack.push((v | 0));
+            },
+            lift: () => {
+                const int = i32Stack.pop();
+                return int;
+            },
+        },
+        UInt32: {
+            lower: (v) => {
+                i32Stack.push((v | 0));
+            },
+            lift: () => {
+                const int = i32Stack.pop() >>> 0;
+                return int;
+            },
+        },
+        UInt: {
+            lower: (v) => {
+                i32Stack.push((v | 0));
+            },
+            lift: () => {
+                const int = i32Stack.pop() >>> 0;
+                return int;
+            },
+        },
+        Int64: {
+            lower: (v) => {
+                i64Stack.push(v);
+            },
+            lift: () => {
+                const int = i64Stack.pop();
+                return int;
+            },
+        },
+        UInt64: {
+            lower: (v) => {
+                i64Stack.push(v);
+            },
+            lift: () => {
+                const int = i64Stack.pop();
+                return int;
+            },
+        },
+        Float: {
+            lower: (v) => {
+                f32Stack.push(Math.fround(v));
+            },
+            lift: () => {
+                const f32 = f32Stack.pop();
+                return f32;
+            },
+        },
+        Double: {
+            lower: (v) => {
+                f64Stack.push(v);
+            },
+            lift: () => {
+                const f64 = f64Stack.pop();
+                return f64;
+            },
+        },
+        String: __bjs_stringCodec,
+        JSValue: {
+            lower: (v) => {
+                const [vKind, vPayload1, vPayload2] = __bjs_jsValueLower(v);
+                i32Stack.push(vKind);
+                i32Stack.push(vPayload1);
+                f64Stack.push(vPayload2);
+            },
+            lift: () => {
+                const jsValuePayload2 = f64Stack.pop();
+                const jsValuePayload1 = i32Stack.pop();
+                const jsValueKind = i32Stack.pop();
+                const jsValue = __bjs_jsValueLift(jsValueKind, jsValuePayload1, jsValuePayload2);
+                return jsValue;
+            },
+        },
+    };
+
+    function __bjs_jsValueLower(value) {
+        let kind;
+        let payload1;
+        let payload2;
+        if (value === null) {
+            kind = 4;
+            payload1 = 0;
+            payload2 = 0;
+        } else {
+            switch (typeof value) {
+                case "boolean":
+                    kind = 0;
+                    payload1 = value ? 1 : 0;
+                    payload2 = 0;
+                    break;
+                case "number":
+                    kind = 2;
+                    payload1 = 0;
+                    payload2 = value;
+                    break;
+                case "string":
+                    kind = 1;
+                    payload1 = swift.memory.retain(value);
+                    payload2 = 0;
+                    break;
+                case "undefined":
+                    kind = 5;
+                    payload1 = 0;
+                    payload2 = 0;
+                    break;
+                case "object":
+                    kind = 3;
+                    payload1 = swift.memory.retain(value);
+                    payload2 = 0;
+                    break;
+                case "function":
+                    kind = 3;
+                    payload1 = swift.memory.retain(value);
+                    payload2 = 0;
+                    break;
+                case "symbol":
+                    kind = 7;
+                    payload1 = swift.memory.retain(value);
+                    payload2 = 0;
+                    break;
+                case "bigint":
+                    kind = 8;
+                    payload1 = swift.memory.retain(value);
+                    payload2 = 0;
+                    break;
+                default:
+                    throw new TypeError("Unsupported JSValue type");
+            }
+        }
+        return [kind, payload1, payload2];
+    }
+    function __bjs_jsValueLift(kind, payload1, payload2) {
+        let jsValue;
+        switch (kind) {
+            case 0:
+                jsValue = payload1 !== 0;
+                break;
+            case 1:
+                jsValue = swift.memory.getObject(payload1);
+                break;
+            case 2:
+                jsValue = payload2;
+                break;
+            case 3:
+                jsValue = swift.memory.getObject(payload1);
+                break;
+            case 4:
+                jsValue = null;
+                break;
+            case 5:
+                jsValue = undefined;
+                break;
+            case 7:
+                jsValue = swift.memory.getObject(payload1);
+                break;
+            case 8:
+                jsValue = swift.memory.getObject(payload1);
+                break;
+            default:
+                throw new TypeError("Unsupported JSValue kind " + kind);
+        }
+        return jsValue;
+    }
+
+    const __bjs_codec_Array_Int = __bjs_arrayCodec(__bjs_primitiveCodecs.Int);
+    const __bjs_codec_Optional_Array_Int = __bjs_optionalCodec(__bjs_codec_Array_Int);
+    const __bjs_codec_M10TestModuleT12GenericPoint = {
+        lower: (v) => {
+            structHelpers.M10TestModuleT12GenericPoint.lower(v);
+        },
+        lift: () => {
+            const struct = structHelpers.M10TestModuleT12GenericPoint.lift();
+            return struct;
+        },
+    };
+    const __bjs_codec_M10TestModuleT16GenericImportBox = {
+        lower: (v) => {
+            ptrStack.push(v.pointer);
+        },
+        lift: () => {
+            const ptr = ptrStack.pop();
+            const obj = _exports['GenericImportBox'].__construct(ptr);
+            return obj;
+        },
+    };
+    const __bjs_codec_M10TestModuleT12GenericColor = {
+        lower: (v) => {
+            i32Stack.push((v | 0));
+        },
+        lift: () => {
+            const caseId = i32Stack.pop();
+            return caseId;
+        },
+    };
+    const __bjs_codec_M10TestModuleT13GenericTagged = {
+        lower: (v) => {
+            const caseId = enumHelpers.M10TestModuleT13GenericTagged.lower(v);
+            i32Stack.push(caseId);
+        },
+        lift: () => {
+            const enumValue = enumHelpers.M10TestModuleT13GenericTagged.lift(i32Stack.pop());
+            return enumValue;
+        },
+    };
+
+    const __bjs_createStructHelpers_M10TestModuleT12GenericPoint = () => ({
+        lower: (value) => {
+            i32Stack.push((value.x | 0));
+            i32Stack.push((value.y | 0));
+        },
+        lift: () => {
+            const int = i32Stack.pop();
+            const int1 = i32Stack.pop();
+            return { x: int1, y: int };
+        }
+    });
+    const __bjs_createEnumHelpers_M10TestModuleT13GenericTagged = () => ({
+        lower: (value) => {
+            const enumTag = value.tag;
+            switch (enumTag) {
+                case GenericTaggedValues.Tag.Number: {
+                    i32Stack.push((value.value | 0));
+                    return GenericTaggedValues.Tag.Number;
+                }
+                case GenericTaggedValues.Tag.Text: {
+                    const bytes = textEncoder.encode(value.value);
+                    const id = swift.memory.retain(bytes);
+                    i32Stack.push(bytes.length);
+                    i32Stack.push(id);
+                    return GenericTaggedValues.Tag.Text;
+                }
+                default: throw new Error("Unknown GenericTaggedValues tag: " + String(enumTag));
+            }
+        },
+        lift: (tag) => {
+            tag = tag | 0;
+            switch (tag) {
+                case GenericTaggedValues.Tag.Number: {
+                    const int = i32Stack.pop();
+                    return { tag: GenericTaggedValues.Tag.Number, value: int };
+                }
+                case GenericTaggedValues.Tag.Text: {
+                    const string = strStack.pop();
+                    return { tag: GenericTaggedValues.Tag.Text, value: string };
+                }
+                default: throw new Error("Unknown GenericTaggedValues tag returned from Swift: " + String(tag));
+            }
+        }
+    });
+
+    return {
+        /**
+         * @param {WebAssembly.Imports} importObject
+         */
+        addImports: (importObject, importsContext) => {
+            bjs = {};
+            importObject["bjs"] = bjs;
+            const imports = options.getImports(importsContext);
+            bjs["swift_js_return_string"] = function(ptr, len) {
+                tmpRetString = decodeString(ptr, len);
+            }
+            bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) {
+                const source = swift.memory.getObject(sourceId);
+                swift.memory.release(sourceId);
+                const bytes = new Uint8Array(memory.buffer, bytesPtr >>> 0);
+                bytes.set(source);
+            }
+            bjs["swift_js_make_js_string"] = function(ptr, len) {
+                return swift.memory.retain(decodeString(ptr, len));
+            }
+            bjs["swift_js_init_memory_with_result"] = function(ptr, len) {
+                const target = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0);
+                target.set(tmpRetBytes);
+                tmpRetBytes = undefined;
+            }
+            bjs["swift_js_throw"] = function(id) {
+                tmpRetException = swift.memory.retainByRef(id);
+            }
+            bjs["swift_js_retain"] = function(id) {
+                return swift.memory.retainByRef(id);
+            }
+            bjs["swift_js_release"] = function(id) {
+                swift.memory.release(id);
+            }
+            bjs["swift_js_push_i32"] = function(v) {
+                i32Stack.push(v | 0);
+            }
+            bjs["swift_js_push_f32"] = function(v) {
+                f32Stack.push(Math.fround(v));
+            }
+            bjs["swift_js_push_f64"] = function(v) {
+                f64Stack.push(v);
+            }
+            bjs["swift_js_push_string"] = function(ptr, len) {
+                const value = decodeString(ptr, len);
+                strStack.push(value);
+            }
+            bjs["swift_js_pop_i32"] = function() {
+                return i32Stack.pop();
+            }
+            bjs["swift_js_pop_f32"] = function() {
+                return f32Stack.pop();
+            }
+            bjs["swift_js_pop_f64"] = function() {
+                return f64Stack.pop();
+            }
+            bjs["swift_js_push_pointer"] = function(pointer) {
+                ptrStack.push(pointer);
+            }
+            bjs["swift_js_pop_pointer"] = function() {
+                return ptrStack.pop();
+            }
+            bjs["swift_js_push_i64"] = function(v) {
+                i64Stack.push(v);
+            }
+            bjs["swift_js_pop_i64"] = function() {
+                return i64Stack.pop();
+            }
+            const taCtors = [Int8Array, Uint8Array, Int16Array, Uint16Array, Int32Array, Uint32Array, Float32Array, Float64Array];
+            bjs["swift_js_push_typed_array"] = function(kind, ptr, count) {
+                const Ctor = taCtors[kind];
+                const byteLen = count * Ctor.BYTES_PER_ELEMENT;
+                const copy = memory.buffer.slice(ptr, ptr + byteLen);
+                taStack.push(Array.from(new Ctor(copy)));
+            }
+            bjs["swift_js_struct_lower_GenericPoint"] = function(objectId) {
+                structHelpers.M10TestModuleT12GenericPoint.lower(swift.memory.getObject(objectId));
+            }
+            bjs["swift_js_struct_lift_GenericPoint"] = function() {
+                const value = structHelpers.M10TestModuleT12GenericPoint.lift();
+                return swift.memory.retain(value);
+            }
+            bjs["bjs_core_register_type_handles"] = function(base, count) {
+                const codecs = [
+                    __bjs_primitiveCodecs.Bool,
+                    __bjs_primitiveCodecs.Int,
+                    __bjs_primitiveCodecs.Int8,
+                    __bjs_primitiveCodecs.UInt8,
+                    __bjs_primitiveCodecs.Int16,
+                    __bjs_primitiveCodecs.UInt16,
+                    __bjs_primitiveCodecs.Int32,
+                    __bjs_primitiveCodecs.UInt32,
+                    __bjs_primitiveCodecs.UInt,
+                    __bjs_primitiveCodecs.Int64,
+                    __bjs_primitiveCodecs.UInt64,
+                    __bjs_primitiveCodecs.Float,
+                    __bjs_primitiveCodecs.Double,
+                    __bjs_primitiveCodecs.String,
+                    __bjs_primitiveCodecs.JSValue,
+                ];
+                const typeIds = new Int32Array(memory.buffer, base >>> 0, count >>> 0);
+                for (let i = 0; i < count; i++) {
+                    __bjs_codecByTypeId.set(typeIds[i], codecs[i]);
+                }
+            }
+            bjs["bjs_TestModule_register_type_handles"] = function(base, count) {
+                const codecs = [
+                    __bjs_codec_M10TestModuleT12GenericPoint,
+                    __bjs_codec_M10TestModuleT16GenericImportBox,
+                    __bjs_codec_M10TestModuleT12GenericColor,
+                    __bjs_stringCodec,
+                    __bjs_codec_M10TestModuleT13GenericTagged,
+                ];
+                const typeIds = new Int32Array(memory.buffer, base >>> 0, count >>> 0);
+                for (let i = 0; i < count; i++) {
+                    __bjs_codecByTypeId.set(typeIds[i], codecs[i]);
+                }
+            }
+            const __bjs_promiseSettlers = Symbol("JavaScriptKit.promiseSettlers");
+            bjs["swift_js_make_promise"] = function() {
+                let resolve, reject;
+                const promise = new Promise((res, rej) => { resolve = res; reject = rej; });
+                promise[__bjs_promiseSettlers] = { resolve, reject };
+                return swift.memory.retain(promise);
+            }
+            bjs["swift_js_return_optional_bool"] = function(isSome, value) {
+                if (isSome === 0) {
+                    tmpRetOptionalBool = null;
+                } else {
+                    tmpRetOptionalBool = value !== 0;
+                }
+            }
+            bjs["swift_js_return_optional_int"] = function(isSome, value) {
+                if (isSome === 0) {
+                    tmpRetOptionalInt = null;
+                } else {
+                    tmpRetOptionalInt = value | 0;
+                }
+            }
+            bjs["swift_js_return_optional_float"] = function(isSome, value) {
+                if (isSome === 0) {
+                    tmpRetOptionalFloat = null;
+                } else {
+                    tmpRetOptionalFloat = Math.fround(value);
+                }
+            }
+            bjs["swift_js_return_optional_double"] = function(isSome, value) {
+                if (isSome === 0) {
+                    tmpRetOptionalDouble = null;
+                } else {
+                    tmpRetOptionalDouble = value;
+                }
+            }
+            bjs["swift_js_return_optional_string"] = function(isSome, ptr, len) {
+                if (isSome === 0) {
+                    tmpRetString = null;
+                } else {
+                    tmpRetString = decodeString(ptr, len);
+                }
+            }
+            bjs["swift_js_return_optional_object"] = function(isSome, objectId) {
+                if (isSome === 0) {
+                    tmpRetString = null;
+                } else {
+                    tmpRetString = swift.memory.getObject(objectId);
+                }
+            }
+            bjs["swift_js_return_optional_heap_object"] = function(isSome, pointer) {
+                if (isSome === 0) {
+                    tmpRetOptionalHeapObject = null;
+                } else {
+                    tmpRetOptionalHeapObject = pointer;
+                }
+            }
+            bjs["swift_js_get_optional_int_presence"] = function() {
+                return tmpRetOptionalInt != null ? 1 : 0;
+            }
+            bjs["swift_js_get_optional_int_value"] = function() {
+                const value = tmpRetOptionalInt;
+                tmpRetOptionalInt = undefined;
+                return value;
+            }
+            bjs["swift_js_get_optional_string"] = function() {
+                const str = tmpRetString;
+                tmpRetString = undefined;
+                if (str == null) {
+                    return -1;
+                } else {
+                    const bytes = textEncoder.encode(str);
+                    tmpRetBytes = bytes;
+                    return bytes.length;
+                }
+            }
+            bjs["swift_js_get_optional_float_presence"] = function() {
+                return tmpRetOptionalFloat != null ? 1 : 0;
+            }
+            bjs["swift_js_get_optional_float_value"] = function() {
+                const value = tmpRetOptionalFloat;
+                tmpRetOptionalFloat = undefined;
+                return value;
+            }
+            bjs["swift_js_get_optional_double_presence"] = function() {
+                return tmpRetOptionalDouble != null ? 1 : 0;
+            }
+            bjs["swift_js_get_optional_double_value"] = function() {
+                const value = tmpRetOptionalDouble;
+                tmpRetOptionalDouble = undefined;
+                return value;
+            }
+            bjs["swift_js_get_optional_heap_object_pointer"] = function() {
+                const pointer = tmpRetOptionalHeapObject;
+                tmpRetOptionalHeapObject = undefined;
+                return pointer || 0;
+            }
+            bjs["swift_js_closure_unregister"] = function(funcRef) {}
+            // Wrapper functions for module: TestModule
+            if (!importObject["TestModule"]) {
+                importObject["TestModule"] = {};
+            }
+            importObject["TestModule"]["bjs_GenericImportBox_wrap"] = function(pointer) {
+                const obj = _exports['GenericImportBox'].__construct(pointer);
+                return swift.memory.retain(obj);
+            };
+            const TestModule = importObject["TestModule"] = importObject["TestModule"] || {};
+            TestModule["bjs_genericRoundTrip"] = function bjs_genericRoundTrip(tTypeId) {
+                try {
+                    const codecT = __bjs_codecForTypeId(tTypeId);
+                    const value = codecT.lift();
+                    let ret = imports.genericRoundTrip(value);
+                    codecT.lower(ret);
+                } catch (error) {
+                    setException(error);
+                }
+            }
+            TestModule["bjs_genericParse"] = function bjs_genericParse(jsonBytes, jsonCount, tTypeId) {
+                try {
+                    const codecT = __bjs_codecForTypeId(tTypeId);
+                    const string = decodeString(jsonBytes, jsonCount);
+                    let ret = imports.genericParse(string);
+                    codecT.lower(ret);
+                } catch (error) {
+                    setException(error);
+                }
+            }
+            TestModule["bjs_importGenericCombine"] = function bjs_importGenericCombine(tTypeId, uTypeId) {
+                try {
+                    const codecT = __bjs_codecForTypeId(tTypeId);
+                    const codecU = __bjs_codecForTypeId(uTypeId);
+                    const a = codecT.lift();
+                    const b = codecU.lift();
+                    let ret = imports.importGenericCombine(a, b);
+                    codecU.lower(ret);
+                } catch (error) {
+                    setException(error);
+                }
+            }
+            TestModule["bjs_importGenericCaseDistinct"] = function bjs_importGenericCaseDistinct(tTypeId, tTypeId1) {
+                try {
+                    const codecT = __bjs_codecForTypeId(tTypeId);
+                    const codect = __bjs_codecForTypeId(tTypeId1);
+                    const a = codecT.lift();
+                    const b = codect.lift();
+                    let ret = imports.importGenericCaseDistinct(a, b);
+                    codecT.lower(ret);
+                } catch (error) {
+                    setException(error);
+                }
+            }
+            TestModule["bjs_importGenericArray"] = function bjs_importGenericArray(tTypeId) {
+                try {
+                    const codecT = __bjs_codecForTypeId(tTypeId);
+                    const values = __bjs_arrayCodec(codecT).lift();
+                    let ret = imports.importGenericArray(values);
+                    __bjs_arrayCodec(codecT).lower(ret);
+                } catch (error) {
+                    setException(error);
+                }
+            }
+            TestModule["bjs_importGenericOptional"] = function bjs_importGenericOptional(tTypeId) {
+                try {
+                    const codecT = __bjs_codecForTypeId(tTypeId);
+                    const value = __bjs_optionalCodec(codecT).lift();
+                    let ret = imports.importGenericOptional(value);
+                    __bjs_optionalCodec(codecT).lower(ret);
+                } catch (error) {
+                    setException(error);
+                }
+            }
+            TestModule["bjs_importGenericDictionary"] = function bjs_importGenericDictionary(tTypeId) {
+                try {
+                    const codecT = __bjs_codecForTypeId(tTypeId);
+                    const values = __bjs_dictCodec(codecT).lift();
+                    let ret = imports.importGenericDictionary(values);
+                    __bjs_dictCodec(codecT).lower(ret);
+                } catch (error) {
+                    setException(error);
+                }
+            }
+            TestModule["bjs_importGenericAfterOptionalArray"] = function bjs_importGenericAfterOptionalArray(tTypeId) {
+                try {
+                    const codecT = __bjs_codecForTypeId(tTypeId);
+                    const optValue = __bjs_codec_Optional_Array_Int.lift();
+                    const value = codecT.lift();
+                    let ret = imports.importGenericAfterOptionalArray(optValue, value);
+                    codecT.lower(ret);
+                } catch (error) {
+                    setException(error);
+                }
+            }
+            TestModule["bjs_GenericPairFactory_init"] = function bjs_GenericPairFactory_init(tagBytes, tagCount, tTypeId, uTypeId) {
+                try {
+                    const codecT = __bjs_codecForTypeId(tTypeId);
+                    const codecU = __bjs_codecForTypeId(uTypeId);
+                    const string = decodeString(tagBytes, tagCount);
+                    const first = codecT.lift();
+                    const second = codecU.lift();
+                    return swift.memory.retain(new imports.GenericPairFactory(string, first, second));
+                } catch (error) {
+                    setException(error);
+                    return 0
+                }
+            }
+            TestModule["bjs_GenericConsumer_init"] = function bjs_GenericConsumer_init(tTypeId) {
+                try {
+                    const codecT = __bjs_codecForTypeId(tTypeId);
+                    const value = codecT.lift();
+                    return swift.memory.retain(new imports.GenericConsumer(value));
+                } catch (error) {
+                    setException(error);
+                    return 0
+                }
+            }
+            TestModule["bjs_GenericConsumer_box_static"] = function bjs_GenericConsumer_box_static(tTypeId) {
+                try {
+                    const codecT = __bjs_codecForTypeId(tTypeId);
+                    const value = codecT.lift();
+                    let ret = imports.GenericConsumer.box(value);
+                    codecT.lower(ret);
+                } catch (error) {
+                    setException(error);
+                }
+            }
+            TestModule["bjs_GenericConsumer_accept"] = function bjs_GenericConsumer_accept(self, tTypeId) {
+                try {
+                    const codecT = __bjs_codecForTypeId(tTypeId);
+                    const value = codecT.lift();
+                    swift.memory.getObject(self).accept(value);
+                } catch (error) {
+                    setException(error);
+                }
+            }
+            TestModule["bjs_GenericConsumer_identity"] = function bjs_GenericConsumer_identity(self, tTypeId) {
+                try {
+                    const codecT = __bjs_codecForTypeId(tTypeId);
+                    const value = codecT.lift();
+                    let ret = swift.memory.getObject(self).identity(value);
+                    codecT.lower(ret);
+                } catch (error) {
+                    setException(error);
+                }
+            }
+        },
+        setInstance: (i) => {
+            instance = i;
+            memory = instance.exports.memory;
+
+            decodeString = (ptr, len) => { const bytes = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); return textDecoder.decode(bytes); }
+
+            setException = (error) => {
+                instance.exports._swift_js_exception.value = swift.memory.retain(error)
+            }
+        },
+        /** @param {WebAssembly.Instance} instance */
+        createExports: (instance) => {
+            const js = swift.memory.heap;
+            const swiftHeapObjectFinalizationRegistry = (typeof FinalizationRegistry === "undefined") ? { register: () => {}, unregister: () => {} } : new FinalizationRegistry((state) => {
+                if (state.hasReleased) {
+                    return;
+                }
+                state.hasReleased = true;
+                state.identityMap?.delete(state.pointer);
+                state.deinit(state.pointer);
+            });
+
+            /// Represents a Swift heap object like a class instance or an actor instance.
+            class SwiftHeapObject {
+                static __wrap(pointer, deinit, prototype, identityCache) {
+                    pointer = pointer >>> 0;
+                    const makeFresh = (identityMap) => {
+                        const obj = Object.create(prototype);
+                        const state = { pointer, deinit, hasReleased: false, identityMap };
+                        obj.pointer = pointer;
+                        obj.__swiftHeapObjectState = state;
+                        swiftHeapObjectFinalizationRegistry.register(obj, state, state);
+                        if (identityMap) {
+                            identityMap.set(pointer, new WeakRef(obj));
+                        }
+                        return obj;
+                    };
+
+                    if (!identityCache) {
+                        return makeFresh(null);
+                    }
+
+                    const cached = identityCache.get(pointer)?.deref();
+                    if (cached && !cached.__swiftHeapObjectState.hasReleased) {
+                        deinit(pointer);
+                        return cached;
+                    }
+                    if (identityCache.has(pointer)) {
+                        identityCache.delete(pointer);
+                    }
+
+                    return makeFresh(identityCache);
+                }
+
+                release() {
+                    const state = this.__swiftHeapObjectState;
+                    if (state.hasReleased) {
+                        return;
+                    }
+                    state.hasReleased = true;
+                    swiftHeapObjectFinalizationRegistry.unregister(state);
+                    state.identityMap?.delete(state.pointer);
+                    state.deinit(state.pointer);
+                }
+            }
+            class GenericImportBox extends SwiftHeapObject {
+                static __construct(ptr) {
+                    return SwiftHeapObject.__wrap(ptr, instance.exports.bjs_GenericImportBox_deinit, GenericImportBox.prototype, null);
+                }
+
+                constructor(value) {
+                    const ret = instance.exports.bjs_GenericImportBox_init(value);
+                    return GenericImportBox.__construct(ret);
+                }
+                get() {
+                    const ret = instance.exports.bjs_GenericImportBox_get(this.pointer);
+                    return ret;
+                }
+                get value() {
+                    const ret = instance.exports.bjs_GenericImportBox_value_get(this.pointer);
+                    return ret;
+                }
+                set value(value) {
+                    instance.exports.bjs_GenericImportBox_value_set(this.pointer, value);
+                }
+            }
+            const __bjs_helpers_M10TestModuleT12GenericPoint = __bjs_createStructHelpers_M10TestModuleT12GenericPoint();
+            structHelpers.M10TestModuleT12GenericPoint = __bjs_helpers_M10TestModuleT12GenericPoint;
+
+            const __bjs_helpers_M10TestModuleT13GenericTagged = __bjs_createEnumHelpers_M10TestModuleT13GenericTagged();
+            enumHelpers.M10TestModuleT13GenericTagged = __bjs_helpers_M10TestModuleT13GenericTagged;
+
+            const exports = {
+                GenericColor: GenericColorValues,
+                GenericMode: GenericModeValues,
+                GenericTagged: GenericTaggedValues,
+                GenericImportBox,
+            };
+            _exports = exports;
+            return exports;
+        },
+    }
+}
\ No newline at end of file
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/GlobalGetter.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/GlobalGetter.js
index f5895589d..adb70913c 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/GlobalGetter.js
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/GlobalGetter.js
@@ -46,14 +46,14 @@ export async function createInstantiator(options, swift) {
             bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) {
                 const source = swift.memory.getObject(sourceId);
                 swift.memory.release(sourceId);
-                const bytes = new Uint8Array(memory.buffer, bytesPtr);
+                const bytes = new Uint8Array(memory.buffer, bytesPtr >>> 0);
                 bytes.set(source);
             }
             bjs["swift_js_make_js_string"] = function(ptr, len) {
                 return swift.memory.retain(decodeString(ptr, len));
             }
             bjs["swift_js_init_memory_with_result"] = function(ptr, len) {
-                const target = new Uint8Array(memory.buffer, ptr, len);
+                const target = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0);
                 target.set(tmpRetBytes);
                 tmpRetBytes = undefined;
             }
@@ -107,6 +107,14 @@ export async function createInstantiator(options, swift) {
                 const copy = memory.buffer.slice(ptr, ptr + byteLen);
                 taStack.push(Array.from(new Ctor(copy)));
             }
+            bjs["bjs_core_register_type_handles"] = function() {};
+            const __bjs_promiseSettlers = Symbol("JavaScriptKit.promiseSettlers");
+            bjs["swift_js_make_promise"] = function() {
+                let resolve, reject;
+                const promise = new Promise((res, rej) => { resolve = res; reject = rej; });
+                promise[__bjs_promiseSettlers] = { resolve, reject };
+                return swift.memory.retain(promise);
+            }
             bjs["swift_js_return_optional_bool"] = function(isSome, value) {
                 if (isSome === 0) {
                     tmpRetOptionalBool = null;
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/GlobalThisImports.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/GlobalThisImports.js
index 77e8002f8..760a6b50c 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/GlobalThisImports.js
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/GlobalThisImports.js
@@ -45,14 +45,14 @@ export async function createInstantiator(options, swift) {
             bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) {
                 const source = swift.memory.getObject(sourceId);
                 swift.memory.release(sourceId);
-                const bytes = new Uint8Array(memory.buffer, bytesPtr);
+                const bytes = new Uint8Array(memory.buffer, bytesPtr >>> 0);
                 bytes.set(source);
             }
             bjs["swift_js_make_js_string"] = function(ptr, len) {
                 return swift.memory.retain(decodeString(ptr, len));
             }
             bjs["swift_js_init_memory_with_result"] = function(ptr, len) {
-                const target = new Uint8Array(memory.buffer, ptr, len);
+                const target = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0);
                 target.set(tmpRetBytes);
                 tmpRetBytes = undefined;
             }
@@ -106,6 +106,14 @@ export async function createInstantiator(options, swift) {
                 const copy = memory.buffer.slice(ptr, ptr + byteLen);
                 taStack.push(Array.from(new Ctor(copy)));
             }
+            bjs["bjs_core_register_type_handles"] = function() {};
+            const __bjs_promiseSettlers = Symbol("JavaScriptKit.promiseSettlers");
+            bjs["swift_js_make_promise"] = function() {
+                let resolve, reject;
+                const promise = new Promise((res, rej) => { resolve = res; reject = rej; });
+                promise[__bjs_promiseSettlers] = { resolve, reject };
+                return swift.memory.retain(promise);
+            }
             bjs["swift_js_return_optional_bool"] = function(isSome, value) {
                 if (isSome === 0) {
                     tmpRetOptionalBool = null;
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/IdentityModeClass.ConfigPointer.d.ts b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/IdentityModeClass.ConfigPointer.d.ts
index e5e2a3a84..02d17c011 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/IdentityModeClass.ConfigPointer.d.ts
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/IdentityModeClass.ConfigPointer.d.ts
@@ -23,13 +23,13 @@ export interface ExplicitlyUncachedModel extends SwiftHeapObject {
 export type Exports = {
     CachedModel: {
         new(name: string): CachedModel;
-    }
-    UncachedModel: {
-        new(value: number): UncachedModel;
-    }
+    },
     ExplicitlyUncachedModel: {
         new(count: number): ExplicitlyUncachedModel;
-    }
+    },
+    UncachedModel: {
+        new(value: number): UncachedModel;
+    },
 }
 export type Imports = {
 }
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/IdentityModeClass.ConfigPointer.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/IdentityModeClass.ConfigPointer.js
index db876ff02..1e1d14696 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/IdentityModeClass.ConfigPointer.js
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/IdentityModeClass.ConfigPointer.js
@@ -45,14 +45,14 @@ export async function createInstantiator(options, swift) {
             bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) {
                 const source = swift.memory.getObject(sourceId);
                 swift.memory.release(sourceId);
-                const bytes = new Uint8Array(memory.buffer, bytesPtr);
+                const bytes = new Uint8Array(memory.buffer, bytesPtr >>> 0);
                 bytes.set(source);
             }
             bjs["swift_js_make_js_string"] = function(ptr, len) {
                 return swift.memory.retain(decodeString(ptr, len));
             }
             bjs["swift_js_init_memory_with_result"] = function(ptr, len) {
-                const target = new Uint8Array(memory.buffer, ptr, len);
+                const target = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0);
                 target.set(tmpRetBytes);
                 tmpRetBytes = undefined;
             }
@@ -106,6 +106,14 @@ export async function createInstantiator(options, swift) {
                 const copy = memory.buffer.slice(ptr, ptr + byteLen);
                 taStack.push(Array.from(new Ctor(copy)));
             }
+            bjs["bjs_core_register_type_handles"] = function() {};
+            const __bjs_promiseSettlers = Symbol("JavaScriptKit.promiseSettlers");
+            bjs["swift_js_make_promise"] = function() {
+                let resolve, reject;
+                const promise = new Promise((res, rej) => { resolve = res; reject = rej; });
+                promise[__bjs_promiseSettlers] = { resolve, reject };
+                return swift.memory.retain(promise);
+            }
             bjs["swift_js_return_optional_bool"] = function(isSome, value) {
                 if (isSome === 0) {
                     tmpRetOptionalBool = null;
@@ -238,6 +246,7 @@ export async function createInstantiator(options, swift) {
             /// Represents a Swift heap object like a class instance or an actor instance.
             class SwiftHeapObject {
                 static __wrap(pointer, deinit, prototype, identityCache) {
+                    pointer = pointer >>> 0;
                     const makeFresh = (identityMap) => {
                         const obj = Object.create(prototype);
                         const state = { pointer, deinit, hasReleased: false, identityMap };
@@ -340,8 +349,8 @@ export async function createInstantiator(options, swift) {
             }
             const exports = {
                 CachedModel,
-                UncachedModel,
                 ExplicitlyUncachedModel,
+                UncachedModel,
             };
             _exports = exports;
             return exports;
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/IdentityModeClass.PerClass.d.ts b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/IdentityModeClass.PerClass.d.ts
index e5e2a3a84..02d17c011 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/IdentityModeClass.PerClass.d.ts
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/IdentityModeClass.PerClass.d.ts
@@ -23,13 +23,13 @@ export interface ExplicitlyUncachedModel extends SwiftHeapObject {
 export type Exports = {
     CachedModel: {
         new(name: string): CachedModel;
-    }
-    UncachedModel: {
-        new(value: number): UncachedModel;
-    }
+    },
     ExplicitlyUncachedModel: {
         new(count: number): ExplicitlyUncachedModel;
-    }
+    },
+    UncachedModel: {
+        new(value: number): UncachedModel;
+    },
 }
 export type Imports = {
 }
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/IdentityModeClass.PerClass.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/IdentityModeClass.PerClass.js
index ca958e564..c85aee3af 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/IdentityModeClass.PerClass.js
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/IdentityModeClass.PerClass.js
@@ -45,14 +45,14 @@ export async function createInstantiator(options, swift) {
             bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) {
                 const source = swift.memory.getObject(sourceId);
                 swift.memory.release(sourceId);
-                const bytes = new Uint8Array(memory.buffer, bytesPtr);
+                const bytes = new Uint8Array(memory.buffer, bytesPtr >>> 0);
                 bytes.set(source);
             }
             bjs["swift_js_make_js_string"] = function(ptr, len) {
                 return swift.memory.retain(decodeString(ptr, len));
             }
             bjs["swift_js_init_memory_with_result"] = function(ptr, len) {
-                const target = new Uint8Array(memory.buffer, ptr, len);
+                const target = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0);
                 target.set(tmpRetBytes);
                 tmpRetBytes = undefined;
             }
@@ -106,6 +106,14 @@ export async function createInstantiator(options, swift) {
                 const copy = memory.buffer.slice(ptr, ptr + byteLen);
                 taStack.push(Array.from(new Ctor(copy)));
             }
+            bjs["bjs_core_register_type_handles"] = function() {};
+            const __bjs_promiseSettlers = Symbol("JavaScriptKit.promiseSettlers");
+            bjs["swift_js_make_promise"] = function() {
+                let resolve, reject;
+                const promise = new Promise((res, rej) => { resolve = res; reject = rej; });
+                promise[__bjs_promiseSettlers] = { resolve, reject };
+                return swift.memory.retain(promise);
+            }
             bjs["swift_js_return_optional_bool"] = function(isSome, value) {
                 if (isSome === 0) {
                     tmpRetOptionalBool = null;
@@ -238,6 +246,7 @@ export async function createInstantiator(options, swift) {
             /// Represents a Swift heap object like a class instance or an actor instance.
             class SwiftHeapObject {
                 static __wrap(pointer, deinit, prototype, identityCache) {
+                    pointer = pointer >>> 0;
                     const makeFresh = (identityMap) => {
                         const obj = Object.create(prototype);
                         const state = { pointer, deinit, hasReleased: false, identityMap };
@@ -338,8 +347,8 @@ export async function createInstantiator(options, swift) {
             }
             const exports = {
                 CachedModel,
-                UncachedModel,
                 ExplicitlyUncachedModel,
+                UncachedModel,
             };
             _exports = exports;
             return exports;
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/IdentityModeClass.d.ts b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/IdentityModeClass.d.ts
index e5e2a3a84..02d17c011 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/IdentityModeClass.d.ts
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/IdentityModeClass.d.ts
@@ -23,13 +23,13 @@ export interface ExplicitlyUncachedModel extends SwiftHeapObject {
 export type Exports = {
     CachedModel: {
         new(name: string): CachedModel;
-    }
-    UncachedModel: {
-        new(value: number): UncachedModel;
-    }
+    },
     ExplicitlyUncachedModel: {
         new(count: number): ExplicitlyUncachedModel;
-    }
+    },
+    UncachedModel: {
+        new(value: number): UncachedModel;
+    },
 }
 export type Imports = {
 }
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/IdentityModeClass.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/IdentityModeClass.js
index ca958e564..c85aee3af 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/IdentityModeClass.js
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/IdentityModeClass.js
@@ -45,14 +45,14 @@ export async function createInstantiator(options, swift) {
             bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) {
                 const source = swift.memory.getObject(sourceId);
                 swift.memory.release(sourceId);
-                const bytes = new Uint8Array(memory.buffer, bytesPtr);
+                const bytes = new Uint8Array(memory.buffer, bytesPtr >>> 0);
                 bytes.set(source);
             }
             bjs["swift_js_make_js_string"] = function(ptr, len) {
                 return swift.memory.retain(decodeString(ptr, len));
             }
             bjs["swift_js_init_memory_with_result"] = function(ptr, len) {
-                const target = new Uint8Array(memory.buffer, ptr, len);
+                const target = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0);
                 target.set(tmpRetBytes);
                 tmpRetBytes = undefined;
             }
@@ -106,6 +106,14 @@ export async function createInstantiator(options, swift) {
                 const copy = memory.buffer.slice(ptr, ptr + byteLen);
                 taStack.push(Array.from(new Ctor(copy)));
             }
+            bjs["bjs_core_register_type_handles"] = function() {};
+            const __bjs_promiseSettlers = Symbol("JavaScriptKit.promiseSettlers");
+            bjs["swift_js_make_promise"] = function() {
+                let resolve, reject;
+                const promise = new Promise((res, rej) => { resolve = res; reject = rej; });
+                promise[__bjs_promiseSettlers] = { resolve, reject };
+                return swift.memory.retain(promise);
+            }
             bjs["swift_js_return_optional_bool"] = function(isSome, value) {
                 if (isSome === 0) {
                     tmpRetOptionalBool = null;
@@ -238,6 +246,7 @@ export async function createInstantiator(options, swift) {
             /// Represents a Swift heap object like a class instance or an actor instance.
             class SwiftHeapObject {
                 static __wrap(pointer, deinit, prototype, identityCache) {
+                    pointer = pointer >>> 0;
                     const makeFresh = (identityMap) => {
                         const obj = Object.create(prototype);
                         const state = { pointer, deinit, hasReleased: false, identityMap };
@@ -338,8 +347,8 @@ export async function createInstantiator(options, swift) {
             }
             const exports = {
                 CachedModel,
-                UncachedModel,
                 ExplicitlyUncachedModel,
+                UncachedModel,
             };
             _exports = exports;
             return exports;
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ImportArray.d.ts b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ImportArray.d.ts
index 5d1e2c4dc..cd4f822e2 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ImportArray.d.ts
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ImportArray.d.ts
@@ -9,6 +9,8 @@ export type Exports = {
 export type Imports = {
     roundtrip(items: number[]): number[];
     logStrings(items: string[]): void;
+    optionalArrayThenArray(a: number[] | null, b: number[]): number;
+    borrowedStringAroundStackParams(s: string, a: number[] | null, b: number[]): number;
 }
 export function createInstantiator(options: {
     imports: Imports;
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ImportArray.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ImportArray.js
index 613d4a10b..c92ea6ad3 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ImportArray.js
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ImportArray.js
@@ -31,6 +31,333 @@ export async function createInstantiator(options, swift) {
 
     let _exports = null;
     let bjs = null;
+    const __bjs_arrayCodecCache = new WeakMap();
+    function __bjs_arrayCodec(elementCodec) {
+        let codec = __bjs_arrayCodecCache.get(elementCodec);
+        if (codec !== undefined) {
+            return codec;
+        }
+        codec = {
+            lower(value) {
+                for (let i = 0; i < value.length; i++) {
+                    elementCodec.lower(value[i]);
+                }
+                i32Stack.push(value.length);
+            },
+            lift() {
+                const count = i32Stack.pop();
+                if (count === -1) {
+                    return taStack.pop();
+                }
+                const result = new Array(count);
+                for (let i = count - 1; i >= 0; i--) {
+                    result[i] = elementCodec.lift();
+                }
+                return result;
+            },
+        };
+        __bjs_arrayCodecCache.set(elementCodec, codec);
+        return codec;
+    }
+    const __bjs_optionalCodecCache = new WeakMap();
+    const __bjs_optionalCodecUndefinedOrCache = new WeakMap();
+    function __bjs_optionalCodec(elementCodec, isUndefinedOr = false) {
+        const cache = isUndefinedOr ? __bjs_optionalCodecUndefinedOrCache : __bjs_optionalCodecCache;
+        let codec = cache.get(elementCodec);
+        if (codec !== undefined) {
+            return codec;
+        }
+        codec = {
+            lower(value) {
+                const isSome = isUndefinedOr ? value !== undefined : value != null;
+                if (isSome) {
+                    elementCodec.lower(value);
+                    i32Stack.push(1);
+                } else {
+                    i32Stack.push(0);
+                }
+            },
+            lift() {
+                if (i32Stack.pop() === 0) {
+                    return isUndefinedOr ? undefined : null;
+                }
+                return elementCodec.lift();
+            },
+        };
+        cache.set(elementCodec, codec);
+        return codec;
+    }
+    const __bjs_dictCodecCache = new WeakMap();
+    function __bjs_dictCodec(valueCodec) {
+        let codec = __bjs_dictCodecCache.get(valueCodec);
+        if (codec !== undefined) {
+            return codec;
+        }
+        codec = {
+            lower(value) {
+                const keys = Object.keys(value);
+                for (let i = 0; i < keys.length; i++) {
+                    __bjs_stringCodec.lower(keys[i]);
+                    valueCodec.lower(value[keys[i]]);
+                }
+                i32Stack.push(keys.length);
+            },
+            lift() {
+                const count = i32Stack.pop();
+                const result = {};
+                for (let i = 0; i < count; i++) {
+                    const value = valueCodec.lift();
+                    const key = __bjs_stringCodec.lift();
+                    result[key] = value;
+                }
+                return result;
+            },
+        };
+        __bjs_dictCodecCache.set(valueCodec, codec);
+        return codec;
+    }
+
+    const __bjs_stringCodec = {
+        lower: (v) => {
+            const bytes = textEncoder.encode(v);
+            const id = swift.memory.retain(bytes);
+            i32Stack.push(bytes.length);
+            i32Stack.push(id);
+        },
+        lift: () => {
+            const string = strStack.pop();
+            return string;
+        },
+    };
+    const __bjs_primitiveCodecs = {
+        Bool: {
+            lower: (v) => {
+                i32Stack.push(v ? 1 : 0);
+            },
+            lift: () => {
+                const bool = i32Stack.pop() !== 0;
+                return bool;
+            },
+        },
+        Int: {
+            lower: (v) => {
+                i32Stack.push((v | 0));
+            },
+            lift: () => {
+                const int = i32Stack.pop();
+                return int;
+            },
+        },
+        Int8: {
+            lower: (v) => {
+                i32Stack.push((v | 0));
+            },
+            lift: () => {
+                const int = i32Stack.pop();
+                return int;
+            },
+        },
+        UInt8: {
+            lower: (v) => {
+                i32Stack.push((v | 0));
+            },
+            lift: () => {
+                const int = i32Stack.pop() >>> 0;
+                return int;
+            },
+        },
+        Int16: {
+            lower: (v) => {
+                i32Stack.push((v | 0));
+            },
+            lift: () => {
+                const int = i32Stack.pop();
+                return int;
+            },
+        },
+        UInt16: {
+            lower: (v) => {
+                i32Stack.push((v | 0));
+            },
+            lift: () => {
+                const int = i32Stack.pop() >>> 0;
+                return int;
+            },
+        },
+        Int32: {
+            lower: (v) => {
+                i32Stack.push((v | 0));
+            },
+            lift: () => {
+                const int = i32Stack.pop();
+                return int;
+            },
+        },
+        UInt32: {
+            lower: (v) => {
+                i32Stack.push((v | 0));
+            },
+            lift: () => {
+                const int = i32Stack.pop() >>> 0;
+                return int;
+            },
+        },
+        UInt: {
+            lower: (v) => {
+                i32Stack.push((v | 0));
+            },
+            lift: () => {
+                const int = i32Stack.pop() >>> 0;
+                return int;
+            },
+        },
+        Int64: {
+            lower: (v) => {
+                i64Stack.push(v);
+            },
+            lift: () => {
+                const int = i64Stack.pop();
+                return int;
+            },
+        },
+        UInt64: {
+            lower: (v) => {
+                i64Stack.push(v);
+            },
+            lift: () => {
+                const int = i64Stack.pop();
+                return int;
+            },
+        },
+        Float: {
+            lower: (v) => {
+                f32Stack.push(Math.fround(v));
+            },
+            lift: () => {
+                const f32 = f32Stack.pop();
+                return f32;
+            },
+        },
+        Double: {
+            lower: (v) => {
+                f64Stack.push(v);
+            },
+            lift: () => {
+                const f64 = f64Stack.pop();
+                return f64;
+            },
+        },
+        String: __bjs_stringCodec,
+        JSValue: {
+            lower: (v) => {
+                const [vKind, vPayload1, vPayload2] = __bjs_jsValueLower(v);
+                i32Stack.push(vKind);
+                i32Stack.push(vPayload1);
+                f64Stack.push(vPayload2);
+            },
+            lift: () => {
+                const jsValuePayload2 = f64Stack.pop();
+                const jsValuePayload1 = i32Stack.pop();
+                const jsValueKind = i32Stack.pop();
+                const jsValue = __bjs_jsValueLift(jsValueKind, jsValuePayload1, jsValuePayload2);
+                return jsValue;
+            },
+        },
+    };
+
+    function __bjs_jsValueLower(value) {
+        let kind;
+        let payload1;
+        let payload2;
+        if (value === null) {
+            kind = 4;
+            payload1 = 0;
+            payload2 = 0;
+        } else {
+            switch (typeof value) {
+                case "boolean":
+                    kind = 0;
+                    payload1 = value ? 1 : 0;
+                    payload2 = 0;
+                    break;
+                case "number":
+                    kind = 2;
+                    payload1 = 0;
+                    payload2 = value;
+                    break;
+                case "string":
+                    kind = 1;
+                    payload1 = swift.memory.retain(value);
+                    payload2 = 0;
+                    break;
+                case "undefined":
+                    kind = 5;
+                    payload1 = 0;
+                    payload2 = 0;
+                    break;
+                case "object":
+                    kind = 3;
+                    payload1 = swift.memory.retain(value);
+                    payload2 = 0;
+                    break;
+                case "function":
+                    kind = 3;
+                    payload1 = swift.memory.retain(value);
+                    payload2 = 0;
+                    break;
+                case "symbol":
+                    kind = 7;
+                    payload1 = swift.memory.retain(value);
+                    payload2 = 0;
+                    break;
+                case "bigint":
+                    kind = 8;
+                    payload1 = swift.memory.retain(value);
+                    payload2 = 0;
+                    break;
+                default:
+                    throw new TypeError("Unsupported JSValue type");
+            }
+        }
+        return [kind, payload1, payload2];
+    }
+    function __bjs_jsValueLift(kind, payload1, payload2) {
+        let jsValue;
+        switch (kind) {
+            case 0:
+                jsValue = payload1 !== 0;
+                break;
+            case 1:
+                jsValue = swift.memory.getObject(payload1);
+                break;
+            case 2:
+                jsValue = payload2;
+                break;
+            case 3:
+                jsValue = swift.memory.getObject(payload1);
+                break;
+            case 4:
+                jsValue = null;
+                break;
+            case 5:
+                jsValue = undefined;
+                break;
+            case 7:
+                jsValue = swift.memory.getObject(payload1);
+                break;
+            case 8:
+                jsValue = swift.memory.getObject(payload1);
+                break;
+            default:
+                throw new TypeError("Unsupported JSValue kind " + kind);
+        }
+        return jsValue;
+    }
+
+    const __bjs_codec_Array_Int = __bjs_arrayCodec(__bjs_primitiveCodecs.Int);
+    const __bjs_codec_Array_String = __bjs_arrayCodec(__bjs_stringCodec);
+    const __bjs_codec_Optional_Array_Int = __bjs_optionalCodec(__bjs_codec_Array_Int);
+
 
     return {
         /**
@@ -46,14 +373,14 @@ export async function createInstantiator(options, swift) {
             bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) {
                 const source = swift.memory.getObject(sourceId);
                 swift.memory.release(sourceId);
-                const bytes = new Uint8Array(memory.buffer, bytesPtr);
+                const bytes = new Uint8Array(memory.buffer, bytesPtr >>> 0);
                 bytes.set(source);
             }
             bjs["swift_js_make_js_string"] = function(ptr, len) {
                 return swift.memory.retain(decodeString(ptr, len));
             }
             bjs["swift_js_init_memory_with_result"] = function(ptr, len) {
-                const target = new Uint8Array(memory.buffer, ptr, len);
+                const target = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0);
                 target.set(tmpRetBytes);
                 tmpRetBytes = undefined;
             }
@@ -107,6 +434,14 @@ export async function createInstantiator(options, swift) {
                 const copy = memory.buffer.slice(ptr, ptr + byteLen);
                 taStack.push(Array.from(new Ctor(copy)));
             }
+            bjs["bjs_core_register_type_handles"] = function() {};
+            const __bjs_promiseSettlers = Symbol("JavaScriptKit.promiseSettlers");
+            bjs["swift_js_make_promise"] = function() {
+                let resolve, reject;
+                const promise = new Promise((res, rej) => { resolve = res; reject = rej; });
+                promise[__bjs_promiseSettlers] = { resolve, reject };
+                return swift.memory.retain(promise);
+            }
             bjs["swift_js_return_optional_bool"] = function(isSome, value) {
                 if (isSome === 0) {
                     tmpRetOptionalBool = null;
@@ -200,46 +535,44 @@ export async function createInstantiator(options, swift) {
             const TestModule = importObject["TestModule"] = importObject["TestModule"] || {};
             TestModule["bjs_roundtrip"] = function bjs_roundtrip() {
                 try {
-                    const arrayLen = i32Stack.pop();
-                    let arrayResult;
-                    if (arrayLen === -1) {
-                        arrayResult = taStack.pop();
-                    } else {
-                        arrayResult = [];
-                        for (let i = 0; i < arrayLen; i++) {
-                            const int = i32Stack.pop();
-                            arrayResult.push(int);
-                        }
-                        arrayResult.reverse();
-                    }
+                    const arrayResult = __bjs_codec_Array_Int.lift();
                     let ret = imports.roundtrip(arrayResult);
-                    for (const elem of ret) {
-                        i32Stack.push((elem | 0));
-                    }
-                    i32Stack.push(ret.length);
+                    __bjs_codec_Array_Int.lower(ret);
                 } catch (error) {
                     setException(error);
                 }
             }
             TestModule["bjs_logStrings"] = function bjs_logStrings() {
                 try {
-                    const arrayLen = i32Stack.pop();
-                    let arrayResult;
-                    if (arrayLen === -1) {
-                        arrayResult = taStack.pop();
-                    } else {
-                        arrayResult = [];
-                        for (let i = 0; i < arrayLen; i++) {
-                            const string = strStack.pop();
-                            arrayResult.push(string);
-                        }
-                        arrayResult.reverse();
-                    }
+                    const arrayResult = __bjs_codec_Array_String.lift();
                     imports.logStrings(arrayResult);
                 } catch (error) {
                     setException(error);
                 }
             }
+            TestModule["bjs_optionalArrayThenArray"] = function bjs_optionalArrayThenArray() {
+                try {
+                    const optValue = __bjs_codec_Optional_Array_Int.lift();
+                    const arrayResult = __bjs_codec_Array_Int.lift();
+                    let ret = imports.optionalArrayThenArray(optValue, arrayResult);
+                    return ret;
+                } catch (error) {
+                    setException(error);
+                    return 0
+                }
+            }
+            TestModule["bjs_borrowedStringAroundStackParams"] = function bjs_borrowedStringAroundStackParams(sBytes, sCount) {
+                try {
+                    const string = decodeString(sBytes, sCount);
+                    const optValue = __bjs_codec_Optional_Array_Int.lift();
+                    const arrayResult = __bjs_codec_Array_Int.lift();
+                    let ret = imports.borrowedStringAroundStackParams(string, optValue, arrayResult);
+                    return ret;
+                } catch (error) {
+                    setException(error);
+                    return 0
+                }
+            }
         },
         setInstance: (i) => {
             instance = i;
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ImportedTypeInExportedInterface.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ImportedTypeInExportedInterface.js
index ab4b4b34d..363f6c595 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ImportedTypeInExportedInterface.js
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ImportedTypeInExportedInterface.js
@@ -31,7 +31,346 @@ export async function createInstantiator(options, swift) {
 
     let _exports = null;
     let bjs = null;
-    const __bjs_createFooContainerHelpers = () => ({
+    const __bjs_arrayCodecCache = new WeakMap();
+    function __bjs_arrayCodec(elementCodec) {
+        let codec = __bjs_arrayCodecCache.get(elementCodec);
+        if (codec !== undefined) {
+            return codec;
+        }
+        codec = {
+            lower(value) {
+                for (let i = 0; i < value.length; i++) {
+                    elementCodec.lower(value[i]);
+                }
+                i32Stack.push(value.length);
+            },
+            lift() {
+                const count = i32Stack.pop();
+                if (count === -1) {
+                    return taStack.pop();
+                }
+                const result = new Array(count);
+                for (let i = count - 1; i >= 0; i--) {
+                    result[i] = elementCodec.lift();
+                }
+                return result;
+            },
+        };
+        __bjs_arrayCodecCache.set(elementCodec, codec);
+        return codec;
+    }
+    const __bjs_optionalCodecCache = new WeakMap();
+    const __bjs_optionalCodecUndefinedOrCache = new WeakMap();
+    function __bjs_optionalCodec(elementCodec, isUndefinedOr = false) {
+        const cache = isUndefinedOr ? __bjs_optionalCodecUndefinedOrCache : __bjs_optionalCodecCache;
+        let codec = cache.get(elementCodec);
+        if (codec !== undefined) {
+            return codec;
+        }
+        codec = {
+            lower(value) {
+                const isSome = isUndefinedOr ? value !== undefined : value != null;
+                if (isSome) {
+                    elementCodec.lower(value);
+                    i32Stack.push(1);
+                } else {
+                    i32Stack.push(0);
+                }
+            },
+            lift() {
+                if (i32Stack.pop() === 0) {
+                    return isUndefinedOr ? undefined : null;
+                }
+                return elementCodec.lift();
+            },
+        };
+        cache.set(elementCodec, codec);
+        return codec;
+    }
+    const __bjs_dictCodecCache = new WeakMap();
+    function __bjs_dictCodec(valueCodec) {
+        let codec = __bjs_dictCodecCache.get(valueCodec);
+        if (codec !== undefined) {
+            return codec;
+        }
+        codec = {
+            lower(value) {
+                const keys = Object.keys(value);
+                for (let i = 0; i < keys.length; i++) {
+                    __bjs_stringCodec.lower(keys[i]);
+                    valueCodec.lower(value[keys[i]]);
+                }
+                i32Stack.push(keys.length);
+            },
+            lift() {
+                const count = i32Stack.pop();
+                const result = {};
+                for (let i = 0; i < count; i++) {
+                    const value = valueCodec.lift();
+                    const key = __bjs_stringCodec.lift();
+                    result[key] = value;
+                }
+                return result;
+            },
+        };
+        __bjs_dictCodecCache.set(valueCodec, codec);
+        return codec;
+    }
+
+    const __bjs_stringCodec = {
+        lower: (v) => {
+            const bytes = textEncoder.encode(v);
+            const id = swift.memory.retain(bytes);
+            i32Stack.push(bytes.length);
+            i32Stack.push(id);
+        },
+        lift: () => {
+            const string = strStack.pop();
+            return string;
+        },
+    };
+    const __bjs_primitiveCodecs = {
+        Bool: {
+            lower: (v) => {
+                i32Stack.push(v ? 1 : 0);
+            },
+            lift: () => {
+                const bool = i32Stack.pop() !== 0;
+                return bool;
+            },
+        },
+        Int: {
+            lower: (v) => {
+                i32Stack.push((v | 0));
+            },
+            lift: () => {
+                const int = i32Stack.pop();
+                return int;
+            },
+        },
+        Int8: {
+            lower: (v) => {
+                i32Stack.push((v | 0));
+            },
+            lift: () => {
+                const int = i32Stack.pop();
+                return int;
+            },
+        },
+        UInt8: {
+            lower: (v) => {
+                i32Stack.push((v | 0));
+            },
+            lift: () => {
+                const int = i32Stack.pop() >>> 0;
+                return int;
+            },
+        },
+        Int16: {
+            lower: (v) => {
+                i32Stack.push((v | 0));
+            },
+            lift: () => {
+                const int = i32Stack.pop();
+                return int;
+            },
+        },
+        UInt16: {
+            lower: (v) => {
+                i32Stack.push((v | 0));
+            },
+            lift: () => {
+                const int = i32Stack.pop() >>> 0;
+                return int;
+            },
+        },
+        Int32: {
+            lower: (v) => {
+                i32Stack.push((v | 0));
+            },
+            lift: () => {
+                const int = i32Stack.pop();
+                return int;
+            },
+        },
+        UInt32: {
+            lower: (v) => {
+                i32Stack.push((v | 0));
+            },
+            lift: () => {
+                const int = i32Stack.pop() >>> 0;
+                return int;
+            },
+        },
+        UInt: {
+            lower: (v) => {
+                i32Stack.push((v | 0));
+            },
+            lift: () => {
+                const int = i32Stack.pop() >>> 0;
+                return int;
+            },
+        },
+        Int64: {
+            lower: (v) => {
+                i64Stack.push(v);
+            },
+            lift: () => {
+                const int = i64Stack.pop();
+                return int;
+            },
+        },
+        UInt64: {
+            lower: (v) => {
+                i64Stack.push(v);
+            },
+            lift: () => {
+                const int = i64Stack.pop();
+                return int;
+            },
+        },
+        Float: {
+            lower: (v) => {
+                f32Stack.push(Math.fround(v));
+            },
+            lift: () => {
+                const f32 = f32Stack.pop();
+                return f32;
+            },
+        },
+        Double: {
+            lower: (v) => {
+                f64Stack.push(v);
+            },
+            lift: () => {
+                const f64 = f64Stack.pop();
+                return f64;
+            },
+        },
+        String: __bjs_stringCodec,
+        JSValue: {
+            lower: (v) => {
+                const [vKind, vPayload1, vPayload2] = __bjs_jsValueLower(v);
+                i32Stack.push(vKind);
+                i32Stack.push(vPayload1);
+                f64Stack.push(vPayload2);
+            },
+            lift: () => {
+                const jsValuePayload2 = f64Stack.pop();
+                const jsValuePayload1 = i32Stack.pop();
+                const jsValueKind = i32Stack.pop();
+                const jsValue = __bjs_jsValueLift(jsValueKind, jsValuePayload1, jsValuePayload2);
+                return jsValue;
+            },
+        },
+    };
+
+    function __bjs_jsValueLower(value) {
+        let kind;
+        let payload1;
+        let payload2;
+        if (value === null) {
+            kind = 4;
+            payload1 = 0;
+            payload2 = 0;
+        } else {
+            switch (typeof value) {
+                case "boolean":
+                    kind = 0;
+                    payload1 = value ? 1 : 0;
+                    payload2 = 0;
+                    break;
+                case "number":
+                    kind = 2;
+                    payload1 = 0;
+                    payload2 = value;
+                    break;
+                case "string":
+                    kind = 1;
+                    payload1 = swift.memory.retain(value);
+                    payload2 = 0;
+                    break;
+                case "undefined":
+                    kind = 5;
+                    payload1 = 0;
+                    payload2 = 0;
+                    break;
+                case "object":
+                    kind = 3;
+                    payload1 = swift.memory.retain(value);
+                    payload2 = 0;
+                    break;
+                case "function":
+                    kind = 3;
+                    payload1 = swift.memory.retain(value);
+                    payload2 = 0;
+                    break;
+                case "symbol":
+                    kind = 7;
+                    payload1 = swift.memory.retain(value);
+                    payload2 = 0;
+                    break;
+                case "bigint":
+                    kind = 8;
+                    payload1 = swift.memory.retain(value);
+                    payload2 = 0;
+                    break;
+                default:
+                    throw new TypeError("Unsupported JSValue type");
+            }
+        }
+        return [kind, payload1, payload2];
+    }
+    function __bjs_jsValueLift(kind, payload1, payload2) {
+        let jsValue;
+        switch (kind) {
+            case 0:
+                jsValue = payload1 !== 0;
+                break;
+            case 1:
+                jsValue = swift.memory.getObject(payload1);
+                break;
+            case 2:
+                jsValue = payload2;
+                break;
+            case 3:
+                jsValue = swift.memory.getObject(payload1);
+                break;
+            case 4:
+                jsValue = null;
+                break;
+            case 5:
+                jsValue = undefined;
+                break;
+            case 7:
+                jsValue = swift.memory.getObject(payload1);
+                break;
+            case 8:
+                jsValue = swift.memory.getObject(payload1);
+                break;
+            default:
+                throw new TypeError("Unsupported JSValue kind " + kind);
+        }
+        return jsValue;
+    }
+
+    const __bjs_codec_Foo = {
+        lower: (v) => {
+            const objId = swift.memory.retain(v);
+            i32Stack.push(objId);
+        },
+        lift: () => {
+            const objId = i32Stack.pop();
+            const obj = swift.memory.getObject(objId);
+            swift.memory.release(objId);
+            return obj;
+        },
+    };
+    const __bjs_codec_Array_Foo = __bjs_arrayCodec(__bjs_codec_Foo);
+    const __bjs_codec_Optional_Foo = __bjs_optionalCodec(__bjs_codec_Foo);
+    const __bjs_codec_Array_Optional_Foo = __bjs_arrayCodec(__bjs_codec_Optional_Foo);
+
+    const __bjs_createStructHelpers_M10TestModuleT12FooContainer = () => ({
         lower: (value) => {
             let id;
             if (value.foo != null) {
@@ -40,24 +379,10 @@ export async function createInstantiator(options, swift) {
                 id = undefined;
             }
             i32Stack.push(id !== undefined ? id : 0);
-            const isSome = value.optionalFoo != null ? 1 : 0;
-            if (isSome) {
-                const objId = swift.memory.retain(value.optionalFoo);
-                i32Stack.push(objId);
-            }
-            i32Stack.push(isSome);
+            __bjs_codec_Optional_Foo.lower(value.optionalFoo);
         },
         lift: () => {
-            const isSome = i32Stack.pop();
-            let optValue;
-            if (isSome === 0) {
-                optValue = null;
-            } else {
-                const objId = i32Stack.pop();
-                const obj = swift.memory.getObject(objId);
-                swift.memory.release(objId);
-                optValue = obj;
-            }
+            const optValue = __bjs_codec_Optional_Foo.lift();
             const objectId = i32Stack.pop();
             let value;
             if (objectId !== 0) {
@@ -84,14 +409,14 @@ export async function createInstantiator(options, swift) {
             bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) {
                 const source = swift.memory.getObject(sourceId);
                 swift.memory.release(sourceId);
-                const bytes = new Uint8Array(memory.buffer, bytesPtr);
+                const bytes = new Uint8Array(memory.buffer, bytesPtr >>> 0);
                 bytes.set(source);
             }
             bjs["swift_js_make_js_string"] = function(ptr, len) {
                 return swift.memory.retain(decodeString(ptr, len));
             }
             bjs["swift_js_init_memory_with_result"] = function(ptr, len) {
-                const target = new Uint8Array(memory.buffer, ptr, len);
+                const target = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0);
                 target.set(tmpRetBytes);
                 tmpRetBytes = undefined;
             }
@@ -146,12 +471,21 @@ export async function createInstantiator(options, swift) {
                 taStack.push(Array.from(new Ctor(copy)));
             }
             bjs["swift_js_struct_lower_FooContainer"] = function(objectId) {
-                structHelpers.FooContainer.lower(swift.memory.getObject(objectId));
+                structHelpers.M10TestModuleT12FooContainer.lower(swift.memory.getObject(objectId));
             }
             bjs["swift_js_struct_lift_FooContainer"] = function() {
-                const value = structHelpers.FooContainer.lift();
+                const value = structHelpers.M10TestModuleT12FooContainer.lift();
                 return swift.memory.retain(value);
             }
+            bjs["bjs_core_register_type_handles"] = function() {};
+            bjs["bjs_TestModule_register_type_handles"] = function() {};
+            const __bjs_promiseSettlers = Symbol("JavaScriptKit.promiseSettlers");
+            bjs["swift_js_make_promise"] = function() {
+                let resolve, reject;
+                const promise = new Promise((res, rej) => { resolve = res; reject = rej; });
+                promise[__bjs_promiseSettlers] = { resolve, reject };
+                return swift.memory.retain(promise);
+            }
             bjs["swift_js_return_optional_bool"] = function(isSome, value) {
                 if (isSome === 0) {
                     tmpRetOptionalBool = null;
@@ -265,8 +599,8 @@ export async function createInstantiator(options, swift) {
         /** @param {WebAssembly.Instance} instance */
         createExports: (instance) => {
             const js = swift.memory.heap;
-            const FooContainerHelpers = __bjs_createFooContainerHelpers();
-            structHelpers.FooContainer = FooContainerHelpers;
+            const __bjs_helpers_M10TestModuleT12FooContainer = __bjs_createStructHelpers_M10TestModuleT12FooContainer();
+            structHelpers.M10TestModuleT12FooContainer = __bjs_helpers_M10TestModuleT12FooContainer;
 
             const exports = {
                 makeFoo: function bjs_makeFoo() {
@@ -282,66 +616,21 @@ export async function createInstantiator(options, swift) {
                     return ret1;
                 },
                 processFooArray: function bjs_processFooArray(foos) {
-                    for (const elem of foos) {
-                        const objId = swift.memory.retain(elem);
-                        i32Stack.push(objId);
-                    }
-                    i32Stack.push(foos.length);
+                    __bjs_codec_Array_Foo.lower(foos);
                     instance.exports.bjs_processFooArray();
-                    const arrayLen = i32Stack.pop();
-                    let arrayResult;
-                    if (arrayLen === -1) {
-                        arrayResult = taStack.pop();
-                    } else {
-                        arrayResult = [];
-                        for (let i = 0; i < arrayLen; i++) {
-                            const objId1 = i32Stack.pop();
-                            const obj = swift.memory.getObject(objId1);
-                            swift.memory.release(objId1);
-                            arrayResult.push(obj);
-                        }
-                        arrayResult.reverse();
-                    }
+                    const arrayResult = __bjs_codec_Array_Foo.lift();
                     return arrayResult;
                 },
                 processOptionalFooArray: function bjs_processOptionalFooArray(foos) {
-                    for (const elem of foos) {
-                        const isSome = elem != null ? 1 : 0;
-                        if (isSome) {
-                            const objId = swift.memory.retain(elem);
-                            i32Stack.push(objId);
-                        }
-                        i32Stack.push(isSome);
-                    }
-                    i32Stack.push(foos.length);
+                    __bjs_codec_Array_Optional_Foo.lower(foos);
                     instance.exports.bjs_processOptionalFooArray();
-                    const arrayLen = i32Stack.pop();
-                    let arrayResult;
-                    if (arrayLen === -1) {
-                        arrayResult = taStack.pop();
-                    } else {
-                        arrayResult = [];
-                        for (let i = 0; i < arrayLen; i++) {
-                            const isSome1 = i32Stack.pop();
-                            let optValue;
-                            if (isSome1 === 0) {
-                                optValue = null;
-                            } else {
-                                const objId1 = i32Stack.pop();
-                                const obj = swift.memory.getObject(objId1);
-                                swift.memory.release(objId1);
-                                optValue = obj;
-                            }
-                            arrayResult.push(optValue);
-                        }
-                        arrayResult.reverse();
-                    }
+                    const arrayResult = __bjs_codec_Array_Optional_Foo.lift();
                     return arrayResult;
                 },
                 roundtripFooContainer: function bjs_roundtripFooContainer(container) {
-                    structHelpers.FooContainer.lower(container);
+                    structHelpers.M10TestModuleT12FooContainer.lower(container);
                     instance.exports.bjs_roundtripFooContainer();
-                    const structValue = structHelpers.FooContainer.lift();
+                    const structValue = structHelpers.M10TestModuleT12FooContainer.lift();
                     return structValue;
                 },
             };
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/InvalidPropertyNames.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/InvalidPropertyNames.js
index 59c8be11d..e8fe5ec10 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/InvalidPropertyNames.js
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/InvalidPropertyNames.js
@@ -46,14 +46,14 @@ export async function createInstantiator(options, swift) {
             bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) {
                 const source = swift.memory.getObject(sourceId);
                 swift.memory.release(sourceId);
-                const bytes = new Uint8Array(memory.buffer, bytesPtr);
+                const bytes = new Uint8Array(memory.buffer, bytesPtr >>> 0);
                 bytes.set(source);
             }
             bjs["swift_js_make_js_string"] = function(ptr, len) {
                 return swift.memory.retain(decodeString(ptr, len));
             }
             bjs["swift_js_init_memory_with_result"] = function(ptr, len) {
-                const target = new Uint8Array(memory.buffer, ptr, len);
+                const target = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0);
                 target.set(tmpRetBytes);
                 tmpRetBytes = undefined;
             }
@@ -107,6 +107,14 @@ export async function createInstantiator(options, swift) {
                 const copy = memory.buffer.slice(ptr, ptr + byteLen);
                 taStack.push(Array.from(new Ctor(copy)));
             }
+            bjs["bjs_core_register_type_handles"] = function() {};
+            const __bjs_promiseSettlers = Symbol("JavaScriptKit.promiseSettlers");
+            bjs["swift_js_make_promise"] = function() {
+                let resolve, reject;
+                const promise = new Promise((res, rej) => { resolve = res; reject = rej; });
+                promise[__bjs_promiseSettlers] = { resolve, reject };
+                return swift.memory.retain(promise);
+            }
             bjs["swift_js_return_optional_bool"] = function(isSome, value) {
                 if (isSome === 0) {
                     tmpRetOptionalBool = null;
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSClass.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSClass.js
index f3293ae52..15b48d4b9 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSClass.js
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSClass.js
@@ -46,14 +46,14 @@ export async function createInstantiator(options, swift) {
             bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) {
                 const source = swift.memory.getObject(sourceId);
                 swift.memory.release(sourceId);
-                const bytes = new Uint8Array(memory.buffer, bytesPtr);
+                const bytes = new Uint8Array(memory.buffer, bytesPtr >>> 0);
                 bytes.set(source);
             }
             bjs["swift_js_make_js_string"] = function(ptr, len) {
                 return swift.memory.retain(decodeString(ptr, len));
             }
             bjs["swift_js_init_memory_with_result"] = function(ptr, len) {
-                const target = new Uint8Array(memory.buffer, ptr, len);
+                const target = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0);
                 target.set(tmpRetBytes);
                 tmpRetBytes = undefined;
             }
@@ -107,6 +107,14 @@ export async function createInstantiator(options, swift) {
                 const copy = memory.buffer.slice(ptr, ptr + byteLen);
                 taStack.push(Array.from(new Ctor(copy)));
             }
+            bjs["bjs_core_register_type_handles"] = function() {};
+            const __bjs_promiseSettlers = Symbol("JavaScriptKit.promiseSettlers");
+            bjs["swift_js_make_promise"] = function() {
+                let resolve, reject;
+                const promise = new Promise((res, rej) => { resolve = res; reject = rej; });
+                promise[__bjs_promiseSettlers] = { resolve, reject };
+                return swift.memory.retain(promise);
+            }
             bjs["swift_js_return_optional_bool"] = function(isSome, value) {
                 if (isSome === 0) {
                     tmpRetOptionalBool = null;
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSClassStaticFunctions.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSClassStaticFunctions.js
index ef666149b..5eaba3c8f 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSClassStaticFunctions.js
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSClassStaticFunctions.js
@@ -46,14 +46,14 @@ export async function createInstantiator(options, swift) {
             bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) {
                 const source = swift.memory.getObject(sourceId);
                 swift.memory.release(sourceId);
-                const bytes = new Uint8Array(memory.buffer, bytesPtr);
+                const bytes = new Uint8Array(memory.buffer, bytesPtr >>> 0);
                 bytes.set(source);
             }
             bjs["swift_js_make_js_string"] = function(ptr, len) {
                 return swift.memory.retain(decodeString(ptr, len));
             }
             bjs["swift_js_init_memory_with_result"] = function(ptr, len) {
-                const target = new Uint8Array(memory.buffer, ptr, len);
+                const target = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0);
                 target.set(tmpRetBytes);
                 tmpRetBytes = undefined;
             }
@@ -107,6 +107,14 @@ export async function createInstantiator(options, swift) {
                 const copy = memory.buffer.slice(ptr, ptr + byteLen);
                 taStack.push(Array.from(new Ctor(copy)));
             }
+            bjs["bjs_core_register_type_handles"] = function() {};
+            const __bjs_promiseSettlers = Symbol("JavaScriptKit.promiseSettlers");
+            bjs["swift_js_make_promise"] = function() {
+                let resolve, reject;
+                const promise = new Promise((res, rej) => { resolve = res; reject = rej; });
+                promise[__bjs_promiseSettlers] = { resolve, reject };
+                return swift.memory.retain(promise);
+            }
             bjs["swift_js_return_optional_bool"] = function(isSome, value) {
                 if (isSome === 0) {
                     tmpRetOptionalBool = null;
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSImportBareModule.d.ts b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSImportBareModule.d.ts
new file mode 100644
index 000000000..a6267bd31
--- /dev/null
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSImportBareModule.d.ts
@@ -0,0 +1,21 @@
+// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit,
+// DO NOT EDIT.
+//
+// To update this file, just rebuild your project or run
+// `swift package bridge-js`.
+
+export interface ScopedFile {
+    read(): number;
+    readonly size: number;
+}
+export type Exports = {
+}
+export type Imports = {
+}
+export function createInstantiator(options: {
+    imports: Imports;
+}, swift: any): Promise<{
+    addImports: (importObject: WebAssembly.Imports) => void;
+    setInstance: (instance: WebAssembly.Instance) => void;
+    createExports: (instance: WebAssembly.Instance) => Exports;
+}>;
\ No newline at end of file
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSImportBareModule.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSImportBareModule.js
new file mode 100644
index 000000000..6d1b1b6fb
--- /dev/null
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSImportBareModule.js
@@ -0,0 +1,316 @@
+// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit,
+// DO NOT EDIT.
+//
+// To update this file, just rebuild your project or run
+// `swift package bridge-js`.
+
+import { default as __bjs_import_0_default } from "./bridge-js-modules/TestModule/Modules/DefaultExport.mjs";
+import { File as __bjs_import_1_File } from "@scope/package";
+import { default as __bjs_import_2_default } from "default-export-package";
+import { basename as __bjs_import_3_basename, dirname as __bjs_import_3_dirname } from "node:path";
+import { version as __bjs_import_4_version } from "some-package";
+
+export async function createInstantiator(options, swift) {
+    let instance;
+    let memory;
+    let setException;
+    let decodeString;
+    const textDecoder = new TextDecoder("utf-8");
+    const textEncoder = new TextEncoder("utf-8");
+    let tmpRetString;
+    let tmpRetBytes;
+    let tmpRetException;
+    let tmpRetOptionalBool;
+    let tmpRetOptionalInt;
+    let tmpRetOptionalFloat;
+    let tmpRetOptionalDouble;
+    let tmpRetOptionalHeapObject;
+    let strStack = [];
+    let i32Stack = [];
+    let i64Stack = [];
+    let f32Stack = [];
+    let f64Stack = [];
+    let ptrStack = [];
+    let taStack = [];
+    const enumHelpers = {};
+    const structHelpers = {};
+
+    let _exports = null;
+    let bjs = null;
+
+    return {
+        /**
+         * @param {WebAssembly.Imports} importObject
+         */
+        addImports: (importObject, importsContext) => {
+            bjs = {};
+            importObject["bjs"] = bjs;
+            bjs["swift_js_return_string"] = function(ptr, len) {
+                tmpRetString = decodeString(ptr, len);
+            }
+            bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) {
+                const source = swift.memory.getObject(sourceId);
+                swift.memory.release(sourceId);
+                const bytes = new Uint8Array(memory.buffer, bytesPtr >>> 0);
+                bytes.set(source);
+            }
+            bjs["swift_js_make_js_string"] = function(ptr, len) {
+                return swift.memory.retain(decodeString(ptr, len));
+            }
+            bjs["swift_js_init_memory_with_result"] = function(ptr, len) {
+                const target = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0);
+                target.set(tmpRetBytes);
+                tmpRetBytes = undefined;
+            }
+            bjs["swift_js_throw"] = function(id) {
+                tmpRetException = swift.memory.retainByRef(id);
+            }
+            bjs["swift_js_retain"] = function(id) {
+                return swift.memory.retainByRef(id);
+            }
+            bjs["swift_js_release"] = function(id) {
+                swift.memory.release(id);
+            }
+            bjs["swift_js_push_i32"] = function(v) {
+                i32Stack.push(v | 0);
+            }
+            bjs["swift_js_push_f32"] = function(v) {
+                f32Stack.push(Math.fround(v));
+            }
+            bjs["swift_js_push_f64"] = function(v) {
+                f64Stack.push(v);
+            }
+            bjs["swift_js_push_string"] = function(ptr, len) {
+                const value = decodeString(ptr, len);
+                strStack.push(value);
+            }
+            bjs["swift_js_pop_i32"] = function() {
+                return i32Stack.pop();
+            }
+            bjs["swift_js_pop_f32"] = function() {
+                return f32Stack.pop();
+            }
+            bjs["swift_js_pop_f64"] = function() {
+                return f64Stack.pop();
+            }
+            bjs["swift_js_push_pointer"] = function(pointer) {
+                ptrStack.push(pointer);
+            }
+            bjs["swift_js_pop_pointer"] = function() {
+                return ptrStack.pop();
+            }
+            bjs["swift_js_push_i64"] = function(v) {
+                i64Stack.push(v);
+            }
+            bjs["swift_js_pop_i64"] = function() {
+                return i64Stack.pop();
+            }
+            const taCtors = [Int8Array, Uint8Array, Int16Array, Uint16Array, Int32Array, Uint32Array, Float32Array, Float64Array];
+            bjs["swift_js_push_typed_array"] = function(kind, ptr, count) {
+                const Ctor = taCtors[kind];
+                const byteLen = count * Ctor.BYTES_PER_ELEMENT;
+                const copy = memory.buffer.slice(ptr, ptr + byteLen);
+                taStack.push(Array.from(new Ctor(copy)));
+            }
+            bjs["bjs_core_register_type_handles"] = function() {};
+            const __bjs_promiseSettlers = Symbol("JavaScriptKit.promiseSettlers");
+            bjs["swift_js_make_promise"] = function() {
+                let resolve, reject;
+                const promise = new Promise((res, rej) => { resolve = res; reject = rej; });
+                promise[__bjs_promiseSettlers] = { resolve, reject };
+                return swift.memory.retain(promise);
+            }
+            bjs["swift_js_return_optional_bool"] = function(isSome, value) {
+                if (isSome === 0) {
+                    tmpRetOptionalBool = null;
+                } else {
+                    tmpRetOptionalBool = value !== 0;
+                }
+            }
+            bjs["swift_js_return_optional_int"] = function(isSome, value) {
+                if (isSome === 0) {
+                    tmpRetOptionalInt = null;
+                } else {
+                    tmpRetOptionalInt = value | 0;
+                }
+            }
+            bjs["swift_js_return_optional_float"] = function(isSome, value) {
+                if (isSome === 0) {
+                    tmpRetOptionalFloat = null;
+                } else {
+                    tmpRetOptionalFloat = Math.fround(value);
+                }
+            }
+            bjs["swift_js_return_optional_double"] = function(isSome, value) {
+                if (isSome === 0) {
+                    tmpRetOptionalDouble = null;
+                } else {
+                    tmpRetOptionalDouble = value;
+                }
+            }
+            bjs["swift_js_return_optional_string"] = function(isSome, ptr, len) {
+                if (isSome === 0) {
+                    tmpRetString = null;
+                } else {
+                    tmpRetString = decodeString(ptr, len);
+                }
+            }
+            bjs["swift_js_return_optional_object"] = function(isSome, objectId) {
+                if (isSome === 0) {
+                    tmpRetString = null;
+                } else {
+                    tmpRetString = swift.memory.getObject(objectId);
+                }
+            }
+            bjs["swift_js_return_optional_heap_object"] = function(isSome, pointer) {
+                if (isSome === 0) {
+                    tmpRetOptionalHeapObject = null;
+                } else {
+                    tmpRetOptionalHeapObject = pointer;
+                }
+            }
+            bjs["swift_js_get_optional_int_presence"] = function() {
+                return tmpRetOptionalInt != null ? 1 : 0;
+            }
+            bjs["swift_js_get_optional_int_value"] = function() {
+                const value = tmpRetOptionalInt;
+                tmpRetOptionalInt = undefined;
+                return value;
+            }
+            bjs["swift_js_get_optional_string"] = function() {
+                const str = tmpRetString;
+                tmpRetString = undefined;
+                if (str == null) {
+                    return -1;
+                } else {
+                    const bytes = textEncoder.encode(str);
+                    tmpRetBytes = bytes;
+                    return bytes.length;
+                }
+            }
+            bjs["swift_js_get_optional_float_presence"] = function() {
+                return tmpRetOptionalFloat != null ? 1 : 0;
+            }
+            bjs["swift_js_get_optional_float_value"] = function() {
+                const value = tmpRetOptionalFloat;
+                tmpRetOptionalFloat = undefined;
+                return value;
+            }
+            bjs["swift_js_get_optional_double_presence"] = function() {
+                return tmpRetOptionalDouble != null ? 1 : 0;
+            }
+            bjs["swift_js_get_optional_double_value"] = function() {
+                const value = tmpRetOptionalDouble;
+                tmpRetOptionalDouble = undefined;
+                return value;
+            }
+            bjs["swift_js_get_optional_heap_object_pointer"] = function() {
+                const pointer = tmpRetOptionalHeapObject;
+                tmpRetOptionalHeapObject = undefined;
+                return pointer || 0;
+            }
+            bjs["swift_js_closure_unregister"] = function(funcRef) {}
+            const TestModule = importObject["TestModule"] = importObject["TestModule"] || {};
+            TestModule["bjs_packageVersion_get"] = function bjs_packageVersion_get() {
+                try {
+                    let ret = __bjs_import_4_version;
+                    tmpRetBytes = textEncoder.encode(ret);
+                    return tmpRetBytes.length;
+                } catch (error) {
+                    setException(error);
+                }
+            }
+            TestModule["bjs_localDefaultExport_get"] = function bjs_localDefaultExport_get() {
+                try {
+                    let ret = __bjs_import_0_default;
+                    return swift.memory.retain(ret);
+                } catch (error) {
+                    setException(error);
+                    return 0
+                }
+            }
+            TestModule["bjs_nodeBasename"] = function bjs_nodeBasename(pathBytes, pathCount) {
+                try {
+                    const string = decodeString(pathBytes, pathCount);
+                    let ret = __bjs_import_3_basename(string);
+                    tmpRetBytes = textEncoder.encode(ret);
+                    return tmpRetBytes.length;
+                } catch (error) {
+                    setException(error);
+                }
+            }
+            TestModule["bjs_nodeDirname"] = function bjs_nodeDirname(pathBytes, pathCount) {
+                try {
+                    const string = decodeString(pathBytes, pathCount);
+                    let ret = __bjs_import_3_dirname(string);
+                    tmpRetBytes = textEncoder.encode(ret);
+                    return tmpRetBytes.length;
+                } catch (error) {
+                    setException(error);
+                }
+            }
+            TestModule["bjs_callDefaultExport"] = function bjs_callDefaultExport(value) {
+                try {
+                    let ret = __bjs_import_2_default(value);
+                    return ret;
+                } catch (error) {
+                    setException(error);
+                    return 0
+                }
+            }
+            TestModule["bjs_ScopedFile_init"] = function bjs_ScopedFile_init(value) {
+                try {
+                    return swift.memory.retain(new __bjs_import_1_File(value));
+                } catch (error) {
+                    setException(error);
+                    return 0
+                }
+            }
+            TestModule["bjs_ScopedFile_size_get"] = function bjs_ScopedFile_size_get(self) {
+                try {
+                    let ret = swift.memory.getObject(self).size;
+                    return ret;
+                } catch (error) {
+                    setException(error);
+                    return 0
+                }
+            }
+            TestModule["bjs_ScopedFile_create_static"] = function bjs_ScopedFile_create_static(value) {
+                try {
+                    let ret = __bjs_import_1_File.create(value);
+                    return swift.memory.retain(ret);
+                } catch (error) {
+                    setException(error);
+                    return 0
+                }
+            }
+            TestModule["bjs_ScopedFile_read"] = function bjs_ScopedFile_read(self) {
+                try {
+                    let ret = swift.memory.getObject(self).read();
+                    return ret;
+                } catch (error) {
+                    setException(error);
+                    return 0
+                }
+            }
+        },
+        setInstance: (i) => {
+            instance = i;
+            memory = instance.exports.memory;
+
+            decodeString = (ptr, len) => { const bytes = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); return textDecoder.decode(bytes); }
+
+            setException = (error) => {
+                instance.exports._swift_js_exception.value = swift.memory.retain(error)
+            }
+        },
+        /** @param {WebAssembly.Instance} instance */
+        createExports: (instance) => {
+            const js = swift.memory.heap;
+            const exports = {
+            };
+            _exports = exports;
+            return exports;
+        },
+    }
+}
\ No newline at end of file
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSImportBareModuleFallback.d.ts b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSImportBareModuleFallback.d.ts
new file mode 100644
index 000000000..818d57a9d
--- /dev/null
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSImportBareModuleFallback.d.ts
@@ -0,0 +1,17 @@
+// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit,
+// DO NOT EDIT.
+//
+// To update this file, just rebuild your project or run
+// `swift package bridge-js`.
+
+export type Exports = {
+}
+export type Imports = {
+}
+export function createInstantiator(options: {
+    imports: Imports;
+}, swift: any): Promise<{
+    addImports: (importObject: WebAssembly.Imports) => void;
+    setInstance: (instance: WebAssembly.Instance) => void;
+    createExports: (instance: WebAssembly.Instance) => Exports;
+}>;
\ No newline at end of file
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSImportBareModuleFallback.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSImportBareModuleFallback.js
new file mode 100644
index 000000000..9428698be
--- /dev/null
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSImportBareModuleFallback.js
@@ -0,0 +1,260 @@
+// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit,
+// DO NOT EDIT.
+//
+// To update this file, just rebuild your project or run
+// `swift package bridge-js`.
+
+import { join as __bjs_import_0_join } from "node:path";
+import * as __bjs_imported_module_1 from "weird-package";
+
+export async function createInstantiator(options, swift) {
+    let instance;
+    let memory;
+    let setException;
+    let decodeString;
+    const textDecoder = new TextDecoder("utf-8");
+    const textEncoder = new TextEncoder("utf-8");
+    let tmpRetString;
+    let tmpRetBytes;
+    let tmpRetException;
+    let tmpRetOptionalBool;
+    let tmpRetOptionalInt;
+    let tmpRetOptionalFloat;
+    let tmpRetOptionalDouble;
+    let tmpRetOptionalHeapObject;
+    let strStack = [];
+    let i32Stack = [];
+    let i64Stack = [];
+    let f32Stack = [];
+    let f64Stack = [];
+    let ptrStack = [];
+    let taStack = [];
+    const enumHelpers = {};
+    const structHelpers = {};
+
+    let _exports = null;
+    let bjs = null;
+
+    return {
+        /**
+         * @param {WebAssembly.Imports} importObject
+         */
+        addImports: (importObject, importsContext) => {
+            bjs = {};
+            importObject["bjs"] = bjs;
+            bjs["swift_js_return_string"] = function(ptr, len) {
+                tmpRetString = decodeString(ptr, len);
+            }
+            bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) {
+                const source = swift.memory.getObject(sourceId);
+                swift.memory.release(sourceId);
+                const bytes = new Uint8Array(memory.buffer, bytesPtr >>> 0);
+                bytes.set(source);
+            }
+            bjs["swift_js_make_js_string"] = function(ptr, len) {
+                return swift.memory.retain(decodeString(ptr, len));
+            }
+            bjs["swift_js_init_memory_with_result"] = function(ptr, len) {
+                const target = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0);
+                target.set(tmpRetBytes);
+                tmpRetBytes = undefined;
+            }
+            bjs["swift_js_throw"] = function(id) {
+                tmpRetException = swift.memory.retainByRef(id);
+            }
+            bjs["swift_js_retain"] = function(id) {
+                return swift.memory.retainByRef(id);
+            }
+            bjs["swift_js_release"] = function(id) {
+                swift.memory.release(id);
+            }
+            bjs["swift_js_push_i32"] = function(v) {
+                i32Stack.push(v | 0);
+            }
+            bjs["swift_js_push_f32"] = function(v) {
+                f32Stack.push(Math.fround(v));
+            }
+            bjs["swift_js_push_f64"] = function(v) {
+                f64Stack.push(v);
+            }
+            bjs["swift_js_push_string"] = function(ptr, len) {
+                const value = decodeString(ptr, len);
+                strStack.push(value);
+            }
+            bjs["swift_js_pop_i32"] = function() {
+                return i32Stack.pop();
+            }
+            bjs["swift_js_pop_f32"] = function() {
+                return f32Stack.pop();
+            }
+            bjs["swift_js_pop_f64"] = function() {
+                return f64Stack.pop();
+            }
+            bjs["swift_js_push_pointer"] = function(pointer) {
+                ptrStack.push(pointer);
+            }
+            bjs["swift_js_pop_pointer"] = function() {
+                return ptrStack.pop();
+            }
+            bjs["swift_js_push_i64"] = function(v) {
+                i64Stack.push(v);
+            }
+            bjs["swift_js_pop_i64"] = function() {
+                return i64Stack.pop();
+            }
+            const taCtors = [Int8Array, Uint8Array, Int16Array, Uint16Array, Int32Array, Uint32Array, Float32Array, Float64Array];
+            bjs["swift_js_push_typed_array"] = function(kind, ptr, count) {
+                const Ctor = taCtors[kind];
+                const byteLen = count * Ctor.BYTES_PER_ELEMENT;
+                const copy = memory.buffer.slice(ptr, ptr + byteLen);
+                taStack.push(Array.from(new Ctor(copy)));
+            }
+            bjs["bjs_core_register_type_handles"] = function() {};
+            const __bjs_promiseSettlers = Symbol("JavaScriptKit.promiseSettlers");
+            bjs["swift_js_make_promise"] = function() {
+                let resolve, reject;
+                const promise = new Promise((res, rej) => { resolve = res; reject = rej; });
+                promise[__bjs_promiseSettlers] = { resolve, reject };
+                return swift.memory.retain(promise);
+            }
+            bjs["swift_js_return_optional_bool"] = function(isSome, value) {
+                if (isSome === 0) {
+                    tmpRetOptionalBool = null;
+                } else {
+                    tmpRetOptionalBool = value !== 0;
+                }
+            }
+            bjs["swift_js_return_optional_int"] = function(isSome, value) {
+                if (isSome === 0) {
+                    tmpRetOptionalInt = null;
+                } else {
+                    tmpRetOptionalInt = value | 0;
+                }
+            }
+            bjs["swift_js_return_optional_float"] = function(isSome, value) {
+                if (isSome === 0) {
+                    tmpRetOptionalFloat = null;
+                } else {
+                    tmpRetOptionalFloat = Math.fround(value);
+                }
+            }
+            bjs["swift_js_return_optional_double"] = function(isSome, value) {
+                if (isSome === 0) {
+                    tmpRetOptionalDouble = null;
+                } else {
+                    tmpRetOptionalDouble = value;
+                }
+            }
+            bjs["swift_js_return_optional_string"] = function(isSome, ptr, len) {
+                if (isSome === 0) {
+                    tmpRetString = null;
+                } else {
+                    tmpRetString = decodeString(ptr, len);
+                }
+            }
+            bjs["swift_js_return_optional_object"] = function(isSome, objectId) {
+                if (isSome === 0) {
+                    tmpRetString = null;
+                } else {
+                    tmpRetString = swift.memory.getObject(objectId);
+                }
+            }
+            bjs["swift_js_return_optional_heap_object"] = function(isSome, pointer) {
+                if (isSome === 0) {
+                    tmpRetOptionalHeapObject = null;
+                } else {
+                    tmpRetOptionalHeapObject = pointer;
+                }
+            }
+            bjs["swift_js_get_optional_int_presence"] = function() {
+                return tmpRetOptionalInt != null ? 1 : 0;
+            }
+            bjs["swift_js_get_optional_int_value"] = function() {
+                const value = tmpRetOptionalInt;
+                tmpRetOptionalInt = undefined;
+                return value;
+            }
+            bjs["swift_js_get_optional_string"] = function() {
+                const str = tmpRetString;
+                tmpRetString = undefined;
+                if (str == null) {
+                    return -1;
+                } else {
+                    const bytes = textEncoder.encode(str);
+                    tmpRetBytes = bytes;
+                    return bytes.length;
+                }
+            }
+            bjs["swift_js_get_optional_float_presence"] = function() {
+                return tmpRetOptionalFloat != null ? 1 : 0;
+            }
+            bjs["swift_js_get_optional_float_value"] = function() {
+                const value = tmpRetOptionalFloat;
+                tmpRetOptionalFloat = undefined;
+                return value;
+            }
+            bjs["swift_js_get_optional_double_presence"] = function() {
+                return tmpRetOptionalDouble != null ? 1 : 0;
+            }
+            bjs["swift_js_get_optional_double_value"] = function() {
+                const value = tmpRetOptionalDouble;
+                tmpRetOptionalDouble = undefined;
+                return value;
+            }
+            bjs["swift_js_get_optional_heap_object_pointer"] = function() {
+                const pointer = tmpRetOptionalHeapObject;
+                tmpRetOptionalHeapObject = undefined;
+                return pointer || 0;
+            }
+            bjs["swift_js_closure_unregister"] = function(funcRef) {}
+            const TestModule = importObject["TestModule"] = importObject["TestModule"] || {};
+            TestModule["bjs_dashedProperty_get"] = function bjs_dashedProperty_get() {
+                try {
+                    let ret = __bjs_imported_module_1["dashed-property"];
+                    tmpRetBytes = textEncoder.encode(ret);
+                    return tmpRetBytes.length;
+                } catch (error) {
+                    setException(error);
+                }
+            }
+            TestModule["bjs_kebabCaseFunction"] = function bjs_kebabCaseFunction() {
+                try {
+                    let ret = __bjs_imported_module_1["kebab-case-function"]();
+                    return ret;
+                } catch (error) {
+                    setException(error);
+                    return 0
+                }
+            }
+            TestModule["bjs_joinPaths"] = function bjs_joinPaths(lhsBytes, lhsCount, rhsBytes, rhsCount) {
+                try {
+                    const string = decodeString(lhsBytes, lhsCount);
+                    const string1 = decodeString(rhsBytes, rhsCount);
+                    let ret = __bjs_import_0_join(string, string1);
+                    tmpRetBytes = textEncoder.encode(ret);
+                    return tmpRetBytes.length;
+                } catch (error) {
+                    setException(error);
+                }
+            }
+        },
+        setInstance: (i) => {
+            instance = i;
+            memory = instance.exports.memory;
+
+            decodeString = (ptr, len) => { const bytes = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); return textDecoder.decode(bytes); }
+
+            setException = (error) => {
+                instance.exports._swift_js_exception.value = swift.memory.retain(error)
+            }
+        },
+        /** @param {WebAssembly.Instance} instance */
+        createExports: (instance) => {
+            const js = swift.memory.heap;
+            const exports = {
+            };
+            _exports = exports;
+            return exports;
+        },
+    }
+}
\ No newline at end of file
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSImportModule.d.ts b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSImportModule.d.ts
new file mode 100644
index 000000000..624691d83
--- /dev/null
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSImportModule.d.ts
@@ -0,0 +1,21 @@
+// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit,
+// DO NOT EDIT.
+//
+// To update this file, just rebuild your project or run
+// `swift package bridge-js`.
+
+export interface ModuleCounter {
+    increment(): number;
+    value: number;
+}
+export type Exports = {
+}
+export type Imports = {
+}
+export function createInstantiator(options: {
+    imports: Imports;
+}, swift: any): Promise<{
+    addImports: (importObject: WebAssembly.Imports) => void;
+    setInstance: (instance: WebAssembly.Instance) => void;
+    createExports: (instance: WebAssembly.Instance) => Exports;
+}>;
\ No newline at end of file
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSImportModule.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSImportModule.js
new file mode 100644
index 000000000..aacf5e61a
--- /dev/null
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSImportModule.js
@@ -0,0 +1,300 @@
+// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit,
+// DO NOT EDIT.
+//
+// To update this file, just rebuild your project or run
+// `swift package bridge-js`.
+
+import { moduleAdd as __bjs_import_0_moduleAdd, renamedFunction as __bjs_import_0_renamedFunction, version as __bjs_import_0_version } from "./bridge-js-modules/TestModule/Modules/JSImportModule.mjs";
+import { ModuleCounter as __bjs_import_1_ModuleCounter } from "./bridge-js-modules/TestModule/Modules/ModuleCounter.mjs";
+
+export async function createInstantiator(options, swift) {
+    let instance;
+    let memory;
+    let setException;
+    let decodeString;
+    const textDecoder = new TextDecoder("utf-8");
+    const textEncoder = new TextEncoder("utf-8");
+    let tmpRetString;
+    let tmpRetBytes;
+    let tmpRetException;
+    let tmpRetOptionalBool;
+    let tmpRetOptionalInt;
+    let tmpRetOptionalFloat;
+    let tmpRetOptionalDouble;
+    let tmpRetOptionalHeapObject;
+    let strStack = [];
+    let i32Stack = [];
+    let i64Stack = [];
+    let f32Stack = [];
+    let f64Stack = [];
+    let ptrStack = [];
+    let taStack = [];
+    const enumHelpers = {};
+    const structHelpers = {};
+
+    let _exports = null;
+    let bjs = null;
+
+    return {
+        /**
+         * @param {WebAssembly.Imports} importObject
+         */
+        addImports: (importObject, importsContext) => {
+            bjs = {};
+            importObject["bjs"] = bjs;
+            bjs["swift_js_return_string"] = function(ptr, len) {
+                tmpRetString = decodeString(ptr, len);
+            }
+            bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) {
+                const source = swift.memory.getObject(sourceId);
+                swift.memory.release(sourceId);
+                const bytes = new Uint8Array(memory.buffer, bytesPtr >>> 0);
+                bytes.set(source);
+            }
+            bjs["swift_js_make_js_string"] = function(ptr, len) {
+                return swift.memory.retain(decodeString(ptr, len));
+            }
+            bjs["swift_js_init_memory_with_result"] = function(ptr, len) {
+                const target = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0);
+                target.set(tmpRetBytes);
+                tmpRetBytes = undefined;
+            }
+            bjs["swift_js_throw"] = function(id) {
+                tmpRetException = swift.memory.retainByRef(id);
+            }
+            bjs["swift_js_retain"] = function(id) {
+                return swift.memory.retainByRef(id);
+            }
+            bjs["swift_js_release"] = function(id) {
+                swift.memory.release(id);
+            }
+            bjs["swift_js_push_i32"] = function(v) {
+                i32Stack.push(v | 0);
+            }
+            bjs["swift_js_push_f32"] = function(v) {
+                f32Stack.push(Math.fround(v));
+            }
+            bjs["swift_js_push_f64"] = function(v) {
+                f64Stack.push(v);
+            }
+            bjs["swift_js_push_string"] = function(ptr, len) {
+                const value = decodeString(ptr, len);
+                strStack.push(value);
+            }
+            bjs["swift_js_pop_i32"] = function() {
+                return i32Stack.pop();
+            }
+            bjs["swift_js_pop_f32"] = function() {
+                return f32Stack.pop();
+            }
+            bjs["swift_js_pop_f64"] = function() {
+                return f64Stack.pop();
+            }
+            bjs["swift_js_push_pointer"] = function(pointer) {
+                ptrStack.push(pointer);
+            }
+            bjs["swift_js_pop_pointer"] = function() {
+                return ptrStack.pop();
+            }
+            bjs["swift_js_push_i64"] = function(v) {
+                i64Stack.push(v);
+            }
+            bjs["swift_js_pop_i64"] = function() {
+                return i64Stack.pop();
+            }
+            const taCtors = [Int8Array, Uint8Array, Int16Array, Uint16Array, Int32Array, Uint32Array, Float32Array, Float64Array];
+            bjs["swift_js_push_typed_array"] = function(kind, ptr, count) {
+                const Ctor = taCtors[kind];
+                const byteLen = count * Ctor.BYTES_PER_ELEMENT;
+                const copy = memory.buffer.slice(ptr, ptr + byteLen);
+                taStack.push(Array.from(new Ctor(copy)));
+            }
+            bjs["bjs_core_register_type_handles"] = function() {};
+            const __bjs_promiseSettlers = Symbol("JavaScriptKit.promiseSettlers");
+            bjs["swift_js_make_promise"] = function() {
+                let resolve, reject;
+                const promise = new Promise((res, rej) => { resolve = res; reject = rej; });
+                promise[__bjs_promiseSettlers] = { resolve, reject };
+                return swift.memory.retain(promise);
+            }
+            bjs["swift_js_return_optional_bool"] = function(isSome, value) {
+                if (isSome === 0) {
+                    tmpRetOptionalBool = null;
+                } else {
+                    tmpRetOptionalBool = value !== 0;
+                }
+            }
+            bjs["swift_js_return_optional_int"] = function(isSome, value) {
+                if (isSome === 0) {
+                    tmpRetOptionalInt = null;
+                } else {
+                    tmpRetOptionalInt = value | 0;
+                }
+            }
+            bjs["swift_js_return_optional_float"] = function(isSome, value) {
+                if (isSome === 0) {
+                    tmpRetOptionalFloat = null;
+                } else {
+                    tmpRetOptionalFloat = Math.fround(value);
+                }
+            }
+            bjs["swift_js_return_optional_double"] = function(isSome, value) {
+                if (isSome === 0) {
+                    tmpRetOptionalDouble = null;
+                } else {
+                    tmpRetOptionalDouble = value;
+                }
+            }
+            bjs["swift_js_return_optional_string"] = function(isSome, ptr, len) {
+                if (isSome === 0) {
+                    tmpRetString = null;
+                } else {
+                    tmpRetString = decodeString(ptr, len);
+                }
+            }
+            bjs["swift_js_return_optional_object"] = function(isSome, objectId) {
+                if (isSome === 0) {
+                    tmpRetString = null;
+                } else {
+                    tmpRetString = swift.memory.getObject(objectId);
+                }
+            }
+            bjs["swift_js_return_optional_heap_object"] = function(isSome, pointer) {
+                if (isSome === 0) {
+                    tmpRetOptionalHeapObject = null;
+                } else {
+                    tmpRetOptionalHeapObject = pointer;
+                }
+            }
+            bjs["swift_js_get_optional_int_presence"] = function() {
+                return tmpRetOptionalInt != null ? 1 : 0;
+            }
+            bjs["swift_js_get_optional_int_value"] = function() {
+                const value = tmpRetOptionalInt;
+                tmpRetOptionalInt = undefined;
+                return value;
+            }
+            bjs["swift_js_get_optional_string"] = function() {
+                const str = tmpRetString;
+                tmpRetString = undefined;
+                if (str == null) {
+                    return -1;
+                } else {
+                    const bytes = textEncoder.encode(str);
+                    tmpRetBytes = bytes;
+                    return bytes.length;
+                }
+            }
+            bjs["swift_js_get_optional_float_presence"] = function() {
+                return tmpRetOptionalFloat != null ? 1 : 0;
+            }
+            bjs["swift_js_get_optional_float_value"] = function() {
+                const value = tmpRetOptionalFloat;
+                tmpRetOptionalFloat = undefined;
+                return value;
+            }
+            bjs["swift_js_get_optional_double_presence"] = function() {
+                return tmpRetOptionalDouble != null ? 1 : 0;
+            }
+            bjs["swift_js_get_optional_double_value"] = function() {
+                const value = tmpRetOptionalDouble;
+                tmpRetOptionalDouble = undefined;
+                return value;
+            }
+            bjs["swift_js_get_optional_heap_object_pointer"] = function() {
+                const pointer = tmpRetOptionalHeapObject;
+                tmpRetOptionalHeapObject = undefined;
+                return pointer || 0;
+            }
+            bjs["swift_js_closure_unregister"] = function(funcRef) {}
+            const TestModule = importObject["TestModule"] = importObject["TestModule"] || {};
+            TestModule["bjs_moduleVersion_get"] = function bjs_moduleVersion_get() {
+                try {
+                    let ret = __bjs_import_0_version;
+                    tmpRetBytes = textEncoder.encode(ret);
+                    return tmpRetBytes.length;
+                } catch (error) {
+                    setException(error);
+                }
+            }
+            TestModule["bjs_moduleAdd"] = function bjs_moduleAdd(lhs, rhs) {
+                try {
+                    let ret = __bjs_import_0_moduleAdd(lhs, rhs);
+                    return ret;
+                } catch (error) {
+                    setException(error);
+                    return 0
+                }
+            }
+            TestModule["bjs_moduleRenamed"] = function bjs_moduleRenamed() {
+                try {
+                    let ret = __bjs_import_0_renamedFunction();
+                    tmpRetBytes = textEncoder.encode(ret);
+                    return tmpRetBytes.length;
+                } catch (error) {
+                    setException(error);
+                }
+            }
+            TestModule["bjs_ModuleCounter_init"] = function bjs_ModuleCounter_init(value) {
+                try {
+                    return swift.memory.retain(new __bjs_import_1_ModuleCounter(value));
+                } catch (error) {
+                    setException(error);
+                    return 0
+                }
+            }
+            TestModule["bjs_ModuleCounter_value_get"] = function bjs_ModuleCounter_value_get(self) {
+                try {
+                    let ret = swift.memory.getObject(self).value;
+                    return ret;
+                } catch (error) {
+                    setException(error);
+                    return 0
+                }
+            }
+            TestModule["bjs_ModuleCounter_value_set"] = function bjs_ModuleCounter_value_set(self, newValue) {
+                try {
+                    swift.memory.getObject(self).value = newValue;
+                } catch (error) {
+                    setException(error);
+                }
+            }
+            TestModule["bjs_ModuleCounter_create_static"] = function bjs_ModuleCounter_create_static(value) {
+                try {
+                    let ret = __bjs_import_1_ModuleCounter.create(value);
+                    return swift.memory.retain(ret);
+                } catch (error) {
+                    setException(error);
+                    return 0
+                }
+            }
+            TestModule["bjs_ModuleCounter_increment"] = function bjs_ModuleCounter_increment(self) {
+                try {
+                    let ret = swift.memory.getObject(self).increment();
+                    return ret;
+                } catch (error) {
+                    setException(error);
+                    return 0
+                }
+            }
+        },
+        setInstance: (i) => {
+            instance = i;
+            memory = instance.exports.memory;
+
+            decodeString = (ptr, len) => { const bytes = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); return textDecoder.decode(bytes); }
+
+            setException = (error) => {
+                instance.exports._swift_js_exception.value = swift.memory.retain(error)
+            }
+        },
+        /** @param {WebAssembly.Instance} instance */
+        createExports: (instance) => {
+            const js = swift.memory.heap;
+            const exports = {
+            };
+            _exports = exports;
+            return exports;
+        },
+    }
+}
\ No newline at end of file
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSNameOverride.d.ts b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSNameOverride.d.ts
new file mode 100644
index 000000000..d31aeebe3
--- /dev/null
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSNameOverride.d.ts
@@ -0,0 +1,68 @@
+// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit,
+// DO NOT EDIT.
+//
+// To update this file, just rebuild your project or run
+// `swift package bridge-js`.
+
+export const RenamedEnumMembersValues: {
+    readonly Active: 0;
+    readonly Inactive: 1;
+};
+export type RenamedEnumMembersTag = typeof RenamedEnumMembersValues[keyof typeof RenamedEnumMembersValues];
+
+export interface RenamedVector {
+    dx: number;
+    dy: number;
+    magnitude(): number;
+}
+export type RenamedEnumMembersObject = typeof RenamedEnumMembersValues & {
+    describeCase(): string;
+    currentDefault: string;
+};
+
+/// Represents a Swift heap object like a class instance or an actor instance.
+export interface SwiftHeapObject {
+    /// Release the heap object.
+    ///
+    /// Note: Calling this method will release the heap object and it will no longer be accessible.
+    release(): void;
+}
+export interface RenamedMembers extends SwiftHeapObject {
+    makeGreeting(): string;
+    label: string;
+    readonly total: number;
+}
+export type Exports = {
+    makeGreeting(name: string): string;
+    greetName(name: string): string;
+    greetCount(count: number): string;
+    RenamedEnumMembers: RenamedEnumMembersObject
+    RenamedMembers: {
+        new(title: string, count: number): RenamedMembers;
+        makeDefault(): RenamedMembers;
+        sharedTotal: number;
+        readonly readOnlyLimit: number;
+    },
+    RenamedNamespaceMembers: {
+        theAnswer: number;
+        plus(a: number, b: number): number;
+    },
+    RenamedVector: {
+        readonly originVector: RenamedVector;
+        fromPolar(radius: number, angle: number): RenamedVector;
+    },
+    Utils: {
+        Text: {
+            namespacedRenamed(): number;
+        },
+    },
+}
+export type Imports = {
+}
+export function createInstantiator(options: {
+    imports: Imports;
+}, swift: any): Promise<{
+    addImports: (importObject: WebAssembly.Imports) => void;
+    setInstance: (instance: WebAssembly.Instance) => void;
+    createExports: (instance: WebAssembly.Instance) => Exports;
+}>;
\ No newline at end of file
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSNameOverride.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSNameOverride.js
new file mode 100644
index 000000000..68ac11976
--- /dev/null
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSNameOverride.js
@@ -0,0 +1,444 @@
+// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit,
+// DO NOT EDIT.
+//
+// To update this file, just rebuild your project or run
+// `swift package bridge-js`.
+
+export const RenamedEnumMembersValues = {
+    Active: 0,
+    Inactive: 1,
+};
+
+export async function createInstantiator(options, swift) {
+    let instance;
+    let memory;
+    let setException;
+    let decodeString;
+    const textDecoder = new TextDecoder("utf-8");
+    const textEncoder = new TextEncoder("utf-8");
+    let tmpRetString;
+    let tmpRetBytes;
+    let tmpRetException;
+    let tmpRetOptionalBool;
+    let tmpRetOptionalInt;
+    let tmpRetOptionalFloat;
+    let tmpRetOptionalDouble;
+    let tmpRetOptionalHeapObject;
+    let strStack = [];
+    let i32Stack = [];
+    let i64Stack = [];
+    let f32Stack = [];
+    let f64Stack = [];
+    let ptrStack = [];
+    let taStack = [];
+    const enumHelpers = {};
+    const structHelpers = {};
+
+    let _exports = null;
+    let bjs = null;
+    const __bjs_createStructHelpers_M10TestModuleT13RenamedVector = () => ({
+        lower: (value) => {
+            f64Stack.push(value.dx);
+            f64Stack.push(value.dy);
+        },
+        lift: () => {
+            const f64 = f64Stack.pop();
+            const f641 = f64Stack.pop();
+            const instance1 = { dx: f641, dy: f64 };
+            instance1.magnitude = function() {
+                structHelpers.M10TestModuleT13RenamedVector.lower(this);
+                const ret = instance.exports.bjs_RenamedVector_magnitude();
+                return ret;
+            }.bind(instance1);
+            return instance1;
+        }
+    });
+
+    return {
+        /**
+         * @param {WebAssembly.Imports} importObject
+         */
+        addImports: (importObject, importsContext) => {
+            bjs = {};
+            importObject["bjs"] = bjs;
+            bjs["swift_js_return_string"] = function(ptr, len) {
+                tmpRetString = decodeString(ptr, len);
+            }
+            bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) {
+                const source = swift.memory.getObject(sourceId);
+                swift.memory.release(sourceId);
+                const bytes = new Uint8Array(memory.buffer, bytesPtr >>> 0);
+                bytes.set(source);
+            }
+            bjs["swift_js_make_js_string"] = function(ptr, len) {
+                return swift.memory.retain(decodeString(ptr, len));
+            }
+            bjs["swift_js_init_memory_with_result"] = function(ptr, len) {
+                const target = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0);
+                target.set(tmpRetBytes);
+                tmpRetBytes = undefined;
+            }
+            bjs["swift_js_throw"] = function(id) {
+                tmpRetException = swift.memory.retainByRef(id);
+            }
+            bjs["swift_js_retain"] = function(id) {
+                return swift.memory.retainByRef(id);
+            }
+            bjs["swift_js_release"] = function(id) {
+                swift.memory.release(id);
+            }
+            bjs["swift_js_push_i32"] = function(v) {
+                i32Stack.push(v | 0);
+            }
+            bjs["swift_js_push_f32"] = function(v) {
+                f32Stack.push(Math.fround(v));
+            }
+            bjs["swift_js_push_f64"] = function(v) {
+                f64Stack.push(v);
+            }
+            bjs["swift_js_push_string"] = function(ptr, len) {
+                const value = decodeString(ptr, len);
+                strStack.push(value);
+            }
+            bjs["swift_js_pop_i32"] = function() {
+                return i32Stack.pop();
+            }
+            bjs["swift_js_pop_f32"] = function() {
+                return f32Stack.pop();
+            }
+            bjs["swift_js_pop_f64"] = function() {
+                return f64Stack.pop();
+            }
+            bjs["swift_js_push_pointer"] = function(pointer) {
+                ptrStack.push(pointer);
+            }
+            bjs["swift_js_pop_pointer"] = function() {
+                return ptrStack.pop();
+            }
+            bjs["swift_js_push_i64"] = function(v) {
+                i64Stack.push(v);
+            }
+            bjs["swift_js_pop_i64"] = function() {
+                return i64Stack.pop();
+            }
+            const taCtors = [Int8Array, Uint8Array, Int16Array, Uint16Array, Int32Array, Uint32Array, Float32Array, Float64Array];
+            bjs["swift_js_push_typed_array"] = function(kind, ptr, count) {
+                const Ctor = taCtors[kind];
+                const byteLen = count * Ctor.BYTES_PER_ELEMENT;
+                const copy = memory.buffer.slice(ptr, ptr + byteLen);
+                taStack.push(Array.from(new Ctor(copy)));
+            }
+            bjs["swift_js_struct_lower_RenamedVector"] = function(objectId) {
+                structHelpers.M10TestModuleT13RenamedVector.lower(swift.memory.getObject(objectId));
+            }
+            bjs["swift_js_struct_lift_RenamedVector"] = function() {
+                const value = structHelpers.M10TestModuleT13RenamedVector.lift();
+                return swift.memory.retain(value);
+            }
+            bjs["bjs_core_register_type_handles"] = function() {};
+            bjs["bjs_TestModule_register_type_handles"] = function() {};
+            const __bjs_promiseSettlers = Symbol("JavaScriptKit.promiseSettlers");
+            bjs["swift_js_make_promise"] = function() {
+                let resolve, reject;
+                const promise = new Promise((res, rej) => { resolve = res; reject = rej; });
+                promise[__bjs_promiseSettlers] = { resolve, reject };
+                return swift.memory.retain(promise);
+            }
+            bjs["swift_js_return_optional_bool"] = function(isSome, value) {
+                if (isSome === 0) {
+                    tmpRetOptionalBool = null;
+                } else {
+                    tmpRetOptionalBool = value !== 0;
+                }
+            }
+            bjs["swift_js_return_optional_int"] = function(isSome, value) {
+                if (isSome === 0) {
+                    tmpRetOptionalInt = null;
+                } else {
+                    tmpRetOptionalInt = value | 0;
+                }
+            }
+            bjs["swift_js_return_optional_float"] = function(isSome, value) {
+                if (isSome === 0) {
+                    tmpRetOptionalFloat = null;
+                } else {
+                    tmpRetOptionalFloat = Math.fround(value);
+                }
+            }
+            bjs["swift_js_return_optional_double"] = function(isSome, value) {
+                if (isSome === 0) {
+                    tmpRetOptionalDouble = null;
+                } else {
+                    tmpRetOptionalDouble = value;
+                }
+            }
+            bjs["swift_js_return_optional_string"] = function(isSome, ptr, len) {
+                if (isSome === 0) {
+                    tmpRetString = null;
+                } else {
+                    tmpRetString = decodeString(ptr, len);
+                }
+            }
+            bjs["swift_js_return_optional_object"] = function(isSome, objectId) {
+                if (isSome === 0) {
+                    tmpRetString = null;
+                } else {
+                    tmpRetString = swift.memory.getObject(objectId);
+                }
+            }
+            bjs["swift_js_return_optional_heap_object"] = function(isSome, pointer) {
+                if (isSome === 0) {
+                    tmpRetOptionalHeapObject = null;
+                } else {
+                    tmpRetOptionalHeapObject = pointer;
+                }
+            }
+            bjs["swift_js_get_optional_int_presence"] = function() {
+                return tmpRetOptionalInt != null ? 1 : 0;
+            }
+            bjs["swift_js_get_optional_int_value"] = function() {
+                const value = tmpRetOptionalInt;
+                tmpRetOptionalInt = undefined;
+                return value;
+            }
+            bjs["swift_js_get_optional_string"] = function() {
+                const str = tmpRetString;
+                tmpRetString = undefined;
+                if (str == null) {
+                    return -1;
+                } else {
+                    const bytes = textEncoder.encode(str);
+                    tmpRetBytes = bytes;
+                    return bytes.length;
+                }
+            }
+            bjs["swift_js_get_optional_float_presence"] = function() {
+                return tmpRetOptionalFloat != null ? 1 : 0;
+            }
+            bjs["swift_js_get_optional_float_value"] = function() {
+                const value = tmpRetOptionalFloat;
+                tmpRetOptionalFloat = undefined;
+                return value;
+            }
+            bjs["swift_js_get_optional_double_presence"] = function() {
+                return tmpRetOptionalDouble != null ? 1 : 0;
+            }
+            bjs["swift_js_get_optional_double_value"] = function() {
+                const value = tmpRetOptionalDouble;
+                tmpRetOptionalDouble = undefined;
+                return value;
+            }
+            bjs["swift_js_get_optional_heap_object_pointer"] = function() {
+                const pointer = tmpRetOptionalHeapObject;
+                tmpRetOptionalHeapObject = undefined;
+                return pointer || 0;
+            }
+            bjs["swift_js_closure_unregister"] = function(funcRef) {}
+            // Wrapper functions for module: TestModule
+            if (!importObject["TestModule"]) {
+                importObject["TestModule"] = {};
+            }
+            importObject["TestModule"]["bjs_RenamedMembers_wrap"] = function(pointer) {
+                const obj = _exports['RenamedMembers'].__construct(pointer);
+                return swift.memory.retain(obj);
+            };
+        },
+        setInstance: (i) => {
+            instance = i;
+            memory = instance.exports.memory;
+
+            decodeString = (ptr, len) => { const bytes = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); return textDecoder.decode(bytes); }
+
+            setException = (error) => {
+                instance.exports._swift_js_exception.value = swift.memory.retain(error)
+            }
+        },
+        /** @param {WebAssembly.Instance} instance */
+        createExports: (instance) => {
+            const js = swift.memory.heap;
+            const swiftHeapObjectFinalizationRegistry = (typeof FinalizationRegistry === "undefined") ? { register: () => {}, unregister: () => {} } : new FinalizationRegistry((state) => {
+                if (state.hasReleased) {
+                    return;
+                }
+                state.hasReleased = true;
+                state.identityMap?.delete(state.pointer);
+                state.deinit(state.pointer);
+            });
+
+            /// Represents a Swift heap object like a class instance or an actor instance.
+            class SwiftHeapObject {
+                static __wrap(pointer, deinit, prototype, identityCache) {
+                    pointer = pointer >>> 0;
+                    const makeFresh = (identityMap) => {
+                        const obj = Object.create(prototype);
+                        const state = { pointer, deinit, hasReleased: false, identityMap };
+                        obj.pointer = pointer;
+                        obj.__swiftHeapObjectState = state;
+                        swiftHeapObjectFinalizationRegistry.register(obj, state, state);
+                        if (identityMap) {
+                            identityMap.set(pointer, new WeakRef(obj));
+                        }
+                        return obj;
+                    };
+
+                    if (!identityCache) {
+                        return makeFresh(null);
+                    }
+
+                    const cached = identityCache.get(pointer)?.deref();
+                    if (cached && !cached.__swiftHeapObjectState.hasReleased) {
+                        deinit(pointer);
+                        return cached;
+                    }
+                    if (identityCache.has(pointer)) {
+                        identityCache.delete(pointer);
+                    }
+
+                    return makeFresh(identityCache);
+                }
+
+                release() {
+                    const state = this.__swiftHeapObjectState;
+                    if (state.hasReleased) {
+                        return;
+                    }
+                    state.hasReleased = true;
+                    swiftHeapObjectFinalizationRegistry.unregister(state);
+                    state.identityMap?.delete(state.pointer);
+                    state.deinit(state.pointer);
+                }
+            }
+            class RenamedMembers extends SwiftHeapObject {
+                static __construct(ptr) {
+                    return SwiftHeapObject.__wrap(ptr, instance.exports.bjs_RenamedMembers_deinit, RenamedMembers.prototype, null);
+                }
+
+                constructor(title, count) {
+                    const titleBytes = textEncoder.encode(title);
+                    const titleId = swift.memory.retain(titleBytes);
+                    const ret = instance.exports.bjs_RenamedMembers_init(titleId, titleBytes.length, count);
+                    return RenamedMembers.__construct(ret);
+                }
+                makeGreeting() {
+                    instance.exports.bjs_RenamedMembers_makeGreeting(this.pointer);
+                    const ret = tmpRetString;
+                    tmpRetString = undefined;
+                    return ret;
+                }
+                static makeDefault() {
+                    const ret = instance.exports.bjs_RenamedMembers_static_makeDefault();
+                    return RenamedMembers.__construct(ret);
+                }
+                get label() {
+                    instance.exports.bjs_RenamedMembers_title_get(this.pointer);
+                    const ret = tmpRetString;
+                    tmpRetString = undefined;
+                    return ret;
+                }
+                set label(value) {
+                    const valueBytes = textEncoder.encode(value);
+                    const valueId = swift.memory.retain(valueBytes);
+                    instance.exports.bjs_RenamedMembers_title_set(this.pointer, valueId, valueBytes.length);
+                }
+                get total() {
+                    const ret = instance.exports.bjs_RenamedMembers_count_get(this.pointer);
+                    return ret;
+                }
+                static get sharedTotal() {
+                    const ret = instance.exports.bjs_RenamedMembers_static_sharedCount_get();
+                    return ret;
+                }
+                static set sharedTotal(value) {
+                    instance.exports.bjs_RenamedMembers_static_sharedCount_set(value);
+                }
+                static get readOnlyLimit() {
+                    const ret = instance.exports.bjs_RenamedMembers_static_limit_get();
+                    return ret;
+                }
+            }
+            const __bjs_helpers_M10TestModuleT13RenamedVector = __bjs_createStructHelpers_M10TestModuleT13RenamedVector();
+            structHelpers.M10TestModuleT13RenamedVector = __bjs_helpers_M10TestModuleT13RenamedVector;
+
+            const exports = {
+                makeGreeting: function bjs_makeGreeting(name) {
+                    const nameBytes = textEncoder.encode(name);
+                    const nameId = swift.memory.retain(nameBytes);
+                    instance.exports.bjs_makeGreeting(nameId, nameBytes.length);
+                    const ret = tmpRetString;
+                    tmpRetString = undefined;
+                    return ret;
+                },
+                greetName: function bjs_greetName(name) {
+                    const nameBytes = textEncoder.encode(name);
+                    const nameId = swift.memory.retain(nameBytes);
+                    instance.exports.bjs_greetName(nameId, nameBytes.length);
+                    const ret = tmpRetString;
+                    tmpRetString = undefined;
+                    return ret;
+                },
+                greetCount: function bjs_greetCount(count) {
+                    instance.exports.bjs_greetCount(count);
+                    const ret = tmpRetString;
+                    tmpRetString = undefined;
+                    return ret;
+                },
+                RenamedEnumMembers: {
+                    ...RenamedEnumMembersValues,
+                    describeCase: function() {
+                        instance.exports.bjs_RenamedEnumMembers_static_describeCase();
+                        const ret = tmpRetString;
+                        tmpRetString = undefined;
+                        return ret;
+                    },
+                    get currentDefault() {
+                        instance.exports.bjs_RenamedEnumMembers_static_defaultValue_get();
+                        const ret = tmpRetString;
+                        tmpRetString = undefined;
+                        return ret;
+                    },
+                    set currentDefault(value) {
+                        const valueBytes = textEncoder.encode(value);
+                        const valueId = swift.memory.retain(valueBytes);
+                        instance.exports.bjs_RenamedEnumMembers_static_defaultValue_set(valueId, valueBytes.length);
+                    }
+                },
+                RenamedMembers,
+                RenamedNamespaceMembers: {
+                    get theAnswer() {
+                        const ret = instance.exports.bjs_RenamedNamespaceMembers_static_answer_get();
+                        return ret;
+                    },
+                    set theAnswer(value) {
+                        instance.exports.bjs_RenamedNamespaceMembers_static_answer_set(value);
+                    },
+                    plus: function bjs_RenamedNamespaceMembers_static_plus(a, b) {
+                        const ret = instance.exports.bjs_RenamedNamespaceMembers_static_plus(a, b);
+                        return ret;
+                    },
+                },
+                RenamedVector: {
+                    get originVector() {
+                        instance.exports.bjs_RenamedVector_static_origin_get();
+                        const structValue = structHelpers.M10TestModuleT13RenamedVector.lift();
+                        return structValue;
+                    },
+                    fromPolar: function(radius, angle) {
+                        instance.exports.bjs_RenamedVector_static_fromPolar(radius, angle);
+                        const structValue = structHelpers.M10TestModuleT13RenamedVector.lift();
+                        return structValue;
+                    },
+                },
+                Utils: {
+                    Text: {
+                        namespacedRenamed: function bjs_Utils_Text_namespacedRenamed() {
+                            const ret = instance.exports.bjs_Utils_Text_namespacedRenamed();
+                            return ret;
+                        },
+                    },
+                },
+            };
+            _exports = exports;
+            return exports;
+        },
+    }
+}
\ No newline at end of file
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSTypedArrayTypes.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSTypedArrayTypes.js
index b12640234..f02f6bcf2 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSTypedArrayTypes.js
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSTypedArrayTypes.js
@@ -45,14 +45,14 @@ export async function createInstantiator(options, swift) {
             bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) {
                 const source = swift.memory.getObject(sourceId);
                 swift.memory.release(sourceId);
-                const bytes = new Uint8Array(memory.buffer, bytesPtr);
+                const bytes = new Uint8Array(memory.buffer, bytesPtr >>> 0);
                 bytes.set(source);
             }
             bjs["swift_js_make_js_string"] = function(ptr, len) {
                 return swift.memory.retain(decodeString(ptr, len));
             }
             bjs["swift_js_init_memory_with_result"] = function(ptr, len) {
-                const target = new Uint8Array(memory.buffer, ptr, len);
+                const target = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0);
                 target.set(tmpRetBytes);
                 tmpRetBytes = undefined;
             }
@@ -106,6 +106,14 @@ export async function createInstantiator(options, swift) {
                 const copy = memory.buffer.slice(ptr, ptr + byteLen);
                 taStack.push(Array.from(new Ctor(copy)));
             }
+            bjs["bjs_core_register_type_handles"] = function() {};
+            const __bjs_promiseSettlers = Symbol("JavaScriptKit.promiseSettlers");
+            bjs["swift_js_make_promise"] = function() {
+                let resolve, reject;
+                const promise = new Promise((res, rej) => { resolve = res; reject = rej; });
+                promise[__bjs_promiseSettlers] = { resolve, reject };
+                return swift.memory.retain(promise);
+            }
             bjs["swift_js_return_optional_bool"] = function(isSome, value) {
                 if (isSome === 0) {
                     tmpRetOptionalBool = null;
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSValue.d.ts b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSValue.d.ts
index f4c13c610..85109479e 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSValue.d.ts
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSValue.d.ts
@@ -19,13 +19,13 @@ export interface JSValueHolder extends SwiftHeapObject {
     optionalValue: any | null;
 }
 export type Exports = {
-    JSValueHolder: {
-        new(value: any, optionalValue: any | null): JSValueHolder;
-    }
     roundTripJSValue(value: any): any;
     roundTripOptionalJSValue(value: any | null): any | null;
     roundTripJSValueArray(values: any[]): any[];
     roundTripOptionalJSValueArray(values: any[] | null): any[] | null;
+    JSValueHolder: {
+        new(value: any, optionalValue: any | null): JSValueHolder;
+    },
 }
 export type Imports = {
     jsEchoJSValue(value: any): any;
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSValue.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSValue.js
index 71e66827e..9fe12ff47 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSValue.js
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSValue.js
@@ -31,6 +31,240 @@ export async function createInstantiator(options, swift) {
 
     let _exports = null;
     let bjs = null;
+    const __bjs_arrayCodecCache = new WeakMap();
+    function __bjs_arrayCodec(elementCodec) {
+        let codec = __bjs_arrayCodecCache.get(elementCodec);
+        if (codec !== undefined) {
+            return codec;
+        }
+        codec = {
+            lower(value) {
+                for (let i = 0; i < value.length; i++) {
+                    elementCodec.lower(value[i]);
+                }
+                i32Stack.push(value.length);
+            },
+            lift() {
+                const count = i32Stack.pop();
+                if (count === -1) {
+                    return taStack.pop();
+                }
+                const result = new Array(count);
+                for (let i = count - 1; i >= 0; i--) {
+                    result[i] = elementCodec.lift();
+                }
+                return result;
+            },
+        };
+        __bjs_arrayCodecCache.set(elementCodec, codec);
+        return codec;
+    }
+    const __bjs_optionalCodecCache = new WeakMap();
+    const __bjs_optionalCodecUndefinedOrCache = new WeakMap();
+    function __bjs_optionalCodec(elementCodec, isUndefinedOr = false) {
+        const cache = isUndefinedOr ? __bjs_optionalCodecUndefinedOrCache : __bjs_optionalCodecCache;
+        let codec = cache.get(elementCodec);
+        if (codec !== undefined) {
+            return codec;
+        }
+        codec = {
+            lower(value) {
+                const isSome = isUndefinedOr ? value !== undefined : value != null;
+                if (isSome) {
+                    elementCodec.lower(value);
+                    i32Stack.push(1);
+                } else {
+                    i32Stack.push(0);
+                }
+            },
+            lift() {
+                if (i32Stack.pop() === 0) {
+                    return isUndefinedOr ? undefined : null;
+                }
+                return elementCodec.lift();
+            },
+        };
+        cache.set(elementCodec, codec);
+        return codec;
+    }
+    const __bjs_dictCodecCache = new WeakMap();
+    function __bjs_dictCodec(valueCodec) {
+        let codec = __bjs_dictCodecCache.get(valueCodec);
+        if (codec !== undefined) {
+            return codec;
+        }
+        codec = {
+            lower(value) {
+                const keys = Object.keys(value);
+                for (let i = 0; i < keys.length; i++) {
+                    __bjs_stringCodec.lower(keys[i]);
+                    valueCodec.lower(value[keys[i]]);
+                }
+                i32Stack.push(keys.length);
+            },
+            lift() {
+                const count = i32Stack.pop();
+                const result = {};
+                for (let i = 0; i < count; i++) {
+                    const value = valueCodec.lift();
+                    const key = __bjs_stringCodec.lift();
+                    result[key] = value;
+                }
+                return result;
+            },
+        };
+        __bjs_dictCodecCache.set(valueCodec, codec);
+        return codec;
+    }
+
+    const __bjs_stringCodec = {
+        lower: (v) => {
+            const bytes = textEncoder.encode(v);
+            const id = swift.memory.retain(bytes);
+            i32Stack.push(bytes.length);
+            i32Stack.push(id);
+        },
+        lift: () => {
+            const string = strStack.pop();
+            return string;
+        },
+    };
+    const __bjs_primitiveCodecs = {
+        Bool: {
+            lower: (v) => {
+                i32Stack.push(v ? 1 : 0);
+            },
+            lift: () => {
+                const bool = i32Stack.pop() !== 0;
+                return bool;
+            },
+        },
+        Int: {
+            lower: (v) => {
+                i32Stack.push((v | 0));
+            },
+            lift: () => {
+                const int = i32Stack.pop();
+                return int;
+            },
+        },
+        Int8: {
+            lower: (v) => {
+                i32Stack.push((v | 0));
+            },
+            lift: () => {
+                const int = i32Stack.pop();
+                return int;
+            },
+        },
+        UInt8: {
+            lower: (v) => {
+                i32Stack.push((v | 0));
+            },
+            lift: () => {
+                const int = i32Stack.pop() >>> 0;
+                return int;
+            },
+        },
+        Int16: {
+            lower: (v) => {
+                i32Stack.push((v | 0));
+            },
+            lift: () => {
+                const int = i32Stack.pop();
+                return int;
+            },
+        },
+        UInt16: {
+            lower: (v) => {
+                i32Stack.push((v | 0));
+            },
+            lift: () => {
+                const int = i32Stack.pop() >>> 0;
+                return int;
+            },
+        },
+        Int32: {
+            lower: (v) => {
+                i32Stack.push((v | 0));
+            },
+            lift: () => {
+                const int = i32Stack.pop();
+                return int;
+            },
+        },
+        UInt32: {
+            lower: (v) => {
+                i32Stack.push((v | 0));
+            },
+            lift: () => {
+                const int = i32Stack.pop() >>> 0;
+                return int;
+            },
+        },
+        UInt: {
+            lower: (v) => {
+                i32Stack.push((v | 0));
+            },
+            lift: () => {
+                const int = i32Stack.pop() >>> 0;
+                return int;
+            },
+        },
+        Int64: {
+            lower: (v) => {
+                i64Stack.push(v);
+            },
+            lift: () => {
+                const int = i64Stack.pop();
+                return int;
+            },
+        },
+        UInt64: {
+            lower: (v) => {
+                i64Stack.push(v);
+            },
+            lift: () => {
+                const int = i64Stack.pop();
+                return int;
+            },
+        },
+        Float: {
+            lower: (v) => {
+                f32Stack.push(Math.fround(v));
+            },
+            lift: () => {
+                const f32 = f32Stack.pop();
+                return f32;
+            },
+        },
+        Double: {
+            lower: (v) => {
+                f64Stack.push(v);
+            },
+            lift: () => {
+                const f64 = f64Stack.pop();
+                return f64;
+            },
+        },
+        String: __bjs_stringCodec,
+        JSValue: {
+            lower: (v) => {
+                const [vKind, vPayload1, vPayload2] = __bjs_jsValueLower(v);
+                i32Stack.push(vKind);
+                i32Stack.push(vPayload1);
+                f64Stack.push(vPayload2);
+            },
+            lift: () => {
+                const jsValuePayload2 = f64Stack.pop();
+                const jsValuePayload1 = i32Stack.pop();
+                const jsValueKind = i32Stack.pop();
+                const jsValue = __bjs_jsValueLift(jsValueKind, jsValuePayload1, jsValuePayload2);
+                return jsValue;
+            },
+        },
+    };
+
     function __bjs_jsValueLower(value) {
         let kind;
         let payload1;
@@ -120,6 +354,9 @@ export async function createInstantiator(options, swift) {
         return jsValue;
     }
 
+    const __bjs_codec_Array_JSValue = __bjs_arrayCodec(__bjs_primitiveCodecs.JSValue);
+    const __bjs_codec_Optional_Array_JSValue = __bjs_optionalCodec(__bjs_codec_Array_JSValue);
+
 
     return {
         /**
@@ -135,14 +372,14 @@ export async function createInstantiator(options, swift) {
             bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) {
                 const source = swift.memory.getObject(sourceId);
                 swift.memory.release(sourceId);
-                const bytes = new Uint8Array(memory.buffer, bytesPtr);
+                const bytes = new Uint8Array(memory.buffer, bytesPtr >>> 0);
                 bytes.set(source);
             }
             bjs["swift_js_make_js_string"] = function(ptr, len) {
                 return swift.memory.retain(decodeString(ptr, len));
             }
             bjs["swift_js_init_memory_with_result"] = function(ptr, len) {
-                const target = new Uint8Array(memory.buffer, ptr, len);
+                const target = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0);
                 target.set(tmpRetBytes);
                 tmpRetBytes = undefined;
             }
@@ -196,6 +433,14 @@ export async function createInstantiator(options, swift) {
                 const copy = memory.buffer.slice(ptr, ptr + byteLen);
                 taStack.push(Array.from(new Ctor(copy)));
             }
+            bjs["bjs_core_register_type_handles"] = function() {};
+            const __bjs_promiseSettlers = Symbol("JavaScriptKit.promiseSettlers");
+            bjs["swift_js_make_promise"] = function() {
+                let resolve, reject;
+                const promise = new Promise((res, rej) => { resolve = res; reject = rej; });
+                promise[__bjs_promiseSettlers] = { resolve, reject };
+                return swift.memory.retain(promise);
+            }
             bjs["swift_js_return_optional_bool"] = function(isSome, value) {
                 if (isSome === 0) {
                     tmpRetOptionalBool = null;
@@ -309,29 +554,9 @@ export async function createInstantiator(options, swift) {
             }
             TestModule["bjs_jsEchoJSValueArray"] = function bjs_jsEchoJSValueArray() {
                 try {
-                    const arrayLen = i32Stack.pop();
-                    let arrayResult;
-                    if (arrayLen === -1) {
-                        arrayResult = taStack.pop();
-                    } else {
-                        arrayResult = [];
-                        for (let i = 0; i < arrayLen; i++) {
-                            const jsValuePayload2 = f64Stack.pop();
-                            const jsValuePayload1 = i32Stack.pop();
-                            const jsValueKind = i32Stack.pop();
-                            const jsValue = __bjs_jsValueLift(jsValueKind, jsValuePayload1, jsValuePayload2);
-                            arrayResult.push(jsValue);
-                        }
-                        arrayResult.reverse();
-                    }
+                    const arrayResult = __bjs_codec_Array_JSValue.lift();
                     let ret = imports.jsEchoJSValueArray(arrayResult);
-                    for (const elem of ret) {
-                        const [elemKind, elemPayload1, elemPayload2] = __bjs_jsValueLower(elem);
-                        i32Stack.push(elemKind);
-                        i32Stack.push(elemPayload1);
-                        f64Stack.push(elemPayload2);
-                    }
-                    i32Stack.push(ret.length);
+                    __bjs_codec_Array_JSValue.lower(ret);
                 } catch (error) {
                     setException(error);
                 }
@@ -362,6 +587,7 @@ export async function createInstantiator(options, swift) {
             /// Represents a Swift heap object like a class instance or an actor instance.
             class SwiftHeapObject {
                 static __wrap(pointer, deinit, prototype, identityCache) {
+                    pointer = pointer >>> 0;
                     const makeFresh = (identityMap) => {
                         const obj = Object.create(prototype);
                         const state = { pointer, deinit, hasReleased: false, identityMap };
@@ -519,7 +745,6 @@ export async function createInstantiator(options, swift) {
                 }
             }
             const exports = {
-                JSValueHolder,
                 roundTripJSValue: function bjs_roundTripJSValue(value) {
                     const [valueKind, valuePayload1, valuePayload2] = __bjs_jsValueLower(value);
                     instance.exports.bjs_roundTripJSValue(valueKind, valuePayload1, valuePayload2);
@@ -557,68 +782,18 @@ export async function createInstantiator(options, swift) {
                     return optResult;
                 },
                 roundTripJSValueArray: function bjs_roundTripJSValueArray(values) {
-                    for (const elem of values) {
-                        const [elemKind, elemPayload1, elemPayload2] = __bjs_jsValueLower(elem);
-                        i32Stack.push(elemKind);
-                        i32Stack.push(elemPayload1);
-                        f64Stack.push(elemPayload2);
-                    }
-                    i32Stack.push(values.length);
+                    __bjs_codec_Array_JSValue.lower(values);
                     instance.exports.bjs_roundTripJSValueArray();
-                    const arrayLen = i32Stack.pop();
-                    let arrayResult;
-                    if (arrayLen === -1) {
-                        arrayResult = taStack.pop();
-                    } else {
-                        arrayResult = [];
-                        for (let i = 0; i < arrayLen; i++) {
-                            const jsValuePayload2 = f64Stack.pop();
-                            const jsValuePayload1 = i32Stack.pop();
-                            const jsValueKind = i32Stack.pop();
-                            const jsValue = __bjs_jsValueLift(jsValueKind, jsValuePayload1, jsValuePayload2);
-                            arrayResult.push(jsValue);
-                        }
-                        arrayResult.reverse();
-                    }
+                    const arrayResult = __bjs_codec_Array_JSValue.lift();
                     return arrayResult;
                 },
                 roundTripOptionalJSValueArray: function bjs_roundTripOptionalJSValueArray(values) {
-                    const isSome = values != null;
-                    if (isSome) {
-                        for (const elem of values) {
-                            const [elemKind, elemPayload1, elemPayload2] = __bjs_jsValueLower(elem);
-                            i32Stack.push(elemKind);
-                            i32Stack.push(elemPayload1);
-                            f64Stack.push(elemPayload2);
-                        }
-                        i32Stack.push(values.length);
-                    }
-                    i32Stack.push(+isSome);
+                    __bjs_codec_Optional_Array_JSValue.lower(values);
                     instance.exports.bjs_roundTripOptionalJSValueArray();
-                    const isSome1 = i32Stack.pop();
-                    let optResult;
-                    if (isSome1) {
-                        const arrayLen = i32Stack.pop();
-                        let arrayResult;
-                        if (arrayLen === -1) {
-                            arrayResult = taStack.pop();
-                        } else {
-                            arrayResult = [];
-                            for (let i = 0; i < arrayLen; i++) {
-                                const jsValuePayload2 = f64Stack.pop();
-                                const jsValuePayload1 = i32Stack.pop();
-                                const jsValueKind = i32Stack.pop();
-                                const jsValue = __bjs_jsValueLift(jsValueKind, jsValuePayload1, jsValuePayload2);
-                                arrayResult.push(jsValue);
-                            }
-                            arrayResult.reverse();
-                        }
-                        optResult = arrayResult;
-                    } else {
-                        optResult = null;
-                    }
-                    return optResult;
+                    const optValue = __bjs_codec_Optional_Array_JSValue.lift();
+                    return optValue;
                 },
+                JSValueHolder,
             };
             _exports = exports;
             return exports;
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedGlobal.d.ts b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedGlobal.d.ts
index 7b4cc95e6..c7ff9a39c 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedGlobal.d.ts
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedGlobal.d.ts
@@ -16,10 +16,10 @@ export interface GlobalClass extends SwiftHeapObject {
 }
 export type Exports = {
     GlobalAPI: {
+        globalFunction(): string;
         GlobalClass: {
             new(): GlobalClass;
-        }
-        globalFunction(): string;
+        },
     },
 }
 export type Imports = {
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedGlobal.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedGlobal.js
index 6c3ddb555..5db38dde5 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedGlobal.js
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedGlobal.js
@@ -45,14 +45,14 @@ export async function createInstantiator(options, swift) {
             bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) {
                 const source = swift.memory.getObject(sourceId);
                 swift.memory.release(sourceId);
-                const bytes = new Uint8Array(memory.buffer, bytesPtr);
+                const bytes = new Uint8Array(memory.buffer, bytesPtr >>> 0);
                 bytes.set(source);
             }
             bjs["swift_js_make_js_string"] = function(ptr, len) {
                 return swift.memory.retain(decodeString(ptr, len));
             }
             bjs["swift_js_init_memory_with_result"] = function(ptr, len) {
-                const target = new Uint8Array(memory.buffer, ptr, len);
+                const target = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0);
                 target.set(tmpRetBytes);
                 tmpRetBytes = undefined;
             }
@@ -106,6 +106,14 @@ export async function createInstantiator(options, swift) {
                 const copy = memory.buffer.slice(ptr, ptr + byteLen);
                 taStack.push(Array.from(new Ctor(copy)));
             }
+            bjs["bjs_core_register_type_handles"] = function() {};
+            const __bjs_promiseSettlers = Symbol("JavaScriptKit.promiseSettlers");
+            bjs["swift_js_make_promise"] = function() {
+                let resolve, reject;
+                const promise = new Promise((res, rej) => { resolve = res; reject = rej; });
+                promise[__bjs_promiseSettlers] = { resolve, reject };
+                return swift.memory.retain(promise);
+            }
             bjs["swift_js_return_optional_bool"] = function(isSome, value) {
                 if (isSome === 0) {
                     tmpRetOptionalBool = null;
@@ -230,6 +238,7 @@ export async function createInstantiator(options, swift) {
             /// Represents a Swift heap object like a class instance or an actor instance.
             class SwiftHeapObject {
                 static __wrap(pointer, deinit, prototype, identityCache) {
+                    pointer = pointer >>> 0;
                     const makeFresh = (identityMap) => {
                         const obj = Object.create(prototype);
                         const state = { pointer, deinit, hasReleased: false, identityMap };
@@ -287,13 +296,13 @@ export async function createInstantiator(options, swift) {
             }
             const exports = {
                 GlobalAPI: {
-                    GlobalClass,
                     globalFunction: function bjs_GlobalAPI_globalFunction() {
                         instance.exports.bjs_GlobalAPI_globalFunction();
                         const ret = tmpRetString;
                         tmpRetString = undefined;
                         return ret;
                     },
+                    GlobalClass,
                 },
             };
             _exports = exports;
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedModules.d.ts b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedModules.d.ts
index 88485232e..01a392e91 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedModules.d.ts
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedModules.d.ts
@@ -8,12 +8,12 @@ export {};
 
 declare global {
     namespace GlobalAPI {
+        function globalFunction(): string;
         class GlobalClass {
             constructor();
             greet(): string;
             release(): void;
         }
-        function globalFunction(): string;
     }
 }
 
@@ -32,16 +32,16 @@ export interface PrivateClass extends SwiftHeapObject {
 }
 export type Exports = {
     GlobalAPI: {
+        globalFunction(): string;
         GlobalClass: {
             new(): GlobalClass;
-        }
-        globalFunction(): string;
+        },
     },
     PrivateAPI: {
+        privateFunction(): string;
         PrivateClass: {
             new(): PrivateClass;
-        }
-        privateFunction(): string;
+        },
     },
 }
 export type Imports = {
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedModules.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedModules.js
index 70f1575b4..66818952b 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedModules.js
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedModules.js
@@ -45,14 +45,14 @@ export async function createInstantiator(options, swift) {
             bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) {
                 const source = swift.memory.getObject(sourceId);
                 swift.memory.release(sourceId);
-                const bytes = new Uint8Array(memory.buffer, bytesPtr);
+                const bytes = new Uint8Array(memory.buffer, bytesPtr >>> 0);
                 bytes.set(source);
             }
             bjs["swift_js_make_js_string"] = function(ptr, len) {
                 return swift.memory.retain(decodeString(ptr, len));
             }
             bjs["swift_js_init_memory_with_result"] = function(ptr, len) {
-                const target = new Uint8Array(memory.buffer, ptr, len);
+                const target = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0);
                 target.set(tmpRetBytes);
                 tmpRetBytes = undefined;
             }
@@ -106,6 +106,14 @@ export async function createInstantiator(options, swift) {
                 const copy = memory.buffer.slice(ptr, ptr + byteLen);
                 taStack.push(Array.from(new Ctor(copy)));
             }
+            bjs["bjs_core_register_type_handles"] = function() {};
+            const __bjs_promiseSettlers = Symbol("JavaScriptKit.promiseSettlers");
+            bjs["swift_js_make_promise"] = function() {
+                let resolve, reject;
+                const promise = new Promise((res, rej) => { resolve = res; reject = rej; });
+                promise[__bjs_promiseSettlers] = { resolve, reject };
+                return swift.memory.retain(promise);
+            }
             bjs["swift_js_return_optional_bool"] = function(isSome, value) {
                 if (isSome === 0) {
                     tmpRetOptionalBool = null;
@@ -238,6 +246,7 @@ export async function createInstantiator(options, swift) {
             /// Represents a Swift heap object like a class instance or an actor instance.
             class SwiftHeapObject {
                 static __wrap(pointer, deinit, prototype, identityCache) {
+                    pointer = pointer >>> 0;
                     const makeFresh = (identityMap) => {
                         const obj = Object.create(prototype);
                         const state = { pointer, deinit, hasReleased: false, identityMap };
@@ -314,22 +323,22 @@ export async function createInstantiator(options, swift) {
             }
             const exports = {
                 GlobalAPI: {
-                    GlobalClass,
                     globalFunction: function bjs_GlobalAPI_globalFunction() {
                         instance.exports.bjs_GlobalAPI_globalFunction();
                         const ret = tmpRetString;
                         tmpRetString = undefined;
                         return ret;
                     },
+                    GlobalClass,
                 },
                 PrivateAPI: {
-                    PrivateClass,
                     privateFunction: function bjs_PrivateAPI_privateFunction() {
                         instance.exports.bjs_PrivateAPI_privateFunction();
                         const ret = tmpRetString;
                         tmpRetString = undefined;
                         return ret;
                     },
+                    PrivateClass,
                 },
             };
             _exports = exports;
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedPrivate.d.ts b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedPrivate.d.ts
index 193857072..89aad5c32 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedPrivate.d.ts
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedPrivate.d.ts
@@ -16,10 +16,10 @@ export interface PrivateClass extends SwiftHeapObject {
 }
 export type Exports = {
     PrivateAPI: {
+        privateFunction(): string;
         PrivateClass: {
             new(): PrivateClass;
-        }
-        privateFunction(): string;
+        },
     },
 }
 export type Imports = {
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedPrivate.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedPrivate.js
index 16ec9433c..a732808a6 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedPrivate.js
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedPrivate.js
@@ -45,14 +45,14 @@ export async function createInstantiator(options, swift) {
             bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) {
                 const source = swift.memory.getObject(sourceId);
                 swift.memory.release(sourceId);
-                const bytes = new Uint8Array(memory.buffer, bytesPtr);
+                const bytes = new Uint8Array(memory.buffer, bytesPtr >>> 0);
                 bytes.set(source);
             }
             bjs["swift_js_make_js_string"] = function(ptr, len) {
                 return swift.memory.retain(decodeString(ptr, len));
             }
             bjs["swift_js_init_memory_with_result"] = function(ptr, len) {
-                const target = new Uint8Array(memory.buffer, ptr, len);
+                const target = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0);
                 target.set(tmpRetBytes);
                 tmpRetBytes = undefined;
             }
@@ -106,6 +106,14 @@ export async function createInstantiator(options, swift) {
                 const copy = memory.buffer.slice(ptr, ptr + byteLen);
                 taStack.push(Array.from(new Ctor(copy)));
             }
+            bjs["bjs_core_register_type_handles"] = function() {};
+            const __bjs_promiseSettlers = Symbol("JavaScriptKit.promiseSettlers");
+            bjs["swift_js_make_promise"] = function() {
+                let resolve, reject;
+                const promise = new Promise((res, rej) => { resolve = res; reject = rej; });
+                promise[__bjs_promiseSettlers] = { resolve, reject };
+                return swift.memory.retain(promise);
+            }
             bjs["swift_js_return_optional_bool"] = function(isSome, value) {
                 if (isSome === 0) {
                     tmpRetOptionalBool = null;
@@ -230,6 +238,7 @@ export async function createInstantiator(options, swift) {
             /// Represents a Swift heap object like a class instance or an actor instance.
             class SwiftHeapObject {
                 static __wrap(pointer, deinit, prototype, identityCache) {
+                    pointer = pointer >>> 0;
                     const makeFresh = (identityMap) => {
                         const obj = Object.create(prototype);
                         const state = { pointer, deinit, hasReleased: false, identityMap };
@@ -287,13 +296,13 @@ export async function createInstantiator(options, swift) {
             }
             const exports = {
                 PrivateAPI: {
-                    PrivateClass,
                     privateFunction: function bjs_PrivateAPI_privateFunction() {
                         instance.exports.bjs_PrivateAPI_privateFunction();
                         const ret = tmpRetString;
                         tmpRetString = undefined;
                         return ret;
                     },
+                    PrivateClass,
                 },
             };
             _exports = exports;
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/NamespacedClassSignature.d.ts b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/NamespacedClassSignature.d.ts
new file mode 100644
index 000000000..7c7c4ce3a
--- /dev/null
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/NamespacedClassSignature.d.ts
@@ -0,0 +1,33 @@
+// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit,
+// DO NOT EDIT.
+//
+// To update this file, just rebuild your project or run
+// `swift package bridge-js`.
+
+/// Represents a Swift heap object like a class instance or an actor instance.
+export interface SwiftHeapObject {
+    /// Release the heap object.
+    ///
+    /// Note: Calling this method will release the heap object and it will no longer be accessible.
+    release(): void;
+}
+export interface Bench extends SwiftHeapObject {
+}
+export type Exports = {
+    makeBench(): Bench;
+    refitBench(bench: Bench, transform: (arg0: Bench) => Bench): Bench;
+    Workshop: {
+        Bench: {
+            new(): Bench;
+        },
+    },
+}
+export type Imports = {
+}
+export function createInstantiator(options: {
+    imports: Imports;
+}, swift: any): Promise<{
+    addImports: (importObject: WebAssembly.Imports) => void;
+    setInstance: (instance: WebAssembly.Instance) => void;
+    createExports: (instance: WebAssembly.Instance) => Exports;
+}>;
\ No newline at end of file
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/NamespacedClassSignature.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/NamespacedClassSignature.js
new file mode 100644
index 000000000..082d85f65
--- /dev/null
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/NamespacedClassSignature.js
@@ -0,0 +1,361 @@
+// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit,
+// DO NOT EDIT.
+//
+// To update this file, just rebuild your project or run
+// `swift package bridge-js`.
+
+export async function createInstantiator(options, swift) {
+    let instance;
+    let memory;
+    let setException;
+    let decodeString;
+    const textDecoder = new TextDecoder("utf-8");
+    const textEncoder = new TextEncoder("utf-8");
+    let tmpRetString;
+    let tmpRetBytes;
+    let tmpRetException;
+    let tmpRetOptionalBool;
+    let tmpRetOptionalInt;
+    let tmpRetOptionalFloat;
+    let tmpRetOptionalDouble;
+    let tmpRetOptionalHeapObject;
+    let strStack = [];
+    let i32Stack = [];
+    let i64Stack = [];
+    let f32Stack = [];
+    let f64Stack = [];
+    let ptrStack = [];
+    let taStack = [];
+    const enumHelpers = {};
+    const structHelpers = {};
+
+    let _exports = null;
+    let bjs = null;
+    const swiftClosureRegistry = (typeof FinalizationRegistry === "undefined") ? { register: () => {}, unregister: () => {} } : new FinalizationRegistry((state) => {
+        if (state.unregistered) { return; }
+        instance?.exports?.bjs_release_swift_closure(state.pointer);
+    });
+    const makeClosure = (pointer, file, line, func) => {
+        const state = { pointer, file, line, unregistered: false };
+        const real = (...args) => {
+            if (state.unregistered) {
+                const bytes = new Uint8Array(memory.buffer, state.file >>> 0);
+                let length = 0;
+                while (bytes[length] !== 0) { length += 1; }
+                const fileID = decodeString(state.file, length);
+                throw new Error(`Attempted to call a released JSTypedClosure created at ${fileID}:${state.line}`);
+            }
+            return func(...args);
+        };
+        real.__unregister = () => {
+            if (state.unregistered) { return; }
+            state.unregistered = true;
+            swiftClosureRegistry.unregister(state);
+        };
+        swiftClosureRegistry.register(real, state, state);
+        return swift.memory.retain(real);
+    };
+
+
+    return {
+        /**
+         * @param {WebAssembly.Imports} importObject
+         */
+        addImports: (importObject, importsContext) => {
+            bjs = {};
+            importObject["bjs"] = bjs;
+            bjs["swift_js_return_string"] = function(ptr, len) {
+                tmpRetString = decodeString(ptr, len);
+            }
+            bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) {
+                const source = swift.memory.getObject(sourceId);
+                swift.memory.release(sourceId);
+                const bytes = new Uint8Array(memory.buffer, bytesPtr >>> 0);
+                bytes.set(source);
+            }
+            bjs["swift_js_make_js_string"] = function(ptr, len) {
+                return swift.memory.retain(decodeString(ptr, len));
+            }
+            bjs["swift_js_init_memory_with_result"] = function(ptr, len) {
+                const target = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0);
+                target.set(tmpRetBytes);
+                tmpRetBytes = undefined;
+            }
+            bjs["swift_js_throw"] = function(id) {
+                tmpRetException = swift.memory.retainByRef(id);
+            }
+            bjs["swift_js_retain"] = function(id) {
+                return swift.memory.retainByRef(id);
+            }
+            bjs["swift_js_release"] = function(id) {
+                swift.memory.release(id);
+            }
+            bjs["swift_js_push_i32"] = function(v) {
+                i32Stack.push(v | 0);
+            }
+            bjs["swift_js_push_f32"] = function(v) {
+                f32Stack.push(Math.fround(v));
+            }
+            bjs["swift_js_push_f64"] = function(v) {
+                f64Stack.push(v);
+            }
+            bjs["swift_js_push_string"] = function(ptr, len) {
+                const value = decodeString(ptr, len);
+                strStack.push(value);
+            }
+            bjs["swift_js_pop_i32"] = function() {
+                return i32Stack.pop();
+            }
+            bjs["swift_js_pop_f32"] = function() {
+                return f32Stack.pop();
+            }
+            bjs["swift_js_pop_f64"] = function() {
+                return f64Stack.pop();
+            }
+            bjs["swift_js_push_pointer"] = function(pointer) {
+                ptrStack.push(pointer);
+            }
+            bjs["swift_js_pop_pointer"] = function() {
+                return ptrStack.pop();
+            }
+            bjs["swift_js_push_i64"] = function(v) {
+                i64Stack.push(v);
+            }
+            bjs["swift_js_pop_i64"] = function() {
+                return i64Stack.pop();
+            }
+            const taCtors = [Int8Array, Uint8Array, Int16Array, Uint16Array, Int32Array, Uint32Array, Float32Array, Float64Array];
+            bjs["swift_js_push_typed_array"] = function(kind, ptr, count) {
+                const Ctor = taCtors[kind];
+                const byteLen = count * Ctor.BYTES_PER_ELEMENT;
+                const copy = memory.buffer.slice(ptr, ptr + byteLen);
+                taStack.push(Array.from(new Ctor(copy)));
+            }
+            bjs["bjs_core_register_type_handles"] = function() {};
+            const __bjs_promiseSettlers = Symbol("JavaScriptKit.promiseSettlers");
+            bjs["swift_js_make_promise"] = function() {
+                let resolve, reject;
+                const promise = new Promise((res, rej) => { resolve = res; reject = rej; });
+                promise[__bjs_promiseSettlers] = { resolve, reject };
+                return swift.memory.retain(promise);
+            }
+            bjs["swift_js_return_optional_bool"] = function(isSome, value) {
+                if (isSome === 0) {
+                    tmpRetOptionalBool = null;
+                } else {
+                    tmpRetOptionalBool = value !== 0;
+                }
+            }
+            bjs["swift_js_return_optional_int"] = function(isSome, value) {
+                if (isSome === 0) {
+                    tmpRetOptionalInt = null;
+                } else {
+                    tmpRetOptionalInt = value | 0;
+                }
+            }
+            bjs["swift_js_return_optional_float"] = function(isSome, value) {
+                if (isSome === 0) {
+                    tmpRetOptionalFloat = null;
+                } else {
+                    tmpRetOptionalFloat = Math.fround(value);
+                }
+            }
+            bjs["swift_js_return_optional_double"] = function(isSome, value) {
+                if (isSome === 0) {
+                    tmpRetOptionalDouble = null;
+                } else {
+                    tmpRetOptionalDouble = value;
+                }
+            }
+            bjs["swift_js_return_optional_string"] = function(isSome, ptr, len) {
+                if (isSome === 0) {
+                    tmpRetString = null;
+                } else {
+                    tmpRetString = decodeString(ptr, len);
+                }
+            }
+            bjs["swift_js_return_optional_object"] = function(isSome, objectId) {
+                if (isSome === 0) {
+                    tmpRetString = null;
+                } else {
+                    tmpRetString = swift.memory.getObject(objectId);
+                }
+            }
+            bjs["swift_js_return_optional_heap_object"] = function(isSome, pointer) {
+                if (isSome === 0) {
+                    tmpRetOptionalHeapObject = null;
+                } else {
+                    tmpRetOptionalHeapObject = pointer;
+                }
+            }
+            bjs["swift_js_get_optional_int_presence"] = function() {
+                return tmpRetOptionalInt != null ? 1 : 0;
+            }
+            bjs["swift_js_get_optional_int_value"] = function() {
+                const value = tmpRetOptionalInt;
+                tmpRetOptionalInt = undefined;
+                return value;
+            }
+            bjs["swift_js_get_optional_string"] = function() {
+                const str = tmpRetString;
+                tmpRetString = undefined;
+                if (str == null) {
+                    return -1;
+                } else {
+                    const bytes = textEncoder.encode(str);
+                    tmpRetBytes = bytes;
+                    return bytes.length;
+                }
+            }
+            bjs["swift_js_get_optional_float_presence"] = function() {
+                return tmpRetOptionalFloat != null ? 1 : 0;
+            }
+            bjs["swift_js_get_optional_float_value"] = function() {
+                const value = tmpRetOptionalFloat;
+                tmpRetOptionalFloat = undefined;
+                return value;
+            }
+            bjs["swift_js_get_optional_double_presence"] = function() {
+                return tmpRetOptionalDouble != null ? 1 : 0;
+            }
+            bjs["swift_js_get_optional_double_value"] = function() {
+                const value = tmpRetOptionalDouble;
+                tmpRetOptionalDouble = undefined;
+                return value;
+            }
+            bjs["swift_js_get_optional_heap_object_pointer"] = function() {
+                const pointer = tmpRetOptionalHeapObject;
+                tmpRetOptionalHeapObject = undefined;
+                return pointer || 0;
+            }
+            bjs["swift_js_closure_unregister"] = function(funcRef) {}
+            bjs["swift_js_closure_unregister"] = function(funcRef) {
+                const func = swift.memory.getObject(funcRef);
+                func.__unregister();
+            }
+            bjs["invoke_js_callback_TestModule_10TestModule8Workshop5BenchC_8Workshop5BenchC"] = function(callbackId, param0) {
+                try {
+                    const callback = swift.memory.getObject(callbackId);
+                    let ret = callback(_exports.Workshop.Bench.__construct(param0));
+                    return ret.pointer;
+                } catch (error) {
+                    setException(error);
+                    return 0
+                }
+            }
+            bjs["make_swift_closure_TestModule_10TestModule8Workshop5BenchC_8Workshop5BenchC"] = function(boxPtr, file, line) {
+                const lower_closure_TestModule_10TestModule8Workshop5BenchC_8Workshop5BenchC = function(param0) {
+                    const ret = instance.exports.invoke_swift_closure_TestModule_10TestModule8Workshop5BenchC_8Workshop5BenchC(boxPtr, param0.pointer);
+                    if (tmpRetException) {
+                        const error = swift.memory.getObject(tmpRetException);
+                        swift.memory.release(tmpRetException);
+                        tmpRetException = undefined;
+                        throw error;
+                    }
+                    return _exports.Workshop.Bench.__construct(ret);
+                };
+                return makeClosure(boxPtr, file, line, lower_closure_TestModule_10TestModule8Workshop5BenchC_8Workshop5BenchC);
+            }
+            // Wrapper functions for module: TestModule
+            if (!importObject["TestModule"]) {
+                importObject["TestModule"] = {};
+            }
+            importObject["TestModule"]["bjs_Workshop_Bench_wrap"] = function(pointer) {
+                const obj = _exports.Workshop.Bench.__construct(pointer);
+                return swift.memory.retain(obj);
+            };
+        },
+        setInstance: (i) => {
+            instance = i;
+            memory = instance.exports.memory;
+
+            decodeString = (ptr, len) => { const bytes = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); return textDecoder.decode(bytes); }
+
+            setException = (error) => {
+                instance.exports._swift_js_exception.value = swift.memory.retain(error)
+            }
+        },
+        /** @param {WebAssembly.Instance} instance */
+        createExports: (instance) => {
+            const js = swift.memory.heap;
+            const swiftHeapObjectFinalizationRegistry = (typeof FinalizationRegistry === "undefined") ? { register: () => {}, unregister: () => {} } : new FinalizationRegistry((state) => {
+                if (state.hasReleased) {
+                    return;
+                }
+                state.hasReleased = true;
+                state.identityMap?.delete(state.pointer);
+                state.deinit(state.pointer);
+            });
+
+            /// Represents a Swift heap object like a class instance or an actor instance.
+            class SwiftHeapObject {
+                static __wrap(pointer, deinit, prototype, identityCache) {
+                    pointer = pointer >>> 0;
+                    const makeFresh = (identityMap) => {
+                        const obj = Object.create(prototype);
+                        const state = { pointer, deinit, hasReleased: false, identityMap };
+                        obj.pointer = pointer;
+                        obj.__swiftHeapObjectState = state;
+                        swiftHeapObjectFinalizationRegistry.register(obj, state, state);
+                        if (identityMap) {
+                            identityMap.set(pointer, new WeakRef(obj));
+                        }
+                        return obj;
+                    };
+
+                    if (!identityCache) {
+                        return makeFresh(null);
+                    }
+
+                    const cached = identityCache.get(pointer)?.deref();
+                    if (cached && !cached.__swiftHeapObjectState.hasReleased) {
+                        deinit(pointer);
+                        return cached;
+                    }
+                    if (identityCache.has(pointer)) {
+                        identityCache.delete(pointer);
+                    }
+
+                    return makeFresh(identityCache);
+                }
+
+                release() {
+                    const state = this.__swiftHeapObjectState;
+                    if (state.hasReleased) {
+                        return;
+                    }
+                    state.hasReleased = true;
+                    swiftHeapObjectFinalizationRegistry.unregister(state);
+                    state.identityMap?.delete(state.pointer);
+                    state.deinit(state.pointer);
+                }
+            }
+            class Bench extends SwiftHeapObject {
+                static __construct(ptr) {
+                    return SwiftHeapObject.__wrap(ptr, instance.exports.bjs_Workshop_Bench_deinit, Bench.prototype, null);
+                }
+
+                constructor() {
+                    const ret = instance.exports.bjs_Workshop_Bench_init();
+                    return Bench.__construct(ret);
+                }
+            }
+            const exports = {
+                makeBench: function bjs_makeBench() {
+                    const ret = instance.exports.bjs_makeBench();
+                    return Bench.__construct(ret);
+                },
+                refitBench: function bjs_refitBench(bench, transform) {
+                    const callbackId = swift.memory.retain(transform);
+                    const ret = instance.exports.bjs_refitBench(bench.pointer, callbackId);
+                    return Bench.__construct(ret);
+                },
+                Workshop: {
+                    Bench,
+                },
+            };
+            _exports = exports;
+            return exports;
+        },
+    }
+}
\ No newline at end of file
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.Global.d.ts b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.Global.d.ts
index 1353220bc..ac9ea13c4 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.Global.d.ts
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.Global.d.ts
@@ -17,6 +17,10 @@ declare global {
     }
     namespace MyModule {
         namespace Utils {
+            /**
+             * A namespaced free function.
+             * @returns A fixed namespaced string.
+             */
             function namespacedFunction(): string;
         }
     }
@@ -31,10 +35,18 @@ declare global {
     }
     namespace __Swift {
         namespace Foundation {
+            /**
+             * A greeter living in a namespace.
+             */
             class Greeter {
                 constructor(name: string);
+                /**
+                 * Produces a greeting for the configured name.
+                 * @returns The greeting message.
+                 */
                 greet(): string;
-                makeDefault(): Greeter;
+                static makeDefault(): Greeter;
+                static readonly defaultGreeting: string;
                 release(): void;
             }
             class UUID {
@@ -52,7 +64,14 @@ export interface SwiftHeapObject {
     /// Note: Calling this method will release the heap object and it will no longer be accessible.
     release(): void;
 }
+/**
+ * A greeter living in a namespace.
+ */
 export interface Greeter extends SwiftHeapObject {
+    /**
+     * Produces a greeting for the configured name.
+     * @returns The greeting message.
+     */
     greet(): string;
 }
 export interface Converter extends SwiftHeapObject {
@@ -70,10 +89,14 @@ export type Exports = {
     Collections: {
         Container: {
             new(): Container;
-        }
+        },
     },
     MyModule: {
         Utils: {
+            /**
+             * A namespaced free function.
+             * @returns A fixed namespaced string.
+             */
             namespacedFunction(): string;
         },
     },
@@ -81,7 +104,7 @@ export type Exports = {
         Converters: {
             Converter: {
                 new(): Converter;
-            }
+            },
         },
     },
     __Swift: {
@@ -90,9 +113,9 @@ export type Exports = {
                 new(name: string): Greeter;
                 makeDefault(): Greeter;
                 readonly defaultGreeting: string;
-            }
+            },
             UUID: {
-            }
+            },
         },
     },
 }
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.Global.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.Global.js
index d698857d3..ea49220de 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.Global.js
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.Global.js
@@ -31,6 +31,341 @@ export async function createInstantiator(options, swift) {
 
     let _exports = null;
     let bjs = null;
+    const __bjs_arrayCodecCache = new WeakMap();
+    function __bjs_arrayCodec(elementCodec) {
+        let codec = __bjs_arrayCodecCache.get(elementCodec);
+        if (codec !== undefined) {
+            return codec;
+        }
+        codec = {
+            lower(value) {
+                for (let i = 0; i < value.length; i++) {
+                    elementCodec.lower(value[i]);
+                }
+                i32Stack.push(value.length);
+            },
+            lift() {
+                const count = i32Stack.pop();
+                if (count === -1) {
+                    return taStack.pop();
+                }
+                const result = new Array(count);
+                for (let i = count - 1; i >= 0; i--) {
+                    result[i] = elementCodec.lift();
+                }
+                return result;
+            },
+        };
+        __bjs_arrayCodecCache.set(elementCodec, codec);
+        return codec;
+    }
+    const __bjs_optionalCodecCache = new WeakMap();
+    const __bjs_optionalCodecUndefinedOrCache = new WeakMap();
+    function __bjs_optionalCodec(elementCodec, isUndefinedOr = false) {
+        const cache = isUndefinedOr ? __bjs_optionalCodecUndefinedOrCache : __bjs_optionalCodecCache;
+        let codec = cache.get(elementCodec);
+        if (codec !== undefined) {
+            return codec;
+        }
+        codec = {
+            lower(value) {
+                const isSome = isUndefinedOr ? value !== undefined : value != null;
+                if (isSome) {
+                    elementCodec.lower(value);
+                    i32Stack.push(1);
+                } else {
+                    i32Stack.push(0);
+                }
+            },
+            lift() {
+                if (i32Stack.pop() === 0) {
+                    return isUndefinedOr ? undefined : null;
+                }
+                return elementCodec.lift();
+            },
+        };
+        cache.set(elementCodec, codec);
+        return codec;
+    }
+    const __bjs_dictCodecCache = new WeakMap();
+    function __bjs_dictCodec(valueCodec) {
+        let codec = __bjs_dictCodecCache.get(valueCodec);
+        if (codec !== undefined) {
+            return codec;
+        }
+        codec = {
+            lower(value) {
+                const keys = Object.keys(value);
+                for (let i = 0; i < keys.length; i++) {
+                    __bjs_stringCodec.lower(keys[i]);
+                    valueCodec.lower(value[keys[i]]);
+                }
+                i32Stack.push(keys.length);
+            },
+            lift() {
+                const count = i32Stack.pop();
+                const result = {};
+                for (let i = 0; i < count; i++) {
+                    const value = valueCodec.lift();
+                    const key = __bjs_stringCodec.lift();
+                    result[key] = value;
+                }
+                return result;
+            },
+        };
+        __bjs_dictCodecCache.set(valueCodec, codec);
+        return codec;
+    }
+
+    const __bjs_stringCodec = {
+        lower: (v) => {
+            const bytes = textEncoder.encode(v);
+            const id = swift.memory.retain(bytes);
+            i32Stack.push(bytes.length);
+            i32Stack.push(id);
+        },
+        lift: () => {
+            const string = strStack.pop();
+            return string;
+        },
+    };
+    const __bjs_primitiveCodecs = {
+        Bool: {
+            lower: (v) => {
+                i32Stack.push(v ? 1 : 0);
+            },
+            lift: () => {
+                const bool = i32Stack.pop() !== 0;
+                return bool;
+            },
+        },
+        Int: {
+            lower: (v) => {
+                i32Stack.push((v | 0));
+            },
+            lift: () => {
+                const int = i32Stack.pop();
+                return int;
+            },
+        },
+        Int8: {
+            lower: (v) => {
+                i32Stack.push((v | 0));
+            },
+            lift: () => {
+                const int = i32Stack.pop();
+                return int;
+            },
+        },
+        UInt8: {
+            lower: (v) => {
+                i32Stack.push((v | 0));
+            },
+            lift: () => {
+                const int = i32Stack.pop() >>> 0;
+                return int;
+            },
+        },
+        Int16: {
+            lower: (v) => {
+                i32Stack.push((v | 0));
+            },
+            lift: () => {
+                const int = i32Stack.pop();
+                return int;
+            },
+        },
+        UInt16: {
+            lower: (v) => {
+                i32Stack.push((v | 0));
+            },
+            lift: () => {
+                const int = i32Stack.pop() >>> 0;
+                return int;
+            },
+        },
+        Int32: {
+            lower: (v) => {
+                i32Stack.push((v | 0));
+            },
+            lift: () => {
+                const int = i32Stack.pop();
+                return int;
+            },
+        },
+        UInt32: {
+            lower: (v) => {
+                i32Stack.push((v | 0));
+            },
+            lift: () => {
+                const int = i32Stack.pop() >>> 0;
+                return int;
+            },
+        },
+        UInt: {
+            lower: (v) => {
+                i32Stack.push((v | 0));
+            },
+            lift: () => {
+                const int = i32Stack.pop() >>> 0;
+                return int;
+            },
+        },
+        Int64: {
+            lower: (v) => {
+                i64Stack.push(v);
+            },
+            lift: () => {
+                const int = i64Stack.pop();
+                return int;
+            },
+        },
+        UInt64: {
+            lower: (v) => {
+                i64Stack.push(v);
+            },
+            lift: () => {
+                const int = i64Stack.pop();
+                return int;
+            },
+        },
+        Float: {
+            lower: (v) => {
+                f32Stack.push(Math.fround(v));
+            },
+            lift: () => {
+                const f32 = f32Stack.pop();
+                return f32;
+            },
+        },
+        Double: {
+            lower: (v) => {
+                f64Stack.push(v);
+            },
+            lift: () => {
+                const f64 = f64Stack.pop();
+                return f64;
+            },
+        },
+        String: __bjs_stringCodec,
+        JSValue: {
+            lower: (v) => {
+                const [vKind, vPayload1, vPayload2] = __bjs_jsValueLower(v);
+                i32Stack.push(vKind);
+                i32Stack.push(vPayload1);
+                f64Stack.push(vPayload2);
+            },
+            lift: () => {
+                const jsValuePayload2 = f64Stack.pop();
+                const jsValuePayload1 = i32Stack.pop();
+                const jsValueKind = i32Stack.pop();
+                const jsValue = __bjs_jsValueLift(jsValueKind, jsValuePayload1, jsValuePayload2);
+                return jsValue;
+            },
+        },
+    };
+
+    function __bjs_jsValueLower(value) {
+        let kind;
+        let payload1;
+        let payload2;
+        if (value === null) {
+            kind = 4;
+            payload1 = 0;
+            payload2 = 0;
+        } else {
+            switch (typeof value) {
+                case "boolean":
+                    kind = 0;
+                    payload1 = value ? 1 : 0;
+                    payload2 = 0;
+                    break;
+                case "number":
+                    kind = 2;
+                    payload1 = 0;
+                    payload2 = value;
+                    break;
+                case "string":
+                    kind = 1;
+                    payload1 = swift.memory.retain(value);
+                    payload2 = 0;
+                    break;
+                case "undefined":
+                    kind = 5;
+                    payload1 = 0;
+                    payload2 = 0;
+                    break;
+                case "object":
+                    kind = 3;
+                    payload1 = swift.memory.retain(value);
+                    payload2 = 0;
+                    break;
+                case "function":
+                    kind = 3;
+                    payload1 = swift.memory.retain(value);
+                    payload2 = 0;
+                    break;
+                case "symbol":
+                    kind = 7;
+                    payload1 = swift.memory.retain(value);
+                    payload2 = 0;
+                    break;
+                case "bigint":
+                    kind = 8;
+                    payload1 = swift.memory.retain(value);
+                    payload2 = 0;
+                    break;
+                default:
+                    throw new TypeError("Unsupported JSValue type");
+            }
+        }
+        return [kind, payload1, payload2];
+    }
+    function __bjs_jsValueLift(kind, payload1, payload2) {
+        let jsValue;
+        switch (kind) {
+            case 0:
+                jsValue = payload1 !== 0;
+                break;
+            case 1:
+                jsValue = swift.memory.getObject(payload1);
+                break;
+            case 2:
+                jsValue = payload2;
+                break;
+            case 3:
+                jsValue = swift.memory.getObject(payload1);
+                break;
+            case 4:
+                jsValue = null;
+                break;
+            case 5:
+                jsValue = undefined;
+                break;
+            case 7:
+                jsValue = swift.memory.getObject(payload1);
+                break;
+            case 8:
+                jsValue = swift.memory.getObject(payload1);
+                break;
+            default:
+                throw new TypeError("Unsupported JSValue kind " + kind);
+        }
+        return jsValue;
+    }
+
+    const __bjs_codec_M10TestModuleT7Greeter = {
+        lower: (v) => {
+            ptrStack.push(v.pointer);
+        },
+        lift: () => {
+            const ptr = ptrStack.pop();
+            const obj = _exports.__Swift.Foundation.Greeter.__construct(ptr);
+            return obj;
+        },
+    };
+    const __bjs_codec_Array_M10TestModuleT7Greeter = __bjs_arrayCodec(__bjs_codec_M10TestModuleT7Greeter);
+
 
     return {
         /**
@@ -45,14 +380,14 @@ export async function createInstantiator(options, swift) {
             bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) {
                 const source = swift.memory.getObject(sourceId);
                 swift.memory.release(sourceId);
-                const bytes = new Uint8Array(memory.buffer, bytesPtr);
+                const bytes = new Uint8Array(memory.buffer, bytesPtr >>> 0);
                 bytes.set(source);
             }
             bjs["swift_js_make_js_string"] = function(ptr, len) {
                 return swift.memory.retain(decodeString(ptr, len));
             }
             bjs["swift_js_init_memory_with_result"] = function(ptr, len) {
-                const target = new Uint8Array(memory.buffer, ptr, len);
+                const target = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0);
                 target.set(tmpRetBytes);
                 tmpRetBytes = undefined;
             }
@@ -106,6 +441,14 @@ export async function createInstantiator(options, swift) {
                 const copy = memory.buffer.slice(ptr, ptr + byteLen);
                 taStack.push(Array.from(new Ctor(copy)));
             }
+            bjs["bjs_core_register_type_handles"] = function() {};
+            const __bjs_promiseSettlers = Symbol("JavaScriptKit.promiseSettlers");
+            bjs["swift_js_make_promise"] = function() {
+                let resolve, reject;
+                const promise = new Promise((res, rej) => { resolve = res; reject = rej; });
+                promise[__bjs_promiseSettlers] = { resolve, reject };
+                return swift.memory.retain(promise);
+            }
             bjs["swift_js_return_optional_bool"] = function(isSome, value) {
                 if (isSome === 0) {
                     tmpRetOptionalBool = null;
@@ -242,6 +585,7 @@ export async function createInstantiator(options, swift) {
             /// Represents a Swift heap object like a class instance or an actor instance.
             class SwiftHeapObject {
                 static __wrap(pointer, deinit, prototype, identityCache) {
+                    pointer = pointer >>> 0;
                     const makeFresh = (identityMap) => {
                         const obj = Object.create(prototype);
                         const state = { pointer, deinit, hasReleased: false, identityMap };
@@ -348,19 +692,7 @@ export async function createInstantiator(options, swift) {
                 }
                 getItems() {
                     instance.exports.bjs_Collections_Container_getItems(this.pointer);
-                    const arrayLen = i32Stack.pop();
-                    let arrayResult;
-                    if (arrayLen === -1) {
-                        arrayResult = taStack.pop();
-                    } else {
-                        arrayResult = [];
-                        for (let i = 0; i < arrayLen; i++) {
-                            const ptr = ptrStack.pop();
-                            const obj = Greeter.__construct(ptr);
-                            arrayResult.push(obj);
-                        }
-                        arrayResult.reverse();
-                    }
+                    const arrayResult = __bjs_codec_Array_M10TestModuleT7Greeter.lift();
                     return arrayResult;
                 }
                 addItem(item) {
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.d.ts b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.d.ts
index 6b2d65cd8..debd3ffcf 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.d.ts
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.d.ts
@@ -11,7 +11,14 @@ export interface SwiftHeapObject {
     /// Note: Calling this method will release the heap object and it will no longer be accessible.
     release(): void;
 }
+/**
+ * A greeter living in a namespace.
+ */
 export interface Greeter extends SwiftHeapObject {
+    /**
+     * Produces a greeting for the configured name.
+     * @returns The greeting message.
+     */
     greet(): string;
 }
 export interface Converter extends SwiftHeapObject {
@@ -29,10 +36,14 @@ export type Exports = {
     Collections: {
         Container: {
             new(): Container;
-        }
+        },
     },
     MyModule: {
         Utils: {
+            /**
+             * A namespaced free function.
+             * @returns A fixed namespaced string.
+             */
             namespacedFunction(): string;
         },
     },
@@ -40,7 +51,7 @@ export type Exports = {
         Converters: {
             Converter: {
                 new(): Converter;
-            }
+            },
         },
     },
     __Swift: {
@@ -49,9 +60,9 @@ export type Exports = {
                 new(name: string): Greeter;
                 makeDefault(): Greeter;
                 readonly defaultGreeting: string;
-            }
+            },
             UUID: {
-            }
+            },
         },
     },
 }
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.js
index 92b8f5dae..25bd44d05 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.js
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.js
@@ -31,6 +31,341 @@ export async function createInstantiator(options, swift) {
 
     let _exports = null;
     let bjs = null;
+    const __bjs_arrayCodecCache = new WeakMap();
+    function __bjs_arrayCodec(elementCodec) {
+        let codec = __bjs_arrayCodecCache.get(elementCodec);
+        if (codec !== undefined) {
+            return codec;
+        }
+        codec = {
+            lower(value) {
+                for (let i = 0; i < value.length; i++) {
+                    elementCodec.lower(value[i]);
+                }
+                i32Stack.push(value.length);
+            },
+            lift() {
+                const count = i32Stack.pop();
+                if (count === -1) {
+                    return taStack.pop();
+                }
+                const result = new Array(count);
+                for (let i = count - 1; i >= 0; i--) {
+                    result[i] = elementCodec.lift();
+                }
+                return result;
+            },
+        };
+        __bjs_arrayCodecCache.set(elementCodec, codec);
+        return codec;
+    }
+    const __bjs_optionalCodecCache = new WeakMap();
+    const __bjs_optionalCodecUndefinedOrCache = new WeakMap();
+    function __bjs_optionalCodec(elementCodec, isUndefinedOr = false) {
+        const cache = isUndefinedOr ? __bjs_optionalCodecUndefinedOrCache : __bjs_optionalCodecCache;
+        let codec = cache.get(elementCodec);
+        if (codec !== undefined) {
+            return codec;
+        }
+        codec = {
+            lower(value) {
+                const isSome = isUndefinedOr ? value !== undefined : value != null;
+                if (isSome) {
+                    elementCodec.lower(value);
+                    i32Stack.push(1);
+                } else {
+                    i32Stack.push(0);
+                }
+            },
+            lift() {
+                if (i32Stack.pop() === 0) {
+                    return isUndefinedOr ? undefined : null;
+                }
+                return elementCodec.lift();
+            },
+        };
+        cache.set(elementCodec, codec);
+        return codec;
+    }
+    const __bjs_dictCodecCache = new WeakMap();
+    function __bjs_dictCodec(valueCodec) {
+        let codec = __bjs_dictCodecCache.get(valueCodec);
+        if (codec !== undefined) {
+            return codec;
+        }
+        codec = {
+            lower(value) {
+                const keys = Object.keys(value);
+                for (let i = 0; i < keys.length; i++) {
+                    __bjs_stringCodec.lower(keys[i]);
+                    valueCodec.lower(value[keys[i]]);
+                }
+                i32Stack.push(keys.length);
+            },
+            lift() {
+                const count = i32Stack.pop();
+                const result = {};
+                for (let i = 0; i < count; i++) {
+                    const value = valueCodec.lift();
+                    const key = __bjs_stringCodec.lift();
+                    result[key] = value;
+                }
+                return result;
+            },
+        };
+        __bjs_dictCodecCache.set(valueCodec, codec);
+        return codec;
+    }
+
+    const __bjs_stringCodec = {
+        lower: (v) => {
+            const bytes = textEncoder.encode(v);
+            const id = swift.memory.retain(bytes);
+            i32Stack.push(bytes.length);
+            i32Stack.push(id);
+        },
+        lift: () => {
+            const string = strStack.pop();
+            return string;
+        },
+    };
+    const __bjs_primitiveCodecs = {
+        Bool: {
+            lower: (v) => {
+                i32Stack.push(v ? 1 : 0);
+            },
+            lift: () => {
+                const bool = i32Stack.pop() !== 0;
+                return bool;
+            },
+        },
+        Int: {
+            lower: (v) => {
+                i32Stack.push((v | 0));
+            },
+            lift: () => {
+                const int = i32Stack.pop();
+                return int;
+            },
+        },
+        Int8: {
+            lower: (v) => {
+                i32Stack.push((v | 0));
+            },
+            lift: () => {
+                const int = i32Stack.pop();
+                return int;
+            },
+        },
+        UInt8: {
+            lower: (v) => {
+                i32Stack.push((v | 0));
+            },
+            lift: () => {
+                const int = i32Stack.pop() >>> 0;
+                return int;
+            },
+        },
+        Int16: {
+            lower: (v) => {
+                i32Stack.push((v | 0));
+            },
+            lift: () => {
+                const int = i32Stack.pop();
+                return int;
+            },
+        },
+        UInt16: {
+            lower: (v) => {
+                i32Stack.push((v | 0));
+            },
+            lift: () => {
+                const int = i32Stack.pop() >>> 0;
+                return int;
+            },
+        },
+        Int32: {
+            lower: (v) => {
+                i32Stack.push((v | 0));
+            },
+            lift: () => {
+                const int = i32Stack.pop();
+                return int;
+            },
+        },
+        UInt32: {
+            lower: (v) => {
+                i32Stack.push((v | 0));
+            },
+            lift: () => {
+                const int = i32Stack.pop() >>> 0;
+                return int;
+            },
+        },
+        UInt: {
+            lower: (v) => {
+                i32Stack.push((v | 0));
+            },
+            lift: () => {
+                const int = i32Stack.pop() >>> 0;
+                return int;
+            },
+        },
+        Int64: {
+            lower: (v) => {
+                i64Stack.push(v);
+            },
+            lift: () => {
+                const int = i64Stack.pop();
+                return int;
+            },
+        },
+        UInt64: {
+            lower: (v) => {
+                i64Stack.push(v);
+            },
+            lift: () => {
+                const int = i64Stack.pop();
+                return int;
+            },
+        },
+        Float: {
+            lower: (v) => {
+                f32Stack.push(Math.fround(v));
+            },
+            lift: () => {
+                const f32 = f32Stack.pop();
+                return f32;
+            },
+        },
+        Double: {
+            lower: (v) => {
+                f64Stack.push(v);
+            },
+            lift: () => {
+                const f64 = f64Stack.pop();
+                return f64;
+            },
+        },
+        String: __bjs_stringCodec,
+        JSValue: {
+            lower: (v) => {
+                const [vKind, vPayload1, vPayload2] = __bjs_jsValueLower(v);
+                i32Stack.push(vKind);
+                i32Stack.push(vPayload1);
+                f64Stack.push(vPayload2);
+            },
+            lift: () => {
+                const jsValuePayload2 = f64Stack.pop();
+                const jsValuePayload1 = i32Stack.pop();
+                const jsValueKind = i32Stack.pop();
+                const jsValue = __bjs_jsValueLift(jsValueKind, jsValuePayload1, jsValuePayload2);
+                return jsValue;
+            },
+        },
+    };
+
+    function __bjs_jsValueLower(value) {
+        let kind;
+        let payload1;
+        let payload2;
+        if (value === null) {
+            kind = 4;
+            payload1 = 0;
+            payload2 = 0;
+        } else {
+            switch (typeof value) {
+                case "boolean":
+                    kind = 0;
+                    payload1 = value ? 1 : 0;
+                    payload2 = 0;
+                    break;
+                case "number":
+                    kind = 2;
+                    payload1 = 0;
+                    payload2 = value;
+                    break;
+                case "string":
+                    kind = 1;
+                    payload1 = swift.memory.retain(value);
+                    payload2 = 0;
+                    break;
+                case "undefined":
+                    kind = 5;
+                    payload1 = 0;
+                    payload2 = 0;
+                    break;
+                case "object":
+                    kind = 3;
+                    payload1 = swift.memory.retain(value);
+                    payload2 = 0;
+                    break;
+                case "function":
+                    kind = 3;
+                    payload1 = swift.memory.retain(value);
+                    payload2 = 0;
+                    break;
+                case "symbol":
+                    kind = 7;
+                    payload1 = swift.memory.retain(value);
+                    payload2 = 0;
+                    break;
+                case "bigint":
+                    kind = 8;
+                    payload1 = swift.memory.retain(value);
+                    payload2 = 0;
+                    break;
+                default:
+                    throw new TypeError("Unsupported JSValue type");
+            }
+        }
+        return [kind, payload1, payload2];
+    }
+    function __bjs_jsValueLift(kind, payload1, payload2) {
+        let jsValue;
+        switch (kind) {
+            case 0:
+                jsValue = payload1 !== 0;
+                break;
+            case 1:
+                jsValue = swift.memory.getObject(payload1);
+                break;
+            case 2:
+                jsValue = payload2;
+                break;
+            case 3:
+                jsValue = swift.memory.getObject(payload1);
+                break;
+            case 4:
+                jsValue = null;
+                break;
+            case 5:
+                jsValue = undefined;
+                break;
+            case 7:
+                jsValue = swift.memory.getObject(payload1);
+                break;
+            case 8:
+                jsValue = swift.memory.getObject(payload1);
+                break;
+            default:
+                throw new TypeError("Unsupported JSValue kind " + kind);
+        }
+        return jsValue;
+    }
+
+    const __bjs_codec_M10TestModuleT7Greeter = {
+        lower: (v) => {
+            ptrStack.push(v.pointer);
+        },
+        lift: () => {
+            const ptr = ptrStack.pop();
+            const obj = _exports.__Swift.Foundation.Greeter.__construct(ptr);
+            return obj;
+        },
+    };
+    const __bjs_codec_Array_M10TestModuleT7Greeter = __bjs_arrayCodec(__bjs_codec_M10TestModuleT7Greeter);
+
 
     return {
         /**
@@ -45,14 +380,14 @@ export async function createInstantiator(options, swift) {
             bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) {
                 const source = swift.memory.getObject(sourceId);
                 swift.memory.release(sourceId);
-                const bytes = new Uint8Array(memory.buffer, bytesPtr);
+                const bytes = new Uint8Array(memory.buffer, bytesPtr >>> 0);
                 bytes.set(source);
             }
             bjs["swift_js_make_js_string"] = function(ptr, len) {
                 return swift.memory.retain(decodeString(ptr, len));
             }
             bjs["swift_js_init_memory_with_result"] = function(ptr, len) {
-                const target = new Uint8Array(memory.buffer, ptr, len);
+                const target = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0);
                 target.set(tmpRetBytes);
                 tmpRetBytes = undefined;
             }
@@ -106,6 +441,14 @@ export async function createInstantiator(options, swift) {
                 const copy = memory.buffer.slice(ptr, ptr + byteLen);
                 taStack.push(Array.from(new Ctor(copy)));
             }
+            bjs["bjs_core_register_type_handles"] = function() {};
+            const __bjs_promiseSettlers = Symbol("JavaScriptKit.promiseSettlers");
+            bjs["swift_js_make_promise"] = function() {
+                let resolve, reject;
+                const promise = new Promise((res, rej) => { resolve = res; reject = rej; });
+                promise[__bjs_promiseSettlers] = { resolve, reject };
+                return swift.memory.retain(promise);
+            }
             bjs["swift_js_return_optional_bool"] = function(isSome, value) {
                 if (isSome === 0) {
                     tmpRetOptionalBool = null;
@@ -242,6 +585,7 @@ export async function createInstantiator(options, swift) {
             /// Represents a Swift heap object like a class instance or an actor instance.
             class SwiftHeapObject {
                 static __wrap(pointer, deinit, prototype, identityCache) {
+                    pointer = pointer >>> 0;
                     const makeFresh = (identityMap) => {
                         const obj = Object.create(prototype);
                         const state = { pointer, deinit, hasReleased: false, identityMap };
@@ -348,19 +692,7 @@ export async function createInstantiator(options, swift) {
                 }
                 getItems() {
                     instance.exports.bjs_Collections_Container_getItems(this.pointer);
-                    const arrayLen = i32Stack.pop();
-                    let arrayResult;
-                    if (arrayLen === -1) {
-                        arrayResult = taStack.pop();
-                    } else {
-                        arrayResult = [];
-                        for (let i = 0; i < arrayLen; i++) {
-                            const ptr = ptrStack.pop();
-                            const obj = Greeter.__construct(ptr);
-                            arrayResult.push(obj);
-                        }
-                        arrayResult.reverse();
-                    }
+                    const arrayResult = __bjs_codec_Array_M10TestModuleT7Greeter.lift();
                     return arrayResult;
                 }
                 addItem(item) {
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/NestedType.d.ts b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/NestedType.d.ts
index 4e966661e..c418ed8a5 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/NestedType.d.ts
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/NestedType.d.ts
@@ -30,10 +30,10 @@ export interface Player extends SwiftHeapObject {
     getTag(): string;
 }
 export type Exports = {
-    User: {
-    }
     Player: {
-    }
+    },
+    User: {
+    },
 }
 export type Imports = {
 }
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/NestedType.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/NestedType.js
index 33b4e60c1..f57c4007b 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/NestedType.js
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/NestedType.js
@@ -31,7 +31,7 @@ export async function createInstantiator(options, swift) {
 
     let _exports = null;
     let bjs = null;
-    const __bjs_createUser_StatsHelpers = () => ({
+    const __bjs_createStructHelpers_M10TestModuleT4UserT5Stats = () => ({
         lower: (value) => {
             i32Stack.push((value.health | 0));
             f64Stack.push(value.score);
@@ -42,7 +42,7 @@ export async function createInstantiator(options, swift) {
             return { health: int, score: f64 };
         }
     });
-    const __bjs_createPlayer_StatsHelpers = () => ({
+    const __bjs_createStructHelpers_M10TestModuleT6PlayerT5Stats = () => ({
         lower: (value) => {
             i32Stack.push((value.level | 0));
             const bytes = textEncoder.encode(value.rating);
@@ -70,14 +70,14 @@ export async function createInstantiator(options, swift) {
             bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) {
                 const source = swift.memory.getObject(sourceId);
                 swift.memory.release(sourceId);
-                const bytes = new Uint8Array(memory.buffer, bytesPtr);
+                const bytes = new Uint8Array(memory.buffer, bytesPtr >>> 0);
                 bytes.set(source);
             }
             bjs["swift_js_make_js_string"] = function(ptr, len) {
                 return swift.memory.retain(decodeString(ptr, len));
             }
             bjs["swift_js_init_memory_with_result"] = function(ptr, len) {
-                const target = new Uint8Array(memory.buffer, ptr, len);
+                const target = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0);
                 target.set(tmpRetBytes);
                 tmpRetBytes = undefined;
             }
@@ -132,19 +132,28 @@ export async function createInstantiator(options, swift) {
                 taStack.push(Array.from(new Ctor(copy)));
             }
             bjs["swift_js_struct_lower_User_Stats"] = function(objectId) {
-                structHelpers.User_Stats.lower(swift.memory.getObject(objectId));
+                structHelpers.M10TestModuleT4UserT5Stats.lower(swift.memory.getObject(objectId));
             }
             bjs["swift_js_struct_lift_User_Stats"] = function() {
-                const value = structHelpers.User_Stats.lift();
+                const value = structHelpers.M10TestModuleT4UserT5Stats.lift();
                 return swift.memory.retain(value);
             }
             bjs["swift_js_struct_lower_Player_Stats"] = function(objectId) {
-                structHelpers.Player_Stats.lower(swift.memory.getObject(objectId));
+                structHelpers.M10TestModuleT6PlayerT5Stats.lower(swift.memory.getObject(objectId));
             }
             bjs["swift_js_struct_lift_Player_Stats"] = function() {
-                const value = structHelpers.Player_Stats.lift();
+                const value = structHelpers.M10TestModuleT6PlayerT5Stats.lift();
                 return swift.memory.retain(value);
             }
+            bjs["bjs_core_register_type_handles"] = function() {};
+            bjs["bjs_TestModule_register_type_handles"] = function() {};
+            const __bjs_promiseSettlers = Symbol("JavaScriptKit.promiseSettlers");
+            bjs["swift_js_make_promise"] = function() {
+                let resolve, reject;
+                const promise = new Promise((res, rej) => { resolve = res; reject = rej; });
+                promise[__bjs_promiseSettlers] = { resolve, reject };
+                return swift.memory.retain(promise);
+            }
             bjs["swift_js_return_optional_bool"] = function(isSome, value) {
                 if (isSome === 0) {
                     tmpRetOptionalBool = null;
@@ -273,6 +282,7 @@ export async function createInstantiator(options, swift) {
             /// Represents a Swift heap object like a class instance or an actor instance.
             class SwiftHeapObject {
                 static __wrap(pointer, deinit, prototype, identityCache) {
+                    pointer = pointer >>> 0;
                     const makeFresh = (identityMap) => {
                         const obj = Object.create(prototype);
                         const state = { pointer, deinit, hasReleased: false, identityMap };
@@ -336,19 +346,15 @@ export async function createInstantiator(options, swift) {
                     return ret;
                 }
             }
-            const User_StatsHelpers = __bjs_createUser_StatsHelpers();
-            structHelpers.User_Stats = User_StatsHelpers;
+            const __bjs_helpers_M10TestModuleT4UserT5Stats = __bjs_createStructHelpers_M10TestModuleT4UserT5Stats();
+            structHelpers.M10TestModuleT4UserT5Stats = __bjs_helpers_M10TestModuleT4UserT5Stats;
 
-            const Player_StatsHelpers = __bjs_createPlayer_StatsHelpers();
-            structHelpers.Player_Stats = Player_StatsHelpers;
+            const __bjs_helpers_M10TestModuleT6PlayerT5Stats = __bjs_createStructHelpers_M10TestModuleT6PlayerT5Stats();
+            structHelpers.M10TestModuleT6PlayerT5Stats = __bjs_helpers_M10TestModuleT6PlayerT5Stats;
 
             const exports = {
-                User,
                 Player,
-                Player: {
-                },
-                User: {
-                },
+                User,
             };
             _exports = exports;
             return exports;
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/NestedTypeNameCollision.d.ts b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/NestedTypeNameCollision.d.ts
new file mode 100644
index 000000000..13c22ea11
--- /dev/null
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/NestedTypeNameCollision.d.ts
@@ -0,0 +1,35 @@
+// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit,
+// DO NOT EDIT.
+//
+// To update this file, just rebuild your project or run
+// `swift package bridge-js`.
+
+export interface Entry {
+    identifier: number;
+}
+export namespace Catalog {
+    export interface Entry {
+        title: string;
+    }
+}
+export type Exports = {
+    takeEntry(entry: Entry): Entry;
+    takeCatalogEntry(entry: Catalog.Entry): Catalog.Entry;
+    Catalog: {
+        Entry: {
+            init(title: string): Catalog.Entry;
+        },
+    },
+    Entry: {
+        init(identifier: number): Entry;
+    },
+}
+export type Imports = {
+}
+export function createInstantiator(options: {
+    imports: Imports;
+}, swift: any): Promise<{
+    addImports: (importObject: WebAssembly.Imports) => void;
+    setInstance: (instance: WebAssembly.Instance) => void;
+    createExports: (instance: WebAssembly.Instance) => Exports;
+}>;
\ No newline at end of file
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/NestedTypeNameCollision.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/NestedTypeNameCollision.js
new file mode 100644
index 000000000..1f4400ce9
--- /dev/null
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/NestedTypeNameCollision.js
@@ -0,0 +1,299 @@
+// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit,
+// DO NOT EDIT.
+//
+// To update this file, just rebuild your project or run
+// `swift package bridge-js`.
+
+export async function createInstantiator(options, swift) {
+    let instance;
+    let memory;
+    let setException;
+    let decodeString;
+    const textDecoder = new TextDecoder("utf-8");
+    const textEncoder = new TextEncoder("utf-8");
+    let tmpRetString;
+    let tmpRetBytes;
+    let tmpRetException;
+    let tmpRetOptionalBool;
+    let tmpRetOptionalInt;
+    let tmpRetOptionalFloat;
+    let tmpRetOptionalDouble;
+    let tmpRetOptionalHeapObject;
+    let strStack = [];
+    let i32Stack = [];
+    let i64Stack = [];
+    let f32Stack = [];
+    let f64Stack = [];
+    let ptrStack = [];
+    let taStack = [];
+    const enumHelpers = {};
+    const structHelpers = {};
+
+    let _exports = null;
+    let bjs = null;
+    const __bjs_createStructHelpers_M10TestModuleT7CatalogT5Entry = () => ({
+        lower: (value) => {
+            const bytes = textEncoder.encode(value.title);
+            const id = swift.memory.retain(bytes);
+            i32Stack.push(bytes.length);
+            i32Stack.push(id);
+        },
+        lift: () => {
+            const string = strStack.pop();
+            return { title: string };
+        }
+    });
+    const __bjs_createStructHelpers_M10TestModuleT5Entry = () => ({
+        lower: (value) => {
+            i32Stack.push((value.identifier | 0));
+        },
+        lift: () => {
+            const int = i32Stack.pop();
+            return { identifier: int };
+        }
+    });
+
+    return {
+        /**
+         * @param {WebAssembly.Imports} importObject
+         */
+        addImports: (importObject, importsContext) => {
+            bjs = {};
+            importObject["bjs"] = bjs;
+            bjs["swift_js_return_string"] = function(ptr, len) {
+                tmpRetString = decodeString(ptr, len);
+            }
+            bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) {
+                const source = swift.memory.getObject(sourceId);
+                swift.memory.release(sourceId);
+                const bytes = new Uint8Array(memory.buffer, bytesPtr >>> 0);
+                bytes.set(source);
+            }
+            bjs["swift_js_make_js_string"] = function(ptr, len) {
+                return swift.memory.retain(decodeString(ptr, len));
+            }
+            bjs["swift_js_init_memory_with_result"] = function(ptr, len) {
+                const target = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0);
+                target.set(tmpRetBytes);
+                tmpRetBytes = undefined;
+            }
+            bjs["swift_js_throw"] = function(id) {
+                tmpRetException = swift.memory.retainByRef(id);
+            }
+            bjs["swift_js_retain"] = function(id) {
+                return swift.memory.retainByRef(id);
+            }
+            bjs["swift_js_release"] = function(id) {
+                swift.memory.release(id);
+            }
+            bjs["swift_js_push_i32"] = function(v) {
+                i32Stack.push(v | 0);
+            }
+            bjs["swift_js_push_f32"] = function(v) {
+                f32Stack.push(Math.fround(v));
+            }
+            bjs["swift_js_push_f64"] = function(v) {
+                f64Stack.push(v);
+            }
+            bjs["swift_js_push_string"] = function(ptr, len) {
+                const value = decodeString(ptr, len);
+                strStack.push(value);
+            }
+            bjs["swift_js_pop_i32"] = function() {
+                return i32Stack.pop();
+            }
+            bjs["swift_js_pop_f32"] = function() {
+                return f32Stack.pop();
+            }
+            bjs["swift_js_pop_f64"] = function() {
+                return f64Stack.pop();
+            }
+            bjs["swift_js_push_pointer"] = function(pointer) {
+                ptrStack.push(pointer);
+            }
+            bjs["swift_js_pop_pointer"] = function() {
+                return ptrStack.pop();
+            }
+            bjs["swift_js_push_i64"] = function(v) {
+                i64Stack.push(v);
+            }
+            bjs["swift_js_pop_i64"] = function() {
+                return i64Stack.pop();
+            }
+            const taCtors = [Int8Array, Uint8Array, Int16Array, Uint16Array, Int32Array, Uint32Array, Float32Array, Float64Array];
+            bjs["swift_js_push_typed_array"] = function(kind, ptr, count) {
+                const Ctor = taCtors[kind];
+                const byteLen = count * Ctor.BYTES_PER_ELEMENT;
+                const copy = memory.buffer.slice(ptr, ptr + byteLen);
+                taStack.push(Array.from(new Ctor(copy)));
+            }
+            bjs["swift_js_struct_lower_Catalog_Entry"] = function(objectId) {
+                structHelpers.M10TestModuleT7CatalogT5Entry.lower(swift.memory.getObject(objectId));
+            }
+            bjs["swift_js_struct_lift_Catalog_Entry"] = function() {
+                const value = structHelpers.M10TestModuleT7CatalogT5Entry.lift();
+                return swift.memory.retain(value);
+            }
+            bjs["swift_js_struct_lower_Entry"] = function(objectId) {
+                structHelpers.M10TestModuleT5Entry.lower(swift.memory.getObject(objectId));
+            }
+            bjs["swift_js_struct_lift_Entry"] = function() {
+                const value = structHelpers.M10TestModuleT5Entry.lift();
+                return swift.memory.retain(value);
+            }
+            bjs["bjs_core_register_type_handles"] = function() {};
+            bjs["bjs_TestModule_register_type_handles"] = function() {};
+            const __bjs_promiseSettlers = Symbol("JavaScriptKit.promiseSettlers");
+            bjs["swift_js_make_promise"] = function() {
+                let resolve, reject;
+                const promise = new Promise((res, rej) => { resolve = res; reject = rej; });
+                promise[__bjs_promiseSettlers] = { resolve, reject };
+                return swift.memory.retain(promise);
+            }
+            bjs["swift_js_return_optional_bool"] = function(isSome, value) {
+                if (isSome === 0) {
+                    tmpRetOptionalBool = null;
+                } else {
+                    tmpRetOptionalBool = value !== 0;
+                }
+            }
+            bjs["swift_js_return_optional_int"] = function(isSome, value) {
+                if (isSome === 0) {
+                    tmpRetOptionalInt = null;
+                } else {
+                    tmpRetOptionalInt = value | 0;
+                }
+            }
+            bjs["swift_js_return_optional_float"] = function(isSome, value) {
+                if (isSome === 0) {
+                    tmpRetOptionalFloat = null;
+                } else {
+                    tmpRetOptionalFloat = Math.fround(value);
+                }
+            }
+            bjs["swift_js_return_optional_double"] = function(isSome, value) {
+                if (isSome === 0) {
+                    tmpRetOptionalDouble = null;
+                } else {
+                    tmpRetOptionalDouble = value;
+                }
+            }
+            bjs["swift_js_return_optional_string"] = function(isSome, ptr, len) {
+                if (isSome === 0) {
+                    tmpRetString = null;
+                } else {
+                    tmpRetString = decodeString(ptr, len);
+                }
+            }
+            bjs["swift_js_return_optional_object"] = function(isSome, objectId) {
+                if (isSome === 0) {
+                    tmpRetString = null;
+                } else {
+                    tmpRetString = swift.memory.getObject(objectId);
+                }
+            }
+            bjs["swift_js_return_optional_heap_object"] = function(isSome, pointer) {
+                if (isSome === 0) {
+                    tmpRetOptionalHeapObject = null;
+                } else {
+                    tmpRetOptionalHeapObject = pointer;
+                }
+            }
+            bjs["swift_js_get_optional_int_presence"] = function() {
+                return tmpRetOptionalInt != null ? 1 : 0;
+            }
+            bjs["swift_js_get_optional_int_value"] = function() {
+                const value = tmpRetOptionalInt;
+                tmpRetOptionalInt = undefined;
+                return value;
+            }
+            bjs["swift_js_get_optional_string"] = function() {
+                const str = tmpRetString;
+                tmpRetString = undefined;
+                if (str == null) {
+                    return -1;
+                } else {
+                    const bytes = textEncoder.encode(str);
+                    tmpRetBytes = bytes;
+                    return bytes.length;
+                }
+            }
+            bjs["swift_js_get_optional_float_presence"] = function() {
+                return tmpRetOptionalFloat != null ? 1 : 0;
+            }
+            bjs["swift_js_get_optional_float_value"] = function() {
+                const value = tmpRetOptionalFloat;
+                tmpRetOptionalFloat = undefined;
+                return value;
+            }
+            bjs["swift_js_get_optional_double_presence"] = function() {
+                return tmpRetOptionalDouble != null ? 1 : 0;
+            }
+            bjs["swift_js_get_optional_double_value"] = function() {
+                const value = tmpRetOptionalDouble;
+                tmpRetOptionalDouble = undefined;
+                return value;
+            }
+            bjs["swift_js_get_optional_heap_object_pointer"] = function() {
+                const pointer = tmpRetOptionalHeapObject;
+                tmpRetOptionalHeapObject = undefined;
+                return pointer || 0;
+            }
+            bjs["swift_js_closure_unregister"] = function(funcRef) {}
+        },
+        setInstance: (i) => {
+            instance = i;
+            memory = instance.exports.memory;
+
+            decodeString = (ptr, len) => { const bytes = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); return textDecoder.decode(bytes); }
+
+            setException = (error) => {
+                instance.exports._swift_js_exception.value = swift.memory.retain(error)
+            }
+        },
+        /** @param {WebAssembly.Instance} instance */
+        createExports: (instance) => {
+            const js = swift.memory.heap;
+            const __bjs_helpers_M10TestModuleT7CatalogT5Entry = __bjs_createStructHelpers_M10TestModuleT7CatalogT5Entry();
+            structHelpers.M10TestModuleT7CatalogT5Entry = __bjs_helpers_M10TestModuleT7CatalogT5Entry;
+
+            const __bjs_helpers_M10TestModuleT5Entry = __bjs_createStructHelpers_M10TestModuleT5Entry();
+            structHelpers.M10TestModuleT5Entry = __bjs_helpers_M10TestModuleT5Entry;
+
+            const exports = {
+                takeEntry: function bjs_takeEntry(entry) {
+                    structHelpers.M10TestModuleT5Entry.lower(entry);
+                    instance.exports.bjs_takeEntry();
+                    const structValue = structHelpers.M10TestModuleT5Entry.lift();
+                    return structValue;
+                },
+                takeCatalogEntry: function bjs_takeCatalogEntry(entry) {
+                    structHelpers.M10TestModuleT7CatalogT5Entry.lower(entry);
+                    instance.exports.bjs_takeCatalogEntry();
+                    const structValue = structHelpers.M10TestModuleT7CatalogT5Entry.lift();
+                    return structValue;
+                },
+                Catalog: {
+                    Entry: {
+                        init: function(title) {
+                            const titleBytes = textEncoder.encode(title);
+                            const titleId = swift.memory.retain(titleBytes);
+                            instance.exports.bjs_Catalog_Entry_init(titleId, titleBytes.length);
+                            const structValue = structHelpers.M10TestModuleT7CatalogT5Entry.lift();
+                            return structValue;
+                        },
+                    },
+                },
+                Entry: {
+                    init: function(identifier) {
+                        instance.exports.bjs_Entry_init(identifier);
+                        const structValue = structHelpers.M10TestModuleT5Entry.lift();
+                        return structValue;
+                    },
+                },
+            };
+            _exports = exports;
+            return exports;
+        },
+    }
+}
\ No newline at end of file
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Optionals.d.ts b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Optionals.d.ts
index fb9d68db7..0f64324cd 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Optionals.d.ts
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Optionals.d.ts
@@ -42,14 +42,10 @@ export interface WithOptionalJSClass {
     childOrNull: WithOptionalJSClass | null;
 }
 export type Exports = {
-    Greeter: {
-        new(name: string | null): Greeter;
-    }
-    OptionalPropertyHolder: {
-        new(): OptionalPropertyHolder;
-    }
     roundTripOptionalClass(value: Greeter | null): Greeter | null;
     testOptionalPropertyRoundtrip(holder: OptionalPropertyHolder | null): OptionalPropertyHolder | null;
+    roundTripExportedOptionalJSObject(value: any | null): any | null;
+    roundTripExportedOptionalJSClass(value: WithOptionalJSClass | null): WithOptionalJSClass | null;
     roundTripString(name: string | null): string | null;
     roundTripInt(value: number | null): number | null;
     roundTripInt8(value: number | null): number | null;
@@ -69,6 +65,12 @@ export type Exports = {
     roundTripAlias(age: number | null): number | null;
     roundTripOptionalAlias(name: string | null): string | null;
     testMixedOptionals(firstName: string | null, lastName: string | null, age: number | null, active: boolean): string | null;
+    Greeter: {
+        new(name: string | null): Greeter;
+    },
+    OptionalPropertyHolder: {
+        new(): OptionalPropertyHolder;
+    },
 }
 export type Imports = {
     WithOptionalJSClass: {
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Optionals.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Optionals.js
index f376c1b24..b63f360e9 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Optionals.js
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Optionals.js
@@ -31,6 +31,356 @@ export async function createInstantiator(options, swift) {
 
     let _exports = null;
     let bjs = null;
+    const __bjs_arrayCodecCache = new WeakMap();
+    function __bjs_arrayCodec(elementCodec) {
+        let codec = __bjs_arrayCodecCache.get(elementCodec);
+        if (codec !== undefined) {
+            return codec;
+        }
+        codec = {
+            lower(value) {
+                for (let i = 0; i < value.length; i++) {
+                    elementCodec.lower(value[i]);
+                }
+                i32Stack.push(value.length);
+            },
+            lift() {
+                const count = i32Stack.pop();
+                if (count === -1) {
+                    return taStack.pop();
+                }
+                const result = new Array(count);
+                for (let i = count - 1; i >= 0; i--) {
+                    result[i] = elementCodec.lift();
+                }
+                return result;
+            },
+        };
+        __bjs_arrayCodecCache.set(elementCodec, codec);
+        return codec;
+    }
+    const __bjs_optionalCodecCache = new WeakMap();
+    const __bjs_optionalCodecUndefinedOrCache = new WeakMap();
+    function __bjs_optionalCodec(elementCodec, isUndefinedOr = false) {
+        const cache = isUndefinedOr ? __bjs_optionalCodecUndefinedOrCache : __bjs_optionalCodecCache;
+        let codec = cache.get(elementCodec);
+        if (codec !== undefined) {
+            return codec;
+        }
+        codec = {
+            lower(value) {
+                const isSome = isUndefinedOr ? value !== undefined : value != null;
+                if (isSome) {
+                    elementCodec.lower(value);
+                    i32Stack.push(1);
+                } else {
+                    i32Stack.push(0);
+                }
+            },
+            lift() {
+                if (i32Stack.pop() === 0) {
+                    return isUndefinedOr ? undefined : null;
+                }
+                return elementCodec.lift();
+            },
+        };
+        cache.set(elementCodec, codec);
+        return codec;
+    }
+    const __bjs_dictCodecCache = new WeakMap();
+    function __bjs_dictCodec(valueCodec) {
+        let codec = __bjs_dictCodecCache.get(valueCodec);
+        if (codec !== undefined) {
+            return codec;
+        }
+        codec = {
+            lower(value) {
+                const keys = Object.keys(value);
+                for (let i = 0; i < keys.length; i++) {
+                    __bjs_stringCodec.lower(keys[i]);
+                    valueCodec.lower(value[keys[i]]);
+                }
+                i32Stack.push(keys.length);
+            },
+            lift() {
+                const count = i32Stack.pop();
+                const result = {};
+                for (let i = 0; i < count; i++) {
+                    const value = valueCodec.lift();
+                    const key = __bjs_stringCodec.lift();
+                    result[key] = value;
+                }
+                return result;
+            },
+        };
+        __bjs_dictCodecCache.set(valueCodec, codec);
+        return codec;
+    }
+
+    const __bjs_stringCodec = {
+        lower: (v) => {
+            const bytes = textEncoder.encode(v);
+            const id = swift.memory.retain(bytes);
+            i32Stack.push(bytes.length);
+            i32Stack.push(id);
+        },
+        lift: () => {
+            const string = strStack.pop();
+            return string;
+        },
+    };
+    const __bjs_primitiveCodecs = {
+        Bool: {
+            lower: (v) => {
+                i32Stack.push(v ? 1 : 0);
+            },
+            lift: () => {
+                const bool = i32Stack.pop() !== 0;
+                return bool;
+            },
+        },
+        Int: {
+            lower: (v) => {
+                i32Stack.push((v | 0));
+            },
+            lift: () => {
+                const int = i32Stack.pop();
+                return int;
+            },
+        },
+        Int8: {
+            lower: (v) => {
+                i32Stack.push((v | 0));
+            },
+            lift: () => {
+                const int = i32Stack.pop();
+                return int;
+            },
+        },
+        UInt8: {
+            lower: (v) => {
+                i32Stack.push((v | 0));
+            },
+            lift: () => {
+                const int = i32Stack.pop() >>> 0;
+                return int;
+            },
+        },
+        Int16: {
+            lower: (v) => {
+                i32Stack.push((v | 0));
+            },
+            lift: () => {
+                const int = i32Stack.pop();
+                return int;
+            },
+        },
+        UInt16: {
+            lower: (v) => {
+                i32Stack.push((v | 0));
+            },
+            lift: () => {
+                const int = i32Stack.pop() >>> 0;
+                return int;
+            },
+        },
+        Int32: {
+            lower: (v) => {
+                i32Stack.push((v | 0));
+            },
+            lift: () => {
+                const int = i32Stack.pop();
+                return int;
+            },
+        },
+        UInt32: {
+            lower: (v) => {
+                i32Stack.push((v | 0));
+            },
+            lift: () => {
+                const int = i32Stack.pop() >>> 0;
+                return int;
+            },
+        },
+        UInt: {
+            lower: (v) => {
+                i32Stack.push((v | 0));
+            },
+            lift: () => {
+                const int = i32Stack.pop() >>> 0;
+                return int;
+            },
+        },
+        Int64: {
+            lower: (v) => {
+                i64Stack.push(v);
+            },
+            lift: () => {
+                const int = i64Stack.pop();
+                return int;
+            },
+        },
+        UInt64: {
+            lower: (v) => {
+                i64Stack.push(v);
+            },
+            lift: () => {
+                const int = i64Stack.pop();
+                return int;
+            },
+        },
+        Float: {
+            lower: (v) => {
+                f32Stack.push(Math.fround(v));
+            },
+            lift: () => {
+                const f32 = f32Stack.pop();
+                return f32;
+            },
+        },
+        Double: {
+            lower: (v) => {
+                f64Stack.push(v);
+            },
+            lift: () => {
+                const f64 = f64Stack.pop();
+                return f64;
+            },
+        },
+        String: __bjs_stringCodec,
+        JSValue: {
+            lower: (v) => {
+                const [vKind, vPayload1, vPayload2] = __bjs_jsValueLower(v);
+                i32Stack.push(vKind);
+                i32Stack.push(vPayload1);
+                f64Stack.push(vPayload2);
+            },
+            lift: () => {
+                const jsValuePayload2 = f64Stack.pop();
+                const jsValuePayload1 = i32Stack.pop();
+                const jsValueKind = i32Stack.pop();
+                const jsValue = __bjs_jsValueLift(jsValueKind, jsValuePayload1, jsValuePayload2);
+                return jsValue;
+            },
+        },
+    };
+
+    function __bjs_jsValueLower(value) {
+        let kind;
+        let payload1;
+        let payload2;
+        if (value === null) {
+            kind = 4;
+            payload1 = 0;
+            payload2 = 0;
+        } else {
+            switch (typeof value) {
+                case "boolean":
+                    kind = 0;
+                    payload1 = value ? 1 : 0;
+                    payload2 = 0;
+                    break;
+                case "number":
+                    kind = 2;
+                    payload1 = 0;
+                    payload2 = value;
+                    break;
+                case "string":
+                    kind = 1;
+                    payload1 = swift.memory.retain(value);
+                    payload2 = 0;
+                    break;
+                case "undefined":
+                    kind = 5;
+                    payload1 = 0;
+                    payload2 = 0;
+                    break;
+                case "object":
+                    kind = 3;
+                    payload1 = swift.memory.retain(value);
+                    payload2 = 0;
+                    break;
+                case "function":
+                    kind = 3;
+                    payload1 = swift.memory.retain(value);
+                    payload2 = 0;
+                    break;
+                case "symbol":
+                    kind = 7;
+                    payload1 = swift.memory.retain(value);
+                    payload2 = 0;
+                    break;
+                case "bigint":
+                    kind = 8;
+                    payload1 = swift.memory.retain(value);
+                    payload2 = 0;
+                    break;
+                default:
+                    throw new TypeError("Unsupported JSValue type");
+            }
+        }
+        return [kind, payload1, payload2];
+    }
+    function __bjs_jsValueLift(kind, payload1, payload2) {
+        let jsValue;
+        switch (kind) {
+            case 0:
+                jsValue = payload1 !== 0;
+                break;
+            case 1:
+                jsValue = swift.memory.getObject(payload1);
+                break;
+            case 2:
+                jsValue = payload2;
+                break;
+            case 3:
+                jsValue = swift.memory.getObject(payload1);
+                break;
+            case 4:
+                jsValue = null;
+                break;
+            case 5:
+                jsValue = undefined;
+                break;
+            case 7:
+                jsValue = swift.memory.getObject(payload1);
+                break;
+            case 8:
+                jsValue = swift.memory.getObject(payload1);
+                break;
+            default:
+                throw new TypeError("Unsupported JSValue kind " + kind);
+        }
+        return jsValue;
+    }
+
+    const __bjs_codec_JSObject = {
+        lower: (v) => {
+            const objId = swift.memory.retain(v);
+            i32Stack.push(objId);
+        },
+        lift: () => {
+            const objId = i32Stack.pop();
+            const obj = swift.memory.getObject(objId);
+            swift.memory.release(objId);
+            return obj;
+        },
+    };
+    const __bjs_codec_Optional_JSObject = __bjs_optionalCodec(__bjs_codec_JSObject);
+    const __bjs_codec_WithOptionalJSClass = {
+        lower: (v) => {
+            const objId = swift.memory.retain(v);
+            i32Stack.push(objId);
+        },
+        lift: () => {
+            const objId = i32Stack.pop();
+            const obj = swift.memory.getObject(objId);
+            swift.memory.release(objId);
+            return obj;
+        },
+    };
+    const __bjs_codec_Optional_WithOptionalJSClass = __bjs_optionalCodec(__bjs_codec_WithOptionalJSClass);
+
 
     return {
         /**
@@ -46,14 +396,14 @@ export async function createInstantiator(options, swift) {
             bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) {
                 const source = swift.memory.getObject(sourceId);
                 swift.memory.release(sourceId);
-                const bytes = new Uint8Array(memory.buffer, bytesPtr);
+                const bytes = new Uint8Array(memory.buffer, bytesPtr >>> 0);
                 bytes.set(source);
             }
             bjs["swift_js_make_js_string"] = function(ptr, len) {
                 return swift.memory.retain(decodeString(ptr, len));
             }
             bjs["swift_js_init_memory_with_result"] = function(ptr, len) {
-                const target = new Uint8Array(memory.buffer, ptr, len);
+                const target = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0);
                 target.set(tmpRetBytes);
                 tmpRetBytes = undefined;
             }
@@ -107,6 +457,14 @@ export async function createInstantiator(options, swift) {
                 const copy = memory.buffer.slice(ptr, ptr + byteLen);
                 taStack.push(Array.from(new Ctor(copy)));
             }
+            bjs["bjs_core_register_type_handles"] = function() {};
+            const __bjs_promiseSettlers = Symbol("JavaScriptKit.promiseSettlers");
+            bjs["swift_js_make_promise"] = function() {
+                let resolve, reject;
+                const promise = new Promise((res, rej) => { resolve = res; reject = rej; });
+                promise[__bjs_promiseSettlers] = { resolve, reject };
+                return swift.memory.retain(promise);
+            }
             bjs["swift_js_return_optional_bool"] = function(isSome, value) {
                 if (isSome === 0) {
                     tmpRetOptionalBool = null;
@@ -307,12 +665,7 @@ export async function createInstantiator(options, swift) {
             TestModule["bjs_WithOptionalJSClass_childOrNull_get"] = function bjs_WithOptionalJSClass_childOrNull_get(self) {
                 try {
                     let ret = swift.memory.getObject(self).childOrNull;
-                    const isSome = ret != null;
-                    if (isSome) {
-                        const objId = swift.memory.retain(ret);
-                        i32Stack.push(objId);
-                    }
-                    i32Stack.push(isSome ? 1 : 0);
+                    __bjs_codec_Optional_WithOptionalJSClass.lower(ret);
                 } catch (error) {
                     setException(error);
                 }
@@ -387,18 +740,9 @@ export async function createInstantiator(options, swift) {
                     setException(error);
                 }
             }
-            TestModule["bjs_WithOptionalJSClass_childOrNull_set"] = function bjs_WithOptionalJSClass_childOrNull_set(self, newValue) {
+            TestModule["bjs_WithOptionalJSClass_childOrNull_set"] = function bjs_WithOptionalJSClass_childOrNull_set(self, newValueIsSome, newValueObjectId) {
                 try {
-                    let optResult;
-                    if (newValue) {
-                        const objId = i32Stack.pop();
-                        const obj = swift.memory.getObject(objId);
-                        swift.memory.release(objId);
-                        optResult = obj;
-                    } else {
-                        optResult = null;
-                    }
-                    swift.memory.getObject(self).childOrNull = optResult;
+                    swift.memory.getObject(self).childOrNull = newValueIsSome ? swift.memory.getObject(newValueObjectId) : null;
                 } catch (error) {
                     setException(error);
                 }
@@ -489,24 +833,10 @@ export async function createInstantiator(options, swift) {
                     setException(error);
                 }
             }
-            TestModule["bjs_WithOptionalJSClass_roundTripChildOrNull"] = function bjs_WithOptionalJSClass_roundTripChildOrNull(self, value) {
+            TestModule["bjs_WithOptionalJSClass_roundTripChildOrNull"] = function bjs_WithOptionalJSClass_roundTripChildOrNull(self, valueIsSome, valueObjectId) {
                 try {
-                    let optResult;
-                    if (value) {
-                        const objId = i32Stack.pop();
-                        const obj = swift.memory.getObject(objId);
-                        swift.memory.release(objId);
-                        optResult = obj;
-                    } else {
-                        optResult = null;
-                    }
-                    let ret = swift.memory.getObject(self).roundTripChildOrNull(optResult);
-                    const isSome = ret != null;
-                    if (isSome) {
-                        const objId1 = swift.memory.retain(ret);
-                        i32Stack.push(objId1);
-                    }
-                    i32Stack.push(isSome ? 1 : 0);
+                    let ret = swift.memory.getObject(self).roundTripChildOrNull(valueIsSome ? swift.memory.getObject(valueObjectId) : null);
+                    __bjs_codec_Optional_WithOptionalJSClass.lower(ret);
                 } catch (error) {
                     setException(error);
                 }
@@ -537,6 +867,7 @@ export async function createInstantiator(options, swift) {
             /// Represents a Swift heap object like a class instance or an actor instance.
             class SwiftHeapObject {
                 static __wrap(pointer, deinit, prototype, identityCache) {
+                    pointer = pointer >>> 0;
                     const makeFresh = (identityMap) => {
                         const obj = Object.create(prototype);
                         const state = { pointer, deinit, hasReleased: false, identityMap };
@@ -695,8 +1026,6 @@ export async function createInstantiator(options, swift) {
                 }
             }
             const exports = {
-                Greeter,
-                OptionalPropertyHolder,
                 roundTripOptionalClass: function bjs_roundTripOptionalClass(value) {
                     const isSome = value != null;
                     let result;
@@ -725,6 +1054,30 @@ export async function createInstantiator(options, swift) {
                     const optResult = pointer === null ? null : OptionalPropertyHolder.__construct(pointer);
                     return optResult;
                 },
+                roundTripExportedOptionalJSObject: function bjs_roundTripExportedOptionalJSObject(value) {
+                    const isSome = value != null;
+                    let result;
+                    if (isSome) {
+                        result = swift.memory.retain(value);
+                    } else {
+                        result = 0;
+                    }
+                    instance.exports.bjs_roundTripExportedOptionalJSObject(+isSome, result);
+                    const optValue = __bjs_codec_Optional_JSObject.lift();
+                    return optValue;
+                },
+                roundTripExportedOptionalJSClass: function bjs_roundTripExportedOptionalJSClass(value) {
+                    const isSome = value != null;
+                    let result;
+                    if (isSome) {
+                        result = swift.memory.retain(value);
+                    } else {
+                        result = 0;
+                    }
+                    instance.exports.bjs_roundTripExportedOptionalJSClass(+isSome, result);
+                    const optValue = __bjs_codec_Optional_WithOptionalJSClass.lift();
+                    return optValue;
+                },
                 roundTripString: function bjs_roundTripString(name) {
                     const isSome = name != null;
                     let result, result1;
@@ -940,6 +1293,8 @@ export async function createInstantiator(options, swift) {
                     tmpRetString = undefined;
                     return optResult;
                 },
+                Greeter,
+                OptionalPropertyHolder,
             };
             _exports = exports;
             return exports;
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveParameters.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveParameters.js
index 97c1a44fe..d4480a65c 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveParameters.js
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveParameters.js
@@ -46,14 +46,14 @@ export async function createInstantiator(options, swift) {
             bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) {
                 const source = swift.memory.getObject(sourceId);
                 swift.memory.release(sourceId);
-                const bytes = new Uint8Array(memory.buffer, bytesPtr);
+                const bytes = new Uint8Array(memory.buffer, bytesPtr >>> 0);
                 bytes.set(source);
             }
             bjs["swift_js_make_js_string"] = function(ptr, len) {
                 return swift.memory.retain(decodeString(ptr, len));
             }
             bjs["swift_js_init_memory_with_result"] = function(ptr, len) {
-                const target = new Uint8Array(memory.buffer, ptr, len);
+                const target = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0);
                 target.set(tmpRetBytes);
                 tmpRetBytes = undefined;
             }
@@ -107,6 +107,14 @@ export async function createInstantiator(options, swift) {
                 const copy = memory.buffer.slice(ptr, ptr + byteLen);
                 taStack.push(Array.from(new Ctor(copy)));
             }
+            bjs["bjs_core_register_type_handles"] = function() {};
+            const __bjs_promiseSettlers = Symbol("JavaScriptKit.promiseSettlers");
+            bjs["swift_js_make_promise"] = function() {
+                let resolve, reject;
+                const promise = new Promise((res, rej) => { resolve = res; reject = rej; });
+                promise[__bjs_promiseSettlers] = { resolve, reject };
+                return swift.memory.retain(promise);
+            }
             bjs["swift_js_return_optional_bool"] = function(isSome, value) {
                 if (isSome === 0) {
                     tmpRetOptionalBool = null;
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveReturn.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveReturn.js
index a140ea232..e9b298fb2 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveReturn.js
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveReturn.js
@@ -46,14 +46,14 @@ export async function createInstantiator(options, swift) {
             bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) {
                 const source = swift.memory.getObject(sourceId);
                 swift.memory.release(sourceId);
-                const bytes = new Uint8Array(memory.buffer, bytesPtr);
+                const bytes = new Uint8Array(memory.buffer, bytesPtr >>> 0);
                 bytes.set(source);
             }
             bjs["swift_js_make_js_string"] = function(ptr, len) {
                 return swift.memory.retain(decodeString(ptr, len));
             }
             bjs["swift_js_init_memory_with_result"] = function(ptr, len) {
-                const target = new Uint8Array(memory.buffer, ptr, len);
+                const target = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0);
                 target.set(tmpRetBytes);
                 tmpRetBytes = undefined;
             }
@@ -107,6 +107,14 @@ export async function createInstantiator(options, swift) {
                 const copy = memory.buffer.slice(ptr, ptr + byteLen);
                 taStack.push(Array.from(new Ctor(copy)));
             }
+            bjs["bjs_core_register_type_handles"] = function() {};
+            const __bjs_promiseSettlers = Symbol("JavaScriptKit.promiseSettlers");
+            bjs["swift_js_make_promise"] = function() {
+                let resolve, reject;
+                const promise = new Promise((res, rej) => { resolve = res; reject = rej; });
+                promise[__bjs_promiseSettlers] = { resolve, reject };
+                return swift.memory.retain(promise);
+            }
             bjs["swift_js_return_optional_bool"] = function(isSome, value) {
                 if (isSome === 0) {
                     tmpRetOptionalBool = null;
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PropertyTypes.d.ts b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PropertyTypes.d.ts
index 8f65849ab..5872a3020 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PropertyTypes.d.ts
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PropertyTypes.d.ts
@@ -31,11 +31,11 @@ export interface PropertyHolder extends SwiftHeapObject {
     observedProperty: number;
 }
 export type Exports = {
-    PropertyHolder: {
-        new(intValue: number, floatValue: number, doubleValue: number, boolValue: boolean, stringValue: string, jsObject: any): PropertyHolder;
-    }
     createPropertyHolder(intValue: number, floatValue: number, doubleValue: number, boolValue: boolean, stringValue: string, jsObject: any): PropertyHolder;
     testPropertyHolder(holder: PropertyHolder): string;
+    PropertyHolder: {
+        new(intValue: number, floatValue: number, doubleValue: number, boolValue: boolean, stringValue: string, jsObject: any): PropertyHolder;
+    },
 }
 export type Imports = {
 }
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PropertyTypes.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PropertyTypes.js
index b8116a32f..beb9417df 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PropertyTypes.js
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PropertyTypes.js
@@ -45,14 +45,14 @@ export async function createInstantiator(options, swift) {
             bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) {
                 const source = swift.memory.getObject(sourceId);
                 swift.memory.release(sourceId);
-                const bytes = new Uint8Array(memory.buffer, bytesPtr);
+                const bytes = new Uint8Array(memory.buffer, bytesPtr >>> 0);
                 bytes.set(source);
             }
             bjs["swift_js_make_js_string"] = function(ptr, len) {
                 return swift.memory.retain(decodeString(ptr, len));
             }
             bjs["swift_js_init_memory_with_result"] = function(ptr, len) {
-                const target = new Uint8Array(memory.buffer, ptr, len);
+                const target = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0);
                 target.set(tmpRetBytes);
                 tmpRetBytes = undefined;
             }
@@ -106,6 +106,14 @@ export async function createInstantiator(options, swift) {
                 const copy = memory.buffer.slice(ptr, ptr + byteLen);
                 taStack.push(Array.from(new Ctor(copy)));
             }
+            bjs["bjs_core_register_type_handles"] = function() {};
+            const __bjs_promiseSettlers = Symbol("JavaScriptKit.promiseSettlers");
+            bjs["swift_js_make_promise"] = function() {
+                let resolve, reject;
+                const promise = new Promise((res, rej) => { resolve = res; reject = rej; });
+                promise[__bjs_promiseSettlers] = { resolve, reject };
+                return swift.memory.retain(promise);
+            }
             bjs["swift_js_return_optional_bool"] = function(isSome, value) {
                 if (isSome === 0) {
                     tmpRetOptionalBool = null;
@@ -230,6 +238,7 @@ export async function createInstantiator(options, swift) {
             /// Represents a Swift heap object like a class instance or an actor instance.
             class SwiftHeapObject {
                 static __wrap(pointer, deinit, prototype, identityCache) {
+                    pointer = pointer >>> 0;
                     const makeFresh = (identityMap) => {
                         const obj = Object.create(prototype);
                         const state = { pointer, deinit, hasReleased: false, identityMap };
@@ -398,7 +407,6 @@ export async function createInstantiator(options, swift) {
                 }
             }
             const exports = {
-                PropertyHolder,
                 createPropertyHolder: function bjs_createPropertyHolder(intValue, floatValue, doubleValue, boolValue, stringValue, jsObject) {
                     const stringValueBytes = textEncoder.encode(stringValue);
                     const stringValueId = swift.memory.retain(stringValueBytes);
@@ -411,6 +419,7 @@ export async function createInstantiator(options, swift) {
                     tmpRetString = undefined;
                     return ret;
                 },
+                PropertyHolder,
             };
             _exports = exports;
             return exports;
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Protocol.d.ts b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Protocol.d.ts
index 27cd9212b..a413fa500 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Protocol.d.ts
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Protocol.d.ts
@@ -96,21 +96,21 @@ export interface DelegateManager extends SwiftHeapObject {
     delegatesByName: Record<string, MyViewControllerDelegate>;
 }
 export type Exports = {
-    Helper: {
-        new(value: number): Helper;
-    }
-    MyViewController: {
-        new(delegate: MyViewControllerDelegate): MyViewController;
-    }
-    DelegateManager: {
-        new(delegates: MyViewControllerDelegate[]): DelegateManager;
-    }
     processDelegates(delegates: MyViewControllerDelegate[]): MyViewControllerDelegate[];
     processDelegatesByName(delegates: Record<string, MyViewControllerDelegate>): Record<string, MyViewControllerDelegate>;
     Direction: DirectionObject
     ExampleEnum: ExampleEnumObject
     Result: ResultObject
     Priority: PriorityObject
+    DelegateManager: {
+        new(delegates: MyViewControllerDelegate[]): DelegateManager;
+    },
+    Helper: {
+        new(value: number): Helper;
+    },
+    MyViewController: {
+        new(delegate: MyViewControllerDelegate): MyViewController;
+    },
 }
 export type Imports = {
 }
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Protocol.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Protocol.js
index d992bf75d..f0c2d3fae 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Protocol.js
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Protocol.js
@@ -55,7 +55,345 @@ export async function createInstantiator(options, swift) {
 
     let _exports = null;
     let bjs = null;
-    const __bjs_createResultValuesHelpers = () => ({
+    const __bjs_arrayCodecCache = new WeakMap();
+    function __bjs_arrayCodec(elementCodec) {
+        let codec = __bjs_arrayCodecCache.get(elementCodec);
+        if (codec !== undefined) {
+            return codec;
+        }
+        codec = {
+            lower(value) {
+                for (let i = 0; i < value.length; i++) {
+                    elementCodec.lower(value[i]);
+                }
+                i32Stack.push(value.length);
+            },
+            lift() {
+                const count = i32Stack.pop();
+                if (count === -1) {
+                    return taStack.pop();
+                }
+                const result = new Array(count);
+                for (let i = count - 1; i >= 0; i--) {
+                    result[i] = elementCodec.lift();
+                }
+                return result;
+            },
+        };
+        __bjs_arrayCodecCache.set(elementCodec, codec);
+        return codec;
+    }
+    const __bjs_optionalCodecCache = new WeakMap();
+    const __bjs_optionalCodecUndefinedOrCache = new WeakMap();
+    function __bjs_optionalCodec(elementCodec, isUndefinedOr = false) {
+        const cache = isUndefinedOr ? __bjs_optionalCodecUndefinedOrCache : __bjs_optionalCodecCache;
+        let codec = cache.get(elementCodec);
+        if (codec !== undefined) {
+            return codec;
+        }
+        codec = {
+            lower(value) {
+                const isSome = isUndefinedOr ? value !== undefined : value != null;
+                if (isSome) {
+                    elementCodec.lower(value);
+                    i32Stack.push(1);
+                } else {
+                    i32Stack.push(0);
+                }
+            },
+            lift() {
+                if (i32Stack.pop() === 0) {
+                    return isUndefinedOr ? undefined : null;
+                }
+                return elementCodec.lift();
+            },
+        };
+        cache.set(elementCodec, codec);
+        return codec;
+    }
+    const __bjs_dictCodecCache = new WeakMap();
+    function __bjs_dictCodec(valueCodec) {
+        let codec = __bjs_dictCodecCache.get(valueCodec);
+        if (codec !== undefined) {
+            return codec;
+        }
+        codec = {
+            lower(value) {
+                const keys = Object.keys(value);
+                for (let i = 0; i < keys.length; i++) {
+                    __bjs_stringCodec.lower(keys[i]);
+                    valueCodec.lower(value[keys[i]]);
+                }
+                i32Stack.push(keys.length);
+            },
+            lift() {
+                const count = i32Stack.pop();
+                const result = {};
+                for (let i = 0; i < count; i++) {
+                    const value = valueCodec.lift();
+                    const key = __bjs_stringCodec.lift();
+                    result[key] = value;
+                }
+                return result;
+            },
+        };
+        __bjs_dictCodecCache.set(valueCodec, codec);
+        return codec;
+    }
+
+    const __bjs_stringCodec = {
+        lower: (v) => {
+            const bytes = textEncoder.encode(v);
+            const id = swift.memory.retain(bytes);
+            i32Stack.push(bytes.length);
+            i32Stack.push(id);
+        },
+        lift: () => {
+            const string = strStack.pop();
+            return string;
+        },
+    };
+    const __bjs_primitiveCodecs = {
+        Bool: {
+            lower: (v) => {
+                i32Stack.push(v ? 1 : 0);
+            },
+            lift: () => {
+                const bool = i32Stack.pop() !== 0;
+                return bool;
+            },
+        },
+        Int: {
+            lower: (v) => {
+                i32Stack.push((v | 0));
+            },
+            lift: () => {
+                const int = i32Stack.pop();
+                return int;
+            },
+        },
+        Int8: {
+            lower: (v) => {
+                i32Stack.push((v | 0));
+            },
+            lift: () => {
+                const int = i32Stack.pop();
+                return int;
+            },
+        },
+        UInt8: {
+            lower: (v) => {
+                i32Stack.push((v | 0));
+            },
+            lift: () => {
+                const int = i32Stack.pop() >>> 0;
+                return int;
+            },
+        },
+        Int16: {
+            lower: (v) => {
+                i32Stack.push((v | 0));
+            },
+            lift: () => {
+                const int = i32Stack.pop();
+                return int;
+            },
+        },
+        UInt16: {
+            lower: (v) => {
+                i32Stack.push((v | 0));
+            },
+            lift: () => {
+                const int = i32Stack.pop() >>> 0;
+                return int;
+            },
+        },
+        Int32: {
+            lower: (v) => {
+                i32Stack.push((v | 0));
+            },
+            lift: () => {
+                const int = i32Stack.pop();
+                return int;
+            },
+        },
+        UInt32: {
+            lower: (v) => {
+                i32Stack.push((v | 0));
+            },
+            lift: () => {
+                const int = i32Stack.pop() >>> 0;
+                return int;
+            },
+        },
+        UInt: {
+            lower: (v) => {
+                i32Stack.push((v | 0));
+            },
+            lift: () => {
+                const int = i32Stack.pop() >>> 0;
+                return int;
+            },
+        },
+        Int64: {
+            lower: (v) => {
+                i64Stack.push(v);
+            },
+            lift: () => {
+                const int = i64Stack.pop();
+                return int;
+            },
+        },
+        UInt64: {
+            lower: (v) => {
+                i64Stack.push(v);
+            },
+            lift: () => {
+                const int = i64Stack.pop();
+                return int;
+            },
+        },
+        Float: {
+            lower: (v) => {
+                f32Stack.push(Math.fround(v));
+            },
+            lift: () => {
+                const f32 = f32Stack.pop();
+                return f32;
+            },
+        },
+        Double: {
+            lower: (v) => {
+                f64Stack.push(v);
+            },
+            lift: () => {
+                const f64 = f64Stack.pop();
+                return f64;
+            },
+        },
+        String: __bjs_stringCodec,
+        JSValue: {
+            lower: (v) => {
+                const [vKind, vPayload1, vPayload2] = __bjs_jsValueLower(v);
+                i32Stack.push(vKind);
+                i32Stack.push(vPayload1);
+                f64Stack.push(vPayload2);
+            },
+            lift: () => {
+                const jsValuePayload2 = f64Stack.pop();
+                const jsValuePayload1 = i32Stack.pop();
+                const jsValueKind = i32Stack.pop();
+                const jsValue = __bjs_jsValueLift(jsValueKind, jsValuePayload1, jsValuePayload2);
+                return jsValue;
+            },
+        },
+    };
+
+    function __bjs_jsValueLower(value) {
+        let kind;
+        let payload1;
+        let payload2;
+        if (value === null) {
+            kind = 4;
+            payload1 = 0;
+            payload2 = 0;
+        } else {
+            switch (typeof value) {
+                case "boolean":
+                    kind = 0;
+                    payload1 = value ? 1 : 0;
+                    payload2 = 0;
+                    break;
+                case "number":
+                    kind = 2;
+                    payload1 = 0;
+                    payload2 = value;
+                    break;
+                case "string":
+                    kind = 1;
+                    payload1 = swift.memory.retain(value);
+                    payload2 = 0;
+                    break;
+                case "undefined":
+                    kind = 5;
+                    payload1 = 0;
+                    payload2 = 0;
+                    break;
+                case "object":
+                    kind = 3;
+                    payload1 = swift.memory.retain(value);
+                    payload2 = 0;
+                    break;
+                case "function":
+                    kind = 3;
+                    payload1 = swift.memory.retain(value);
+                    payload2 = 0;
+                    break;
+                case "symbol":
+                    kind = 7;
+                    payload1 = swift.memory.retain(value);
+                    payload2 = 0;
+                    break;
+                case "bigint":
+                    kind = 8;
+                    payload1 = swift.memory.retain(value);
+                    payload2 = 0;
+                    break;
+                default:
+                    throw new TypeError("Unsupported JSValue type");
+            }
+        }
+        return [kind, payload1, payload2];
+    }
+    function __bjs_jsValueLift(kind, payload1, payload2) {
+        let jsValue;
+        switch (kind) {
+            case 0:
+                jsValue = payload1 !== 0;
+                break;
+            case 1:
+                jsValue = swift.memory.getObject(payload1);
+                break;
+            case 2:
+                jsValue = payload2;
+                break;
+            case 3:
+                jsValue = swift.memory.getObject(payload1);
+                break;
+            case 4:
+                jsValue = null;
+                break;
+            case 5:
+                jsValue = undefined;
+                break;
+            case 7:
+                jsValue = swift.memory.getObject(payload1);
+                break;
+            case 8:
+                jsValue = swift.memory.getObject(payload1);
+                break;
+            default:
+                throw new TypeError("Unsupported JSValue kind " + kind);
+        }
+        return jsValue;
+    }
+
+    const __bjs_codec_M10TestModuleT24MyViewControllerDelegate = {
+        lower: (v) => {
+            const objId = swift.memory.retain(v);
+            i32Stack.push(objId);
+        },
+        lift: () => {
+            const objId = i32Stack.pop();
+            const obj = swift.memory.getObject(objId);
+            swift.memory.release(objId);
+            return obj;
+        },
+    };
+    const __bjs_codec_Array_M10TestModuleT24MyViewControllerDelegate = __bjs_arrayCodec(__bjs_codec_M10TestModuleT24MyViewControllerDelegate);
+    const __bjs_codec_Dict_M10TestModuleT24MyViewControllerDelegate = __bjs_dictCodec(__bjs_codec_M10TestModuleT24MyViewControllerDelegate);
+
+    const __bjs_createEnumHelpers_M10TestModuleT6Result = () => ({
         lower: (value) => {
             const enumTag = value.tag;
             switch (enumTag) {
@@ -102,14 +440,14 @@ export async function createInstantiator(options, swift) {
             bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) {
                 const source = swift.memory.getObject(sourceId);
                 swift.memory.release(sourceId);
-                const bytes = new Uint8Array(memory.buffer, bytesPtr);
+                const bytes = new Uint8Array(memory.buffer, bytesPtr >>> 0);
                 bytes.set(source);
             }
             bjs["swift_js_make_js_string"] = function(ptr, len) {
                 return swift.memory.retain(decodeString(ptr, len));
             }
             bjs["swift_js_init_memory_with_result"] = function(ptr, len) {
-                const target = new Uint8Array(memory.buffer, ptr, len);
+                const target = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0);
                 target.set(tmpRetBytes);
                 tmpRetBytes = undefined;
             }
@@ -163,6 +501,15 @@ export async function createInstantiator(options, swift) {
                 const copy = memory.buffer.slice(ptr, ptr + byteLen);
                 taStack.push(Array.from(new Ctor(copy)));
             }
+            bjs["bjs_core_register_type_handles"] = function() {};
+            bjs["bjs_TestModule_register_type_handles"] = function() {};
+            const __bjs_promiseSettlers = Symbol("JavaScriptKit.promiseSettlers");
+            bjs["swift_js_make_promise"] = function() {
+                let resolve, reject;
+                const promise = new Promise((res, rej) => { resolve = res; reject = rej; });
+                promise[__bjs_promiseSettlers] = { resolve, reject };
+                return swift.memory.retain(promise);
+            }
             bjs["swift_js_return_optional_bool"] = function(isSome, value) {
                 if (isSome === 0) {
                     tmpRetOptionalBool = null;
@@ -359,7 +706,7 @@ export async function createInstantiator(options, swift) {
             TestModule["bjs_MyViewControllerDelegate_result_get"] = function bjs_MyViewControllerDelegate_result_get(self) {
                 try {
                     let ret = swift.memory.getObject(self).result;
-                    const caseId = enumHelpers.Result.lower(ret);
+                    const caseId = enumHelpers.M10TestModuleT6Result.lower(ret);
                     return caseId;
                 } catch (error) {
                     setException(error);
@@ -367,7 +714,7 @@ export async function createInstantiator(options, swift) {
             }
             TestModule["bjs_MyViewControllerDelegate_result_set"] = function bjs_MyViewControllerDelegate_result_set(self, value) {
                 try {
-                    const enumValue = enumHelpers.Result.lift(value);
+                    const enumValue = enumHelpers.M10TestModuleT6Result.lift(value);
                     swift.memory.getObject(self).result = enumValue;
                 } catch (error) {
                     setException(error);
@@ -378,7 +725,7 @@ export async function createInstantiator(options, swift) {
                     let ret = swift.memory.getObject(self).optionalResult;
                     const isSome = ret != null;
                     if (isSome) {
-                        const caseId = enumHelpers.Result.lower(ret);
+                        const caseId = enumHelpers.M10TestModuleT6Result.lower(ret);
                         return caseId;
                     } else {
                         return -1;
@@ -391,7 +738,7 @@ export async function createInstantiator(options, swift) {
                 try {
                     let optResult;
                     if (valueIsSome) {
-                        const enumValue = enumHelpers.Result.lift(valueCaseId);
+                        const enumValue = enumHelpers.M10TestModuleT6Result.lift(valueCaseId);
                         optResult = enumValue;
                     } else {
                         optResult = null;
@@ -549,7 +896,7 @@ export async function createInstantiator(options, swift) {
             }
             TestModule["bjs_MyViewControllerDelegate_handleResult"] = function bjs_MyViewControllerDelegate_handleResult(self, result) {
                 try {
-                    const enumValue = enumHelpers.Result.lift(result);
+                    const enumValue = enumHelpers.M10TestModuleT6Result.lift(result);
                     swift.memory.getObject(self).handleResult(enumValue);
                 } catch (error) {
                     setException(error);
@@ -558,7 +905,7 @@ export async function createInstantiator(options, swift) {
             TestModule["bjs_MyViewControllerDelegate_getResult"] = function bjs_MyViewControllerDelegate_getResult(self) {
                 try {
                     let ret = swift.memory.getObject(self).getResult();
-                    const caseId = enumHelpers.Result.lower(ret);
+                    const caseId = enumHelpers.M10TestModuleT6Result.lower(ret);
                     return caseId;
                 } catch (error) {
                     setException(error);
@@ -590,6 +937,7 @@ export async function createInstantiator(options, swift) {
             /// Represents a Swift heap object like a class instance or an actor instance.
             class SwiftHeapObject {
                 static __wrap(pointer, deinit, prototype, identityCache) {
+                    pointer = pointer >>> 0;
                     const makeFresh = (identityMap) => {
                         const obj = Object.create(prototype);
                         const state = { pointer, deinit, hasReleased: false, identityMap };
@@ -716,11 +1064,7 @@ export async function createInstantiator(options, swift) {
                 }
 
                 constructor(delegates) {
-                    for (const elem of delegates) {
-                        const objId = swift.memory.retain(elem);
-                        i32Stack.push(objId);
-                    }
-                    i32Stack.push(delegates.length);
+                    __bjs_codec_Array_M10TestModuleT24MyViewControllerDelegate.lower(delegates);
                     const ret = instance.exports.bjs_DelegateManager_init();
                     return DelegateManager.__construct(ret);
                 }
@@ -729,116 +1073,46 @@ export async function createInstantiator(options, swift) {
                 }
                 get delegates() {
                     instance.exports.bjs_DelegateManager_delegates_get(this.pointer);
-                    const arrayLen = i32Stack.pop();
-                    let arrayResult;
-                    if (arrayLen === -1) {
-                        arrayResult = taStack.pop();
-                    } else {
-                        arrayResult = [];
-                        for (let i = 0; i < arrayLen; i++) {
-                            const objId = i32Stack.pop();
-                            const obj = swift.memory.getObject(objId);
-                            swift.memory.release(objId);
-                            arrayResult.push(obj);
-                        }
-                        arrayResult.reverse();
-                    }
+                    const arrayResult = __bjs_codec_Array_M10TestModuleT24MyViewControllerDelegate.lift();
                     return arrayResult;
                 }
                 set delegates(value) {
-                    for (const elem of value) {
-                        const objId = swift.memory.retain(elem);
-                        i32Stack.push(objId);
-                    }
-                    i32Stack.push(value.length);
+                    __bjs_codec_Array_M10TestModuleT24MyViewControllerDelegate.lower(value);
                     instance.exports.bjs_DelegateManager_delegates_set(this.pointer);
                 }
                 get delegatesByName() {
                     instance.exports.bjs_DelegateManager_delegatesByName_get(this.pointer);
-                    const dictLen = i32Stack.pop();
-                    const dictResult = {};
-                    for (let i = 0; i < dictLen; i++) {
-                        const objId = i32Stack.pop();
-                        const obj = swift.memory.getObject(objId);
-                        swift.memory.release(objId);
-                        const string = strStack.pop();
-                        dictResult[string] = obj;
-                    }
+                    const dictResult = __bjs_codec_Dict_M10TestModuleT24MyViewControllerDelegate.lift();
                     return dictResult;
                 }
                 set delegatesByName(value) {
-                    const entries = Object.entries(value);
-                    for (const entry of entries) {
-                        const [key, value1] = entry;
-                        const bytes = textEncoder.encode(key);
-                        const id = swift.memory.retain(bytes);
-                        i32Stack.push(bytes.length);
-                        i32Stack.push(id);
-                        const objId = swift.memory.retain(value1);
-                        i32Stack.push(objId);
-                    }
-                    i32Stack.push(entries.length);
+                    __bjs_codec_Dict_M10TestModuleT24MyViewControllerDelegate.lower(value);
                     instance.exports.bjs_DelegateManager_delegatesByName_set(this.pointer);
                 }
             }
-            const ResultHelpers = __bjs_createResultValuesHelpers();
-            enumHelpers.Result = ResultHelpers;
+            const __bjs_helpers_M10TestModuleT6Result = __bjs_createEnumHelpers_M10TestModuleT6Result();
+            enumHelpers.M10TestModuleT6Result = __bjs_helpers_M10TestModuleT6Result;
 
             const exports = {
-                Helper,
-                MyViewController,
-                DelegateManager,
                 processDelegates: function bjs_processDelegates(delegates) {
-                    for (const elem of delegates) {
-                        const objId = swift.memory.retain(elem);
-                        i32Stack.push(objId);
-                    }
-                    i32Stack.push(delegates.length);
+                    __bjs_codec_Array_M10TestModuleT24MyViewControllerDelegate.lower(delegates);
                     instance.exports.bjs_processDelegates();
-                    const arrayLen = i32Stack.pop();
-                    let arrayResult;
-                    if (arrayLen === -1) {
-                        arrayResult = taStack.pop();
-                    } else {
-                        arrayResult = [];
-                        for (let i = 0; i < arrayLen; i++) {
-                            const objId1 = i32Stack.pop();
-                            const obj = swift.memory.getObject(objId1);
-                            swift.memory.release(objId1);
-                            arrayResult.push(obj);
-                        }
-                        arrayResult.reverse();
-                    }
+                    const arrayResult = __bjs_codec_Array_M10TestModuleT24MyViewControllerDelegate.lift();
                     return arrayResult;
                 },
                 processDelegatesByName: function bjs_processDelegatesByName(delegates) {
-                    const entries = Object.entries(delegates);
-                    for (const entry of entries) {
-                        const [key, value] = entry;
-                        const bytes = textEncoder.encode(key);
-                        const id = swift.memory.retain(bytes);
-                        i32Stack.push(bytes.length);
-                        i32Stack.push(id);
-                        const objId = swift.memory.retain(value);
-                        i32Stack.push(objId);
-                    }
-                    i32Stack.push(entries.length);
+                    __bjs_codec_Dict_M10TestModuleT24MyViewControllerDelegate.lower(delegates);
                     instance.exports.bjs_processDelegatesByName();
-                    const dictLen = i32Stack.pop();
-                    const dictResult = {};
-                    for (let i = 0; i < dictLen; i++) {
-                        const objId1 = i32Stack.pop();
-                        const obj = swift.memory.getObject(objId1);
-                        swift.memory.release(objId1);
-                        const string = strStack.pop();
-                        dictResult[string] = obj;
-                    }
+                    const dictResult = __bjs_codec_Dict_M10TestModuleT24MyViewControllerDelegate.lift();
                     return dictResult;
                 },
                 Direction: DirectionValues,
                 ExampleEnum: ExampleEnumValues,
                 Result: ResultValues,
                 Priority: PriorityValues,
+                DelegateManager,
+                Helper,
+                MyViewController,
             };
             _exports = exports;
             return exports;
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ProtocolInClosure.d.ts b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ProtocolInClosure.d.ts
index 6b7a9d28d..7d5a3c9aa 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ProtocolInClosure.d.ts
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ProtocolInClosure.d.ts
@@ -19,13 +19,13 @@ export interface Widget extends SwiftHeapObject {
     name: string;
 }
 export type Exports = {
-    Widget: {
-        new(name: string): Widget;
-    }
     processRenderable(item: Renderable, transform: (arg0: Renderable) => string): string;
     makeRenderableFactory(defaultName: string): () => Renderable;
     roundtripRenderable(callback: (arg0: Renderable) => Renderable): (arg0: Renderable) => Renderable;
     processOptionalRenderable(callback: (arg0: Renderable | null) => string): string;
+    Widget: {
+        new(name: string): Widget;
+    },
 }
 export type Imports = {
 }
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ProtocolInClosure.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ProtocolInClosure.js
index 89f84d29a..eed26c581 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ProtocolInClosure.js
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ProtocolInClosure.js
@@ -39,7 +39,7 @@ export async function createInstantiator(options, swift) {
         const state = { pointer, file, line, unregistered: false };
         const real = (...args) => {
             if (state.unregistered) {
-                const bytes = new Uint8Array(memory.buffer, state.file);
+                const bytes = new Uint8Array(memory.buffer, state.file >>> 0);
                 let length = 0;
                 while (bytes[length] !== 0) { length += 1; }
                 const fileID = decodeString(state.file, length);
@@ -70,14 +70,14 @@ export async function createInstantiator(options, swift) {
             bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) {
                 const source = swift.memory.getObject(sourceId);
                 swift.memory.release(sourceId);
-                const bytes = new Uint8Array(memory.buffer, bytesPtr);
+                const bytes = new Uint8Array(memory.buffer, bytesPtr >>> 0);
                 bytes.set(source);
             }
             bjs["swift_js_make_js_string"] = function(ptr, len) {
                 return swift.memory.retain(decodeString(ptr, len));
             }
             bjs["swift_js_init_memory_with_result"] = function(ptr, len) {
-                const target = new Uint8Array(memory.buffer, ptr, len);
+                const target = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0);
                 target.set(tmpRetBytes);
                 tmpRetBytes = undefined;
             }
@@ -131,6 +131,14 @@ export async function createInstantiator(options, swift) {
                 const copy = memory.buffer.slice(ptr, ptr + byteLen);
                 taStack.push(Array.from(new Ctor(copy)));
             }
+            bjs["bjs_core_register_type_handles"] = function() {};
+            const __bjs_promiseSettlers = Symbol("JavaScriptKit.promiseSettlers");
+            bjs["swift_js_make_promise"] = function() {
+                let resolve, reject;
+                const promise = new Promise((res, rej) => { resolve = res; reject = rej; });
+                promise[__bjs_promiseSettlers] = { resolve, reject };
+                return swift.memory.retain(promise);
+            }
             bjs["swift_js_return_optional_bool"] = function(isSome, value) {
                 if (isSome === 0) {
                     tmpRetOptionalBool = null;
@@ -376,6 +384,7 @@ export async function createInstantiator(options, swift) {
             /// Represents a Swift heap object like a class instance or an actor instance.
             class SwiftHeapObject {
                 static __wrap(pointer, deinit, prototype, identityCache) {
+                    pointer = pointer >>> 0;
                     const makeFresh = (identityMap) => {
                         const obj = Object.create(prototype);
                         const state = { pointer, deinit, hasReleased: false, identityMap };
@@ -439,7 +448,6 @@ export async function createInstantiator(options, swift) {
                 }
             }
             const exports = {
-                Widget,
                 processRenderable: function bjs_processRenderable(item, transform) {
                     const callbackId = swift.memory.retain(transform);
                     instance.exports.bjs_processRenderable(swift.memory.retain(item), callbackId);
@@ -465,6 +473,7 @@ export async function createInstantiator(options, swift) {
                     tmpRetString = undefined;
                     return ret;
                 },
+                Widget,
             };
             _exports = exports;
             return exports;
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/RelativeQualifiedTypes.d.ts b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/RelativeQualifiedTypes.d.ts
new file mode 100644
index 000000000..1297973a9
--- /dev/null
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/RelativeQualifiedTypes.d.ts
@@ -0,0 +1,70 @@
+// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit,
+// DO NOT EDIT.
+//
+// To update this file, just rebuild your project or run
+// `swift package bridge-js`.
+
+export namespace Library {
+    export interface Shelf {
+    }
+    export namespace Shelf {
+        export interface Divider {
+            slot: number;
+        }
+    }
+}
+export namespace Outer {
+    export interface Inner {
+        marker(): number;
+    }
+    export namespace Inner {
+        export interface Outer {
+        }
+        export namespace Outer {
+            export interface Inner {
+            }
+        }
+    }
+}
+/// Represents a Swift heap object like a class instance or an actor instance.
+export interface SwiftHeapObject {
+    /// Release the heap object.
+    ///
+    /// Note: Calling this method will release the heap object and it will no longer be accessible.
+    release(): void;
+}
+export interface Library extends SwiftHeapObject {
+    divider(value: Library.Shelf.Divider): Library.Shelf.Divider;
+}
+export interface Outer extends SwiftHeapObject {
+}
+export type Exports = {
+    Library: {
+        new(): Library;
+        Shelf: {
+            Divider: {
+                init(slot: number): Library.Shelf.Divider;
+            },
+        },
+    },
+    Outer: {
+        new(): Outer;
+        Inner: {
+            init(): Outer.Inner;
+            Outer: {
+                Inner: {
+                    init(): Outer.Inner.Outer.Inner;
+                },
+            },
+        },
+    },
+}
+export type Imports = {
+}
+export function createInstantiator(options: {
+    imports: Imports;
+}, swift: any): Promise<{
+    addImports: (importObject: WebAssembly.Imports) => void;
+    setInstance: (instance: WebAssembly.Instance) => void;
+    createExports: (instance: WebAssembly.Instance) => Exports;
+}>;
\ No newline at end of file
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/RelativeQualifiedTypes.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/RelativeQualifiedTypes.js
new file mode 100644
index 000000000..2765d709f
--- /dev/null
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/RelativeQualifiedTypes.js
@@ -0,0 +1,440 @@
+// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit,
+// DO NOT EDIT.
+//
+// To update this file, just rebuild your project or run
+// `swift package bridge-js`.
+
+export async function createInstantiator(options, swift) {
+    let instance;
+    let memory;
+    let setException;
+    let decodeString;
+    const textDecoder = new TextDecoder("utf-8");
+    const textEncoder = new TextEncoder("utf-8");
+    let tmpRetString;
+    let tmpRetBytes;
+    let tmpRetException;
+    let tmpRetOptionalBool;
+    let tmpRetOptionalInt;
+    let tmpRetOptionalFloat;
+    let tmpRetOptionalDouble;
+    let tmpRetOptionalHeapObject;
+    let strStack = [];
+    let i32Stack = [];
+    let i64Stack = [];
+    let f32Stack = [];
+    let f64Stack = [];
+    let ptrStack = [];
+    let taStack = [];
+    const enumHelpers = {};
+    const structHelpers = {};
+
+    let _exports = null;
+    let bjs = null;
+    const __bjs_createStructHelpers_M10TestModuleT7LibraryT5Shelf = () => ({
+        lower: (value) => {
+        },
+        lift: () => {
+            return {  };
+        }
+    });
+    const __bjs_createStructHelpers_M10TestModuleT7LibraryT5ShelfT7Divider = () => ({
+        lower: (value) => {
+            i32Stack.push((value.slot | 0));
+        },
+        lift: () => {
+            const int = i32Stack.pop();
+            return { slot: int };
+        }
+    });
+    const __bjs_createStructHelpers_M10TestModuleT5OuterT5Inner = () => ({
+        lower: (value) => {
+        },
+        lift: () => {
+            const instance1 = {  };
+            instance1.marker = function() {
+                structHelpers.M10TestModuleT5OuterT5Inner.lower(this);
+                const ret = instance.exports.bjs_Outer_Inner_marker();
+                return ret;
+            }.bind(instance1);
+            return instance1;
+        }
+    });
+    const __bjs_createStructHelpers_M10TestModuleT5OuterT5InnerT5Outer = () => ({
+        lower: (value) => {
+        },
+        lift: () => {
+            return {  };
+        }
+    });
+    const __bjs_createStructHelpers_M10TestModuleT5OuterT5InnerT5OuterT5Inner = () => ({
+        lower: (value) => {
+        },
+        lift: () => {
+            return {  };
+        }
+    });
+
+    return {
+        /**
+         * @param {WebAssembly.Imports} importObject
+         */
+        addImports: (importObject, importsContext) => {
+            bjs = {};
+            importObject["bjs"] = bjs;
+            bjs["swift_js_return_string"] = function(ptr, len) {
+                tmpRetString = decodeString(ptr, len);
+            }
+            bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) {
+                const source = swift.memory.getObject(sourceId);
+                swift.memory.release(sourceId);
+                const bytes = new Uint8Array(memory.buffer, bytesPtr >>> 0);
+                bytes.set(source);
+            }
+            bjs["swift_js_make_js_string"] = function(ptr, len) {
+                return swift.memory.retain(decodeString(ptr, len));
+            }
+            bjs["swift_js_init_memory_with_result"] = function(ptr, len) {
+                const target = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0);
+                target.set(tmpRetBytes);
+                tmpRetBytes = undefined;
+            }
+            bjs["swift_js_throw"] = function(id) {
+                tmpRetException = swift.memory.retainByRef(id);
+            }
+            bjs["swift_js_retain"] = function(id) {
+                return swift.memory.retainByRef(id);
+            }
+            bjs["swift_js_release"] = function(id) {
+                swift.memory.release(id);
+            }
+            bjs["swift_js_push_i32"] = function(v) {
+                i32Stack.push(v | 0);
+            }
+            bjs["swift_js_push_f32"] = function(v) {
+                f32Stack.push(Math.fround(v));
+            }
+            bjs["swift_js_push_f64"] = function(v) {
+                f64Stack.push(v);
+            }
+            bjs["swift_js_push_string"] = function(ptr, len) {
+                const value = decodeString(ptr, len);
+                strStack.push(value);
+            }
+            bjs["swift_js_pop_i32"] = function() {
+                return i32Stack.pop();
+            }
+            bjs["swift_js_pop_f32"] = function() {
+                return f32Stack.pop();
+            }
+            bjs["swift_js_pop_f64"] = function() {
+                return f64Stack.pop();
+            }
+            bjs["swift_js_push_pointer"] = function(pointer) {
+                ptrStack.push(pointer);
+            }
+            bjs["swift_js_pop_pointer"] = function() {
+                return ptrStack.pop();
+            }
+            bjs["swift_js_push_i64"] = function(v) {
+                i64Stack.push(v);
+            }
+            bjs["swift_js_pop_i64"] = function() {
+                return i64Stack.pop();
+            }
+            const taCtors = [Int8Array, Uint8Array, Int16Array, Uint16Array, Int32Array, Uint32Array, Float32Array, Float64Array];
+            bjs["swift_js_push_typed_array"] = function(kind, ptr, count) {
+                const Ctor = taCtors[kind];
+                const byteLen = count * Ctor.BYTES_PER_ELEMENT;
+                const copy = memory.buffer.slice(ptr, ptr + byteLen);
+                taStack.push(Array.from(new Ctor(copy)));
+            }
+            bjs["swift_js_struct_lower_Library_Shelf"] = function(objectId) {
+                structHelpers.M10TestModuleT7LibraryT5Shelf.lower(swift.memory.getObject(objectId));
+            }
+            bjs["swift_js_struct_lift_Library_Shelf"] = function() {
+                const value = structHelpers.M10TestModuleT7LibraryT5Shelf.lift();
+                return swift.memory.retain(value);
+            }
+            bjs["swift_js_struct_lower_Library_Shelf_Divider"] = function(objectId) {
+                structHelpers.M10TestModuleT7LibraryT5ShelfT7Divider.lower(swift.memory.getObject(objectId));
+            }
+            bjs["swift_js_struct_lift_Library_Shelf_Divider"] = function() {
+                const value = structHelpers.M10TestModuleT7LibraryT5ShelfT7Divider.lift();
+                return swift.memory.retain(value);
+            }
+            bjs["swift_js_struct_lower_Outer_Inner"] = function(objectId) {
+                structHelpers.M10TestModuleT5OuterT5Inner.lower(swift.memory.getObject(objectId));
+            }
+            bjs["swift_js_struct_lift_Outer_Inner"] = function() {
+                const value = structHelpers.M10TestModuleT5OuterT5Inner.lift();
+                return swift.memory.retain(value);
+            }
+            bjs["swift_js_struct_lower_Outer_Inner_Outer"] = function(objectId) {
+                structHelpers.M10TestModuleT5OuterT5InnerT5Outer.lower(swift.memory.getObject(objectId));
+            }
+            bjs["swift_js_struct_lift_Outer_Inner_Outer"] = function() {
+                const value = structHelpers.M10TestModuleT5OuterT5InnerT5Outer.lift();
+                return swift.memory.retain(value);
+            }
+            bjs["swift_js_struct_lower_Outer_Inner_Outer_Inner"] = function(objectId) {
+                structHelpers.M10TestModuleT5OuterT5InnerT5OuterT5Inner.lower(swift.memory.getObject(objectId));
+            }
+            bjs["swift_js_struct_lift_Outer_Inner_Outer_Inner"] = function() {
+                const value = structHelpers.M10TestModuleT5OuterT5InnerT5OuterT5Inner.lift();
+                return swift.memory.retain(value);
+            }
+            bjs["bjs_core_register_type_handles"] = function() {};
+            bjs["bjs_TestModule_register_type_handles"] = function() {};
+            const __bjs_promiseSettlers = Symbol("JavaScriptKit.promiseSettlers");
+            bjs["swift_js_make_promise"] = function() {
+                let resolve, reject;
+                const promise = new Promise((res, rej) => { resolve = res; reject = rej; });
+                promise[__bjs_promiseSettlers] = { resolve, reject };
+                return swift.memory.retain(promise);
+            }
+            bjs["swift_js_return_optional_bool"] = function(isSome, value) {
+                if (isSome === 0) {
+                    tmpRetOptionalBool = null;
+                } else {
+                    tmpRetOptionalBool = value !== 0;
+                }
+            }
+            bjs["swift_js_return_optional_int"] = function(isSome, value) {
+                if (isSome === 0) {
+                    tmpRetOptionalInt = null;
+                } else {
+                    tmpRetOptionalInt = value | 0;
+                }
+            }
+            bjs["swift_js_return_optional_float"] = function(isSome, value) {
+                if (isSome === 0) {
+                    tmpRetOptionalFloat = null;
+                } else {
+                    tmpRetOptionalFloat = Math.fround(value);
+                }
+            }
+            bjs["swift_js_return_optional_double"] = function(isSome, value) {
+                if (isSome === 0) {
+                    tmpRetOptionalDouble = null;
+                } else {
+                    tmpRetOptionalDouble = value;
+                }
+            }
+            bjs["swift_js_return_optional_string"] = function(isSome, ptr, len) {
+                if (isSome === 0) {
+                    tmpRetString = null;
+                } else {
+                    tmpRetString = decodeString(ptr, len);
+                }
+            }
+            bjs["swift_js_return_optional_object"] = function(isSome, objectId) {
+                if (isSome === 0) {
+                    tmpRetString = null;
+                } else {
+                    tmpRetString = swift.memory.getObject(objectId);
+                }
+            }
+            bjs["swift_js_return_optional_heap_object"] = function(isSome, pointer) {
+                if (isSome === 0) {
+                    tmpRetOptionalHeapObject = null;
+                } else {
+                    tmpRetOptionalHeapObject = pointer;
+                }
+            }
+            bjs["swift_js_get_optional_int_presence"] = function() {
+                return tmpRetOptionalInt != null ? 1 : 0;
+            }
+            bjs["swift_js_get_optional_int_value"] = function() {
+                const value = tmpRetOptionalInt;
+                tmpRetOptionalInt = undefined;
+                return value;
+            }
+            bjs["swift_js_get_optional_string"] = function() {
+                const str = tmpRetString;
+                tmpRetString = undefined;
+                if (str == null) {
+                    return -1;
+                } else {
+                    const bytes = textEncoder.encode(str);
+                    tmpRetBytes = bytes;
+                    return bytes.length;
+                }
+            }
+            bjs["swift_js_get_optional_float_presence"] = function() {
+                return tmpRetOptionalFloat != null ? 1 : 0;
+            }
+            bjs["swift_js_get_optional_float_value"] = function() {
+                const value = tmpRetOptionalFloat;
+                tmpRetOptionalFloat = undefined;
+                return value;
+            }
+            bjs["swift_js_get_optional_double_presence"] = function() {
+                return tmpRetOptionalDouble != null ? 1 : 0;
+            }
+            bjs["swift_js_get_optional_double_value"] = function() {
+                const value = tmpRetOptionalDouble;
+                tmpRetOptionalDouble = undefined;
+                return value;
+            }
+            bjs["swift_js_get_optional_heap_object_pointer"] = function() {
+                const pointer = tmpRetOptionalHeapObject;
+                tmpRetOptionalHeapObject = undefined;
+                return pointer || 0;
+            }
+            bjs["swift_js_closure_unregister"] = function(funcRef) {}
+            // Wrapper functions for module: TestModule
+            if (!importObject["TestModule"]) {
+                importObject["TestModule"] = {};
+            }
+            importObject["TestModule"]["bjs_Library_wrap"] = function(pointer) {
+                const obj = _exports['Library'].__construct(pointer);
+                return swift.memory.retain(obj);
+            };
+            importObject["TestModule"]["bjs_Outer_wrap"] = function(pointer) {
+                const obj = _exports['Outer'].__construct(pointer);
+                return swift.memory.retain(obj);
+            };
+        },
+        setInstance: (i) => {
+            instance = i;
+            memory = instance.exports.memory;
+
+            decodeString = (ptr, len) => { const bytes = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); return textDecoder.decode(bytes); }
+
+            setException = (error) => {
+                instance.exports._swift_js_exception.value = swift.memory.retain(error)
+            }
+        },
+        /** @param {WebAssembly.Instance} instance */
+        createExports: (instance) => {
+            const js = swift.memory.heap;
+            const swiftHeapObjectFinalizationRegistry = (typeof FinalizationRegistry === "undefined") ? { register: () => {}, unregister: () => {} } : new FinalizationRegistry((state) => {
+                if (state.hasReleased) {
+                    return;
+                }
+                state.hasReleased = true;
+                state.identityMap?.delete(state.pointer);
+                state.deinit(state.pointer);
+            });
+
+            /// Represents a Swift heap object like a class instance or an actor instance.
+            class SwiftHeapObject {
+                static __wrap(pointer, deinit, prototype, identityCache) {
+                    pointer = pointer >>> 0;
+                    const makeFresh = (identityMap) => {
+                        const obj = Object.create(prototype);
+                        const state = { pointer, deinit, hasReleased: false, identityMap };
+                        obj.pointer = pointer;
+                        obj.__swiftHeapObjectState = state;
+                        swiftHeapObjectFinalizationRegistry.register(obj, state, state);
+                        if (identityMap) {
+                            identityMap.set(pointer, new WeakRef(obj));
+                        }
+                        return obj;
+                    };
+
+                    if (!identityCache) {
+                        return makeFresh(null);
+                    }
+
+                    const cached = identityCache.get(pointer)?.deref();
+                    if (cached && !cached.__swiftHeapObjectState.hasReleased) {
+                        deinit(pointer);
+                        return cached;
+                    }
+                    if (identityCache.has(pointer)) {
+                        identityCache.delete(pointer);
+                    }
+
+                    return makeFresh(identityCache);
+                }
+
+                release() {
+                    const state = this.__swiftHeapObjectState;
+                    if (state.hasReleased) {
+                        return;
+                    }
+                    state.hasReleased = true;
+                    swiftHeapObjectFinalizationRegistry.unregister(state);
+                    state.identityMap?.delete(state.pointer);
+                    state.deinit(state.pointer);
+                }
+            }
+            class Library extends SwiftHeapObject {
+                static __construct(ptr) {
+                    return SwiftHeapObject.__wrap(ptr, instance.exports.bjs_Library_deinit, Library.prototype, null);
+                }
+
+                constructor() {
+                    const ret = instance.exports.bjs_Library_init();
+                    return Library.__construct(ret);
+                }
+                divider(value) {
+                    structHelpers.M10TestModuleT7LibraryT5ShelfT7Divider.lower(value);
+                    instance.exports.bjs_Library_divider(this.pointer);
+                    const structValue = structHelpers.M10TestModuleT7LibraryT5ShelfT7Divider.lift();
+                    return structValue;
+                }
+            }
+            class Outer extends SwiftHeapObject {
+                static __construct(ptr) {
+                    return SwiftHeapObject.__wrap(ptr, instance.exports.bjs_Outer_deinit, Outer.prototype, null);
+                }
+
+                constructor() {
+                    const ret = instance.exports.bjs_Outer_init();
+                    return Outer.__construct(ret);
+                }
+            }
+            const __bjs_helpers_M10TestModuleT7LibraryT5Shelf = __bjs_createStructHelpers_M10TestModuleT7LibraryT5Shelf();
+            structHelpers.M10TestModuleT7LibraryT5Shelf = __bjs_helpers_M10TestModuleT7LibraryT5Shelf;
+
+            const __bjs_helpers_M10TestModuleT7LibraryT5ShelfT7Divider = __bjs_createStructHelpers_M10TestModuleT7LibraryT5ShelfT7Divider();
+            structHelpers.M10TestModuleT7LibraryT5ShelfT7Divider = __bjs_helpers_M10TestModuleT7LibraryT5ShelfT7Divider;
+
+            const __bjs_helpers_M10TestModuleT5OuterT5Inner = __bjs_createStructHelpers_M10TestModuleT5OuterT5Inner();
+            structHelpers.M10TestModuleT5OuterT5Inner = __bjs_helpers_M10TestModuleT5OuterT5Inner;
+
+            const __bjs_helpers_M10TestModuleT5OuterT5InnerT5Outer = __bjs_createStructHelpers_M10TestModuleT5OuterT5InnerT5Outer();
+            structHelpers.M10TestModuleT5OuterT5InnerT5Outer = __bjs_helpers_M10TestModuleT5OuterT5InnerT5Outer;
+
+            const __bjs_helpers_M10TestModuleT5OuterT5InnerT5OuterT5Inner = __bjs_createStructHelpers_M10TestModuleT5OuterT5InnerT5OuterT5Inner();
+            structHelpers.M10TestModuleT5OuterT5InnerT5OuterT5Inner = __bjs_helpers_M10TestModuleT5OuterT5InnerT5OuterT5Inner;
+
+            const exports = {
+                Library: Object.assign(Library, {
+                    Shelf: {
+                        Divider: {
+                            init: function(slot) {
+                                instance.exports.bjs_Library_Shelf_Divider_init(slot);
+                                const structValue = structHelpers.M10TestModuleT7LibraryT5ShelfT7Divider.lift();
+                                return structValue;
+                            },
+                        },
+                    },
+                }),
+                Outer: Object.assign(Outer, {
+                    Inner: {
+                        init: function() {
+                            instance.exports.bjs_Outer_Inner_init();
+                            const structValue = structHelpers.M10TestModuleT5OuterT5Inner.lift();
+                            return structValue;
+                        },
+                        Outer: {
+                            Inner: {
+                                init: function() {
+                                    instance.exports.bjs_Outer_Inner_Outer_Inner_init();
+                                    const structValue = structHelpers.M10TestModuleT5OuterT5InnerT5OuterT5Inner.lift();
+                                    return structValue;
+                                },
+                            },
+                        },
+                    },
+                }),
+            };
+            _exports = exports;
+            return exports;
+        },
+    }
+}
\ No newline at end of file
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.Global.d.ts b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.Global.d.ts
index 5916e1648..e5602e42d 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.Global.d.ts
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.Global.d.ts
@@ -51,15 +51,15 @@ export interface MathUtils extends SwiftHeapObject {
     multiply(x: number, y: number): number;
 }
 export type Exports = {
+    Calculator: CalculatorObject
+    APIResult: APIResultObject
     MathUtils: {
         new(): MathUtils;
         subtract(a: number, b: number): number;
         add(a: number, b: number): number;
         divide(a: number, b: number): number;
         readonly pi: number;
-    }
-    Calculator: CalculatorObject
-    APIResult: APIResultObject
+    },
     Utils: {
         String: {
             uppercase(text: string): string;
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.Global.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.Global.js
index 32a739587..f46f42d10 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.Global.js
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.Global.js
@@ -42,7 +42,7 @@ export async function createInstantiator(options, swift) {
 
     let _exports = null;
     let bjs = null;
-    const __bjs_createAPIResultValuesHelpers = () => ({
+    const __bjs_createEnumHelpers_M10TestModuleT9APIResult = () => ({
         lower: (value) => {
             const enumTag = value.tag;
             switch (enumTag) {
@@ -89,14 +89,14 @@ export async function createInstantiator(options, swift) {
             bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) {
                 const source = swift.memory.getObject(sourceId);
                 swift.memory.release(sourceId);
-                const bytes = new Uint8Array(memory.buffer, bytesPtr);
+                const bytes = new Uint8Array(memory.buffer, bytesPtr >>> 0);
                 bytes.set(source);
             }
             bjs["swift_js_make_js_string"] = function(ptr, len) {
                 return swift.memory.retain(decodeString(ptr, len));
             }
             bjs["swift_js_init_memory_with_result"] = function(ptr, len) {
-                const target = new Uint8Array(memory.buffer, ptr, len);
+                const target = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0);
                 target.set(tmpRetBytes);
                 tmpRetBytes = undefined;
             }
@@ -150,6 +150,15 @@ export async function createInstantiator(options, swift) {
                 const copy = memory.buffer.slice(ptr, ptr + byteLen);
                 taStack.push(Array.from(new Ctor(copy)));
             }
+            bjs["bjs_core_register_type_handles"] = function() {};
+            bjs["bjs_TestModule_register_type_handles"] = function() {};
+            const __bjs_promiseSettlers = Symbol("JavaScriptKit.promiseSettlers");
+            bjs["swift_js_make_promise"] = function() {
+                let resolve, reject;
+                const promise = new Promise((res, rej) => { resolve = res; reject = rej; });
+                promise[__bjs_promiseSettlers] = { resolve, reject };
+                return swift.memory.retain(promise);
+            }
             bjs["swift_js_return_optional_bool"] = function(isSome, value) {
                 if (isSome === 0) {
                     tmpRetOptionalBool = null;
@@ -274,6 +283,7 @@ export async function createInstantiator(options, swift) {
             /// Represents a Swift heap object like a class instance or an actor instance.
             class SwiftHeapObject {
                 static __wrap(pointer, deinit, prototype, identityCache) {
+                    pointer = pointer >>> 0;
                     const makeFresh = (identityMap) => {
                         const obj = Object.create(prototype);
                         const state = { pointer, deinit, hasReleased: false, identityMap };
@@ -343,8 +353,8 @@ export async function createInstantiator(options, swift) {
                     return ret;
                 }
             }
-            const APIResultHelpers = __bjs_createAPIResultValuesHelpers();
-            enumHelpers.APIResult = APIResultHelpers;
+            const __bjs_helpers_M10TestModuleT9APIResult = __bjs_createEnumHelpers_M10TestModuleT9APIResult();
+            enumHelpers.M10TestModuleT9APIResult = __bjs_helpers_M10TestModuleT9APIResult;
 
             if (typeof globalThis.Utils === 'undefined') {
                 globalThis.Utils = {};
@@ -353,7 +363,6 @@ export async function createInstantiator(options, swift) {
                 globalThis.Utils.String = {};
             }
             const exports = {
-                MathUtils,
                 Calculator: {
                     ...CalculatorValues,
                     square: function(value) {
@@ -374,12 +383,13 @@ export async function createInstantiator(options, swift) {
                 APIResult: {
                     ...APIResultValues,
                     roundtrip: function(value) {
-                        const valueCaseId = enumHelpers.APIResult.lower(value);
+                        const valueCaseId = enumHelpers.M10TestModuleT9APIResult.lower(value);
                         instance.exports.bjs_APIResult_static_roundtrip(valueCaseId);
-                        const ret = enumHelpers.APIResult.lift(i32Stack.pop());
+                        const ret = enumHelpers.M10TestModuleT9APIResult.lift(i32Stack.pop());
                         return ret;
                     }
                 },
+                MathUtils,
                 Utils: {
                     String: {
                         uppercase: function bjs_Utils_String_static_uppercase(text) {
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.d.ts b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.d.ts
index c9cb26910..a168f3ad1 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.d.ts
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.d.ts
@@ -41,15 +41,15 @@ export interface MathUtils extends SwiftHeapObject {
     multiply(x: number, y: number): number;
 }
 export type Exports = {
+    Calculator: CalculatorObject
+    APIResult: APIResultObject
     MathUtils: {
         new(): MathUtils;
         subtract(a: number, b: number): number;
         add(a: number, b: number): number;
         divide(a: number, b: number): number;
         readonly pi: number;
-    }
-    Calculator: CalculatorObject
-    APIResult: APIResultObject
+    },
     Utils: {
         String: {
             uppercase(text: string): string;
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.js
index 16cf2881f..37d3415a4 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.js
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.js
@@ -42,7 +42,7 @@ export async function createInstantiator(options, swift) {
 
     let _exports = null;
     let bjs = null;
-    const __bjs_createAPIResultValuesHelpers = () => ({
+    const __bjs_createEnumHelpers_M10TestModuleT9APIResult = () => ({
         lower: (value) => {
             const enumTag = value.tag;
             switch (enumTag) {
@@ -89,14 +89,14 @@ export async function createInstantiator(options, swift) {
             bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) {
                 const source = swift.memory.getObject(sourceId);
                 swift.memory.release(sourceId);
-                const bytes = new Uint8Array(memory.buffer, bytesPtr);
+                const bytes = new Uint8Array(memory.buffer, bytesPtr >>> 0);
                 bytes.set(source);
             }
             bjs["swift_js_make_js_string"] = function(ptr, len) {
                 return swift.memory.retain(decodeString(ptr, len));
             }
             bjs["swift_js_init_memory_with_result"] = function(ptr, len) {
-                const target = new Uint8Array(memory.buffer, ptr, len);
+                const target = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0);
                 target.set(tmpRetBytes);
                 tmpRetBytes = undefined;
             }
@@ -150,6 +150,15 @@ export async function createInstantiator(options, swift) {
                 const copy = memory.buffer.slice(ptr, ptr + byteLen);
                 taStack.push(Array.from(new Ctor(copy)));
             }
+            bjs["bjs_core_register_type_handles"] = function() {};
+            bjs["bjs_TestModule_register_type_handles"] = function() {};
+            const __bjs_promiseSettlers = Symbol("JavaScriptKit.promiseSettlers");
+            bjs["swift_js_make_promise"] = function() {
+                let resolve, reject;
+                const promise = new Promise((res, rej) => { resolve = res; reject = rej; });
+                promise[__bjs_promiseSettlers] = { resolve, reject };
+                return swift.memory.retain(promise);
+            }
             bjs["swift_js_return_optional_bool"] = function(isSome, value) {
                 if (isSome === 0) {
                     tmpRetOptionalBool = null;
@@ -274,6 +283,7 @@ export async function createInstantiator(options, swift) {
             /// Represents a Swift heap object like a class instance or an actor instance.
             class SwiftHeapObject {
                 static __wrap(pointer, deinit, prototype, identityCache) {
+                    pointer = pointer >>> 0;
                     const makeFresh = (identityMap) => {
                         const obj = Object.create(prototype);
                         const state = { pointer, deinit, hasReleased: false, identityMap };
@@ -343,11 +353,10 @@ export async function createInstantiator(options, swift) {
                     return ret;
                 }
             }
-            const APIResultHelpers = __bjs_createAPIResultValuesHelpers();
-            enumHelpers.APIResult = APIResultHelpers;
+            const __bjs_helpers_M10TestModuleT9APIResult = __bjs_createEnumHelpers_M10TestModuleT9APIResult();
+            enumHelpers.M10TestModuleT9APIResult = __bjs_helpers_M10TestModuleT9APIResult;
 
             const exports = {
-                MathUtils,
                 Calculator: {
                     ...CalculatorValues,
                     square: function(value) {
@@ -368,12 +377,13 @@ export async function createInstantiator(options, swift) {
                 APIResult: {
                     ...APIResultValues,
                     roundtrip: function(value) {
-                        const valueCaseId = enumHelpers.APIResult.lower(value);
+                        const valueCaseId = enumHelpers.M10TestModuleT9APIResult.lower(value);
                         instance.exports.bjs_APIResult_static_roundtrip(valueCaseId);
-                        const ret = enumHelpers.APIResult.lift(i32Stack.pop());
+                        const ret = enumHelpers.M10TestModuleT9APIResult.lift(i32Stack.pop());
                         return ret;
                     }
                 },
+                MathUtils,
                 Utils: {
                     String: {
                         uppercase: function bjs_Utils_String_static_uppercase(text) {
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.Global.d.ts b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.Global.d.ts
index fea3c4b59..b54e14def 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.Global.d.ts
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.Global.d.ts
@@ -40,6 +40,7 @@ export interface SwiftHeapObject {
 export interface PropertyClass extends SwiftHeapObject {
 }
 export type Exports = {
+    PropertyEnum: PropertyEnumObject
     PropertyClass: {
         new(): PropertyClass;
         readonly staticConstant: string;
@@ -49,8 +50,7 @@ export type Exports = {
         computedProperty: string;
         readonly readOnlyComputed: number;
         optionalProperty: string | null;
-    }
-    PropertyEnum: PropertyEnumObject
+    },
     PropertyNamespace: {
         readonly namespaceConstant: string;
         namespaceProperty: string;
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.Global.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.Global.js
index b616665ca..e2a9093b6 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.Global.js
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.Global.js
@@ -50,14 +50,14 @@ export async function createInstantiator(options, swift) {
             bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) {
                 const source = swift.memory.getObject(sourceId);
                 swift.memory.release(sourceId);
-                const bytes = new Uint8Array(memory.buffer, bytesPtr);
+                const bytes = new Uint8Array(memory.buffer, bytesPtr >>> 0);
                 bytes.set(source);
             }
             bjs["swift_js_make_js_string"] = function(ptr, len) {
                 return swift.memory.retain(decodeString(ptr, len));
             }
             bjs["swift_js_init_memory_with_result"] = function(ptr, len) {
-                const target = new Uint8Array(memory.buffer, ptr, len);
+                const target = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0);
                 target.set(tmpRetBytes);
                 tmpRetBytes = undefined;
             }
@@ -111,6 +111,15 @@ export async function createInstantiator(options, swift) {
                 const copy = memory.buffer.slice(ptr, ptr + byteLen);
                 taStack.push(Array.from(new Ctor(copy)));
             }
+            bjs["bjs_core_register_type_handles"] = function() {};
+            bjs["bjs_TestModule_register_type_handles"] = function() {};
+            const __bjs_promiseSettlers = Symbol("JavaScriptKit.promiseSettlers");
+            bjs["swift_js_make_promise"] = function() {
+                let resolve, reject;
+                const promise = new Promise((res, rej) => { resolve = res; reject = rej; });
+                promise[__bjs_promiseSettlers] = { resolve, reject };
+                return swift.memory.retain(promise);
+            }
             bjs["swift_js_return_optional_bool"] = function(isSome, value) {
                 if (isSome === 0) {
                     tmpRetOptionalBool = null;
@@ -235,6 +244,7 @@ export async function createInstantiator(options, swift) {
             /// Represents a Swift heap object like a class instance or an actor instance.
             class SwiftHeapObject {
                 static __wrap(pointer, deinit, prototype, identityCache) {
+                    pointer = pointer >>> 0;
                     const makeFresh = (identityMap) => {
                         const obj = Object.create(prototype);
                         const state = { pointer, deinit, hasReleased: false, identityMap };
@@ -359,7 +369,6 @@ export async function createInstantiator(options, swift) {
                 globalThis.PropertyNamespace.Nested = {};
             }
             const exports = {
-                PropertyClass,
                 PropertyEnum: {
                     ...PropertyEnumValues,
                     get enumProperty() {
@@ -389,6 +398,7 @@ export async function createInstantiator(options, swift) {
                         instance.exports.bjs_PropertyEnum_static_computedEnum_set(valueId, valueBytes.length);
                     }
                 },
+                PropertyClass,
                 PropertyNamespace: {
                     get namespaceProperty() {
                         instance.exports.bjs_PropertyNamespace_static_namespaceProperty_get();
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.d.ts b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.d.ts
index 4ce689edb..aea927c79 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.d.ts
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.d.ts
@@ -26,6 +26,7 @@ export interface SwiftHeapObject {
 export interface PropertyClass extends SwiftHeapObject {
 }
 export type Exports = {
+    PropertyEnum: PropertyEnumObject
     PropertyClass: {
         new(): PropertyClass;
         readonly staticConstant: string;
@@ -35,8 +36,7 @@ export type Exports = {
         computedProperty: string;
         readonly readOnlyComputed: number;
         optionalProperty: string | null;
-    }
-    PropertyEnum: PropertyEnumObject
+    },
     PropertyNamespace: {
         readonly namespaceConstant: string;
         namespaceProperty: string;
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.js
index f6e1fdbce..f442745e5 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.js
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.js
@@ -50,14 +50,14 @@ export async function createInstantiator(options, swift) {
             bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) {
                 const source = swift.memory.getObject(sourceId);
                 swift.memory.release(sourceId);
-                const bytes = new Uint8Array(memory.buffer, bytesPtr);
+                const bytes = new Uint8Array(memory.buffer, bytesPtr >>> 0);
                 bytes.set(source);
             }
             bjs["swift_js_make_js_string"] = function(ptr, len) {
                 return swift.memory.retain(decodeString(ptr, len));
             }
             bjs["swift_js_init_memory_with_result"] = function(ptr, len) {
-                const target = new Uint8Array(memory.buffer, ptr, len);
+                const target = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0);
                 target.set(tmpRetBytes);
                 tmpRetBytes = undefined;
             }
@@ -111,6 +111,15 @@ export async function createInstantiator(options, swift) {
                 const copy = memory.buffer.slice(ptr, ptr + byteLen);
                 taStack.push(Array.from(new Ctor(copy)));
             }
+            bjs["bjs_core_register_type_handles"] = function() {};
+            bjs["bjs_TestModule_register_type_handles"] = function() {};
+            const __bjs_promiseSettlers = Symbol("JavaScriptKit.promiseSettlers");
+            bjs["swift_js_make_promise"] = function() {
+                let resolve, reject;
+                const promise = new Promise((res, rej) => { resolve = res; reject = rej; });
+                promise[__bjs_promiseSettlers] = { resolve, reject };
+                return swift.memory.retain(promise);
+            }
             bjs["swift_js_return_optional_bool"] = function(isSome, value) {
                 if (isSome === 0) {
                     tmpRetOptionalBool = null;
@@ -235,6 +244,7 @@ export async function createInstantiator(options, swift) {
             /// Represents a Swift heap object like a class instance or an actor instance.
             class SwiftHeapObject {
                 static __wrap(pointer, deinit, prototype, identityCache) {
+                    pointer = pointer >>> 0;
                     const makeFresh = (identityMap) => {
                         const obj = Object.create(prototype);
                         const state = { pointer, deinit, hasReleased: false, identityMap };
@@ -353,7 +363,6 @@ export async function createInstantiator(options, swift) {
                 }
             }
             const exports = {
-                PropertyClass,
                 PropertyEnum: {
                     ...PropertyEnumValues,
                     get enumProperty() {
@@ -383,6 +392,7 @@ export async function createInstantiator(options, swift) {
                         instance.exports.bjs_PropertyEnum_static_computedEnum_set(valueId, valueBytes.length);
                     }
                 },
+                PropertyClass,
                 PropertyNamespace: {
                     get namespaceProperty() {
                         instance.exports.bjs_PropertyNamespace_static_namespaceProperty_get();
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringParameter.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringParameter.js
index 885c0980f..ebddbefd2 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringParameter.js
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringParameter.js
@@ -46,14 +46,14 @@ export async function createInstantiator(options, swift) {
             bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) {
                 const source = swift.memory.getObject(sourceId);
                 swift.memory.release(sourceId);
-                const bytes = new Uint8Array(memory.buffer, bytesPtr);
+                const bytes = new Uint8Array(memory.buffer, bytesPtr >>> 0);
                 bytes.set(source);
             }
             bjs["swift_js_make_js_string"] = function(ptr, len) {
                 return swift.memory.retain(decodeString(ptr, len));
             }
             bjs["swift_js_init_memory_with_result"] = function(ptr, len) {
-                const target = new Uint8Array(memory.buffer, ptr, len);
+                const target = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0);
                 target.set(tmpRetBytes);
                 tmpRetBytes = undefined;
             }
@@ -107,6 +107,14 @@ export async function createInstantiator(options, swift) {
                 const copy = memory.buffer.slice(ptr, ptr + byteLen);
                 taStack.push(Array.from(new Ctor(copy)));
             }
+            bjs["bjs_core_register_type_handles"] = function() {};
+            const __bjs_promiseSettlers = Symbol("JavaScriptKit.promiseSettlers");
+            bjs["swift_js_make_promise"] = function() {
+                let resolve, reject;
+                const promise = new Promise((res, rej) => { resolve = res; reject = rej; });
+                promise[__bjs_promiseSettlers] = { resolve, reject };
+                return swift.memory.retain(promise);
+            }
             bjs["swift_js_return_optional_bool"] = function(isSome, value) {
                 if (isSome === 0) {
                     tmpRetOptionalBool = null;
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringReturn.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringReturn.js
index aab8b67fe..d2dfa204f 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringReturn.js
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringReturn.js
@@ -46,14 +46,14 @@ export async function createInstantiator(options, swift) {
             bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) {
                 const source = swift.memory.getObject(sourceId);
                 swift.memory.release(sourceId);
-                const bytes = new Uint8Array(memory.buffer, bytesPtr);
+                const bytes = new Uint8Array(memory.buffer, bytesPtr >>> 0);
                 bytes.set(source);
             }
             bjs["swift_js_make_js_string"] = function(ptr, len) {
                 return swift.memory.retain(decodeString(ptr, len));
             }
             bjs["swift_js_init_memory_with_result"] = function(ptr, len) {
-                const target = new Uint8Array(memory.buffer, ptr, len);
+                const target = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0);
                 target.set(tmpRetBytes);
                 tmpRetBytes = undefined;
             }
@@ -107,6 +107,14 @@ export async function createInstantiator(options, swift) {
                 const copy = memory.buffer.slice(ptr, ptr + byteLen);
                 taStack.push(Array.from(new Ctor(copy)));
             }
+            bjs["bjs_core_register_type_handles"] = function() {};
+            const __bjs_promiseSettlers = Symbol("JavaScriptKit.promiseSettlers");
+            bjs["swift_js_make_promise"] = function() {
+                let resolve, reject;
+                const promise = new Promise((res, rej) => { resolve = res; reject = rej; });
+                promise[__bjs_promiseSettlers] = { resolve, reject };
+                return swift.memory.retain(promise);
+            }
             bjs["swift_js_return_optional_bool"] = function(isSome, value) {
                 if (isSome === 0) {
                     tmpRetOptionalBool = null;
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StructWithNestedTypes.d.ts b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StructWithNestedTypes.d.ts
new file mode 100644
index 000000000..fe4708fd8
--- /dev/null
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StructWithNestedTypes.d.ts
@@ -0,0 +1,73 @@
+// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit,
+// DO NOT EDIT.
+//
+// To update this file, just rebuild your project or run
+// `swift package bridge-js`.
+
+export interface Shape {
+    label: string;
+}
+export interface Widget {
+    name: string;
+}
+export type KindObject = typeof Shape.KindValues;
+
+export type VariantObject = typeof Widget.VariantValues;
+
+export type AlignmentObject = typeof Widget.Layout.AlignmentValues;
+
+export namespace Shape {
+    const KindValues: {
+        readonly Circle: "circle";
+        readonly Square: "square";
+    };
+    type KindTag = typeof KindValues[keyof typeof KindValues];
+}
+export namespace Widget {
+    const VariantValues: {
+        readonly Button: "button";
+        readonly Slider: "slider";
+    };
+    type VariantTag = typeof VariantValues[keyof typeof VariantValues];
+    export interface Bounds {
+        width: number;
+        height: number;
+    }
+    export interface Layout {
+        padding: number;
+    }
+    export namespace Layout {
+        const AlignmentValues: {
+            readonly Leading: "leading";
+            readonly Trailing: "trailing";
+        };
+        type AlignmentTag = typeof AlignmentValues[keyof typeof AlignmentValues];
+    }
+}
+export type Exports = {
+    Shape: {
+        init(label: string): Shape;
+        Kind: KindObject
+    },
+    Widget: {
+        init(name: string): Widget;
+        Variant: VariantObject
+        Bounds: {
+            init(width: number, height: number): Widget.Bounds;
+            readonly dimensions: number;
+            zero(): Widget.Bounds;
+        },
+        Layout: {
+            Alignment: AlignmentObject
+        },
+    },
+}
+export type Imports = {
+}
+export function createInstantiator(options: {
+    imports: Imports;
+}, swift: any): Promise<{
+    addImports: (importObject: WebAssembly.Imports) => void;
+    setInstance: (instance: WebAssembly.Instance) => void;
+    createExports: (instance: WebAssembly.Instance) => Exports;
+}>;
\ No newline at end of file
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StructWithNestedTypes.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StructWithNestedTypes.js
new file mode 100644
index 000000000..9104e2084
--- /dev/null
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StructWithNestedTypes.js
@@ -0,0 +1,366 @@
+// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit,
+// DO NOT EDIT.
+//
+// To update this file, just rebuild your project or run
+// `swift package bridge-js`.
+
+export const KindValues = {
+    Circle: "circle",
+    Square: "square",
+};
+
+export const VariantValues = {
+    Button: "button",
+    Slider: "slider",
+};
+
+export const AlignmentValues = {
+    Leading: "leading",
+    Trailing: "trailing",
+};
+
+export async function createInstantiator(options, swift) {
+    let instance;
+    let memory;
+    let setException;
+    let decodeString;
+    const textDecoder = new TextDecoder("utf-8");
+    const textEncoder = new TextEncoder("utf-8");
+    let tmpRetString;
+    let tmpRetBytes;
+    let tmpRetException;
+    let tmpRetOptionalBool;
+    let tmpRetOptionalInt;
+    let tmpRetOptionalFloat;
+    let tmpRetOptionalDouble;
+    let tmpRetOptionalHeapObject;
+    let strStack = [];
+    let i32Stack = [];
+    let i64Stack = [];
+    let f32Stack = [];
+    let f64Stack = [];
+    let ptrStack = [];
+    let taStack = [];
+    const enumHelpers = {};
+    const structHelpers = {};
+
+    let _exports = null;
+    let bjs = null;
+    const __bjs_createStructHelpers_M10TestModuleT5Shape = () => ({
+        lower: (value) => {
+            const bytes = textEncoder.encode(value.label);
+            const id = swift.memory.retain(bytes);
+            i32Stack.push(bytes.length);
+            i32Stack.push(id);
+        },
+        lift: () => {
+            const string = strStack.pop();
+            return { label: string };
+        }
+    });
+    const __bjs_createStructHelpers_M10TestModuleT6Widget = () => ({
+        lower: (value) => {
+            const bytes = textEncoder.encode(value.name);
+            const id = swift.memory.retain(bytes);
+            i32Stack.push(bytes.length);
+            i32Stack.push(id);
+        },
+        lift: () => {
+            const string = strStack.pop();
+            return { name: string };
+        }
+    });
+    const __bjs_createStructHelpers_M10TestModuleT6WidgetT6Layout = () => ({
+        lower: (value) => {
+            i32Stack.push((value.padding | 0));
+        },
+        lift: () => {
+            const int = i32Stack.pop();
+            return { padding: int };
+        }
+    });
+    const __bjs_createStructHelpers_M10TestModuleT6WidgetT6Bounds = () => ({
+        lower: (value) => {
+            i32Stack.push((value.width | 0));
+            i32Stack.push((value.height | 0));
+        },
+        lift: () => {
+            const int = i32Stack.pop();
+            const int1 = i32Stack.pop();
+            return { width: int1, height: int };
+        }
+    });
+
+    return {
+        /**
+         * @param {WebAssembly.Imports} importObject
+         */
+        addImports: (importObject, importsContext) => {
+            bjs = {};
+            importObject["bjs"] = bjs;
+            bjs["swift_js_return_string"] = function(ptr, len) {
+                tmpRetString = decodeString(ptr, len);
+            }
+            bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) {
+                const source = swift.memory.getObject(sourceId);
+                swift.memory.release(sourceId);
+                const bytes = new Uint8Array(memory.buffer, bytesPtr >>> 0);
+                bytes.set(source);
+            }
+            bjs["swift_js_make_js_string"] = function(ptr, len) {
+                return swift.memory.retain(decodeString(ptr, len));
+            }
+            bjs["swift_js_init_memory_with_result"] = function(ptr, len) {
+                const target = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0);
+                target.set(tmpRetBytes);
+                tmpRetBytes = undefined;
+            }
+            bjs["swift_js_throw"] = function(id) {
+                tmpRetException = swift.memory.retainByRef(id);
+            }
+            bjs["swift_js_retain"] = function(id) {
+                return swift.memory.retainByRef(id);
+            }
+            bjs["swift_js_release"] = function(id) {
+                swift.memory.release(id);
+            }
+            bjs["swift_js_push_i32"] = function(v) {
+                i32Stack.push(v | 0);
+            }
+            bjs["swift_js_push_f32"] = function(v) {
+                f32Stack.push(Math.fround(v));
+            }
+            bjs["swift_js_push_f64"] = function(v) {
+                f64Stack.push(v);
+            }
+            bjs["swift_js_push_string"] = function(ptr, len) {
+                const value = decodeString(ptr, len);
+                strStack.push(value);
+            }
+            bjs["swift_js_pop_i32"] = function() {
+                return i32Stack.pop();
+            }
+            bjs["swift_js_pop_f32"] = function() {
+                return f32Stack.pop();
+            }
+            bjs["swift_js_pop_f64"] = function() {
+                return f64Stack.pop();
+            }
+            bjs["swift_js_push_pointer"] = function(pointer) {
+                ptrStack.push(pointer);
+            }
+            bjs["swift_js_pop_pointer"] = function() {
+                return ptrStack.pop();
+            }
+            bjs["swift_js_push_i64"] = function(v) {
+                i64Stack.push(v);
+            }
+            bjs["swift_js_pop_i64"] = function() {
+                return i64Stack.pop();
+            }
+            const taCtors = [Int8Array, Uint8Array, Int16Array, Uint16Array, Int32Array, Uint32Array, Float32Array, Float64Array];
+            bjs["swift_js_push_typed_array"] = function(kind, ptr, count) {
+                const Ctor = taCtors[kind];
+                const byteLen = count * Ctor.BYTES_PER_ELEMENT;
+                const copy = memory.buffer.slice(ptr, ptr + byteLen);
+                taStack.push(Array.from(new Ctor(copy)));
+            }
+            bjs["swift_js_struct_lower_Shape"] = function(objectId) {
+                structHelpers.M10TestModuleT5Shape.lower(swift.memory.getObject(objectId));
+            }
+            bjs["swift_js_struct_lift_Shape"] = function() {
+                const value = structHelpers.M10TestModuleT5Shape.lift();
+                return swift.memory.retain(value);
+            }
+            bjs["swift_js_struct_lower_Widget"] = function(objectId) {
+                structHelpers.M10TestModuleT6Widget.lower(swift.memory.getObject(objectId));
+            }
+            bjs["swift_js_struct_lift_Widget"] = function() {
+                const value = structHelpers.M10TestModuleT6Widget.lift();
+                return swift.memory.retain(value);
+            }
+            bjs["swift_js_struct_lower_Widget_Layout"] = function(objectId) {
+                structHelpers.M10TestModuleT6WidgetT6Layout.lower(swift.memory.getObject(objectId));
+            }
+            bjs["swift_js_struct_lift_Widget_Layout"] = function() {
+                const value = structHelpers.M10TestModuleT6WidgetT6Layout.lift();
+                return swift.memory.retain(value);
+            }
+            bjs["swift_js_struct_lower_Widget_Bounds"] = function(objectId) {
+                structHelpers.M10TestModuleT6WidgetT6Bounds.lower(swift.memory.getObject(objectId));
+            }
+            bjs["swift_js_struct_lift_Widget_Bounds"] = function() {
+                const value = structHelpers.M10TestModuleT6WidgetT6Bounds.lift();
+                return swift.memory.retain(value);
+            }
+            bjs["bjs_core_register_type_handles"] = function() {};
+            bjs["bjs_TestModule_register_type_handles"] = function() {};
+            const __bjs_promiseSettlers = Symbol("JavaScriptKit.promiseSettlers");
+            bjs["swift_js_make_promise"] = function() {
+                let resolve, reject;
+                const promise = new Promise((res, rej) => { resolve = res; reject = rej; });
+                promise[__bjs_promiseSettlers] = { resolve, reject };
+                return swift.memory.retain(promise);
+            }
+            bjs["swift_js_return_optional_bool"] = function(isSome, value) {
+                if (isSome === 0) {
+                    tmpRetOptionalBool = null;
+                } else {
+                    tmpRetOptionalBool = value !== 0;
+                }
+            }
+            bjs["swift_js_return_optional_int"] = function(isSome, value) {
+                if (isSome === 0) {
+                    tmpRetOptionalInt = null;
+                } else {
+                    tmpRetOptionalInt = value | 0;
+                }
+            }
+            bjs["swift_js_return_optional_float"] = function(isSome, value) {
+                if (isSome === 0) {
+                    tmpRetOptionalFloat = null;
+                } else {
+                    tmpRetOptionalFloat = Math.fround(value);
+                }
+            }
+            bjs["swift_js_return_optional_double"] = function(isSome, value) {
+                if (isSome === 0) {
+                    tmpRetOptionalDouble = null;
+                } else {
+                    tmpRetOptionalDouble = value;
+                }
+            }
+            bjs["swift_js_return_optional_string"] = function(isSome, ptr, len) {
+                if (isSome === 0) {
+                    tmpRetString = null;
+                } else {
+                    tmpRetString = decodeString(ptr, len);
+                }
+            }
+            bjs["swift_js_return_optional_object"] = function(isSome, objectId) {
+                if (isSome === 0) {
+                    tmpRetString = null;
+                } else {
+                    tmpRetString = swift.memory.getObject(objectId);
+                }
+            }
+            bjs["swift_js_return_optional_heap_object"] = function(isSome, pointer) {
+                if (isSome === 0) {
+                    tmpRetOptionalHeapObject = null;
+                } else {
+                    tmpRetOptionalHeapObject = pointer;
+                }
+            }
+            bjs["swift_js_get_optional_int_presence"] = function() {
+                return tmpRetOptionalInt != null ? 1 : 0;
+            }
+            bjs["swift_js_get_optional_int_value"] = function() {
+                const value = tmpRetOptionalInt;
+                tmpRetOptionalInt = undefined;
+                return value;
+            }
+            bjs["swift_js_get_optional_string"] = function() {
+                const str = tmpRetString;
+                tmpRetString = undefined;
+                if (str == null) {
+                    return -1;
+                } else {
+                    const bytes = textEncoder.encode(str);
+                    tmpRetBytes = bytes;
+                    return bytes.length;
+                }
+            }
+            bjs["swift_js_get_optional_float_presence"] = function() {
+                return tmpRetOptionalFloat != null ? 1 : 0;
+            }
+            bjs["swift_js_get_optional_float_value"] = function() {
+                const value = tmpRetOptionalFloat;
+                tmpRetOptionalFloat = undefined;
+                return value;
+            }
+            bjs["swift_js_get_optional_double_presence"] = function() {
+                return tmpRetOptionalDouble != null ? 1 : 0;
+            }
+            bjs["swift_js_get_optional_double_value"] = function() {
+                const value = tmpRetOptionalDouble;
+                tmpRetOptionalDouble = undefined;
+                return value;
+            }
+            bjs["swift_js_get_optional_heap_object_pointer"] = function() {
+                const pointer = tmpRetOptionalHeapObject;
+                tmpRetOptionalHeapObject = undefined;
+                return pointer || 0;
+            }
+            bjs["swift_js_closure_unregister"] = function(funcRef) {}
+        },
+        setInstance: (i) => {
+            instance = i;
+            memory = instance.exports.memory;
+
+            decodeString = (ptr, len) => { const bytes = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); return textDecoder.decode(bytes); }
+
+            setException = (error) => {
+                instance.exports._swift_js_exception.value = swift.memory.retain(error)
+            }
+        },
+        /** @param {WebAssembly.Instance} instance */
+        createExports: (instance) => {
+            const js = swift.memory.heap;
+            const __bjs_helpers_M10TestModuleT5Shape = __bjs_createStructHelpers_M10TestModuleT5Shape();
+            structHelpers.M10TestModuleT5Shape = __bjs_helpers_M10TestModuleT5Shape;
+
+            const __bjs_helpers_M10TestModuleT6Widget = __bjs_createStructHelpers_M10TestModuleT6Widget();
+            structHelpers.M10TestModuleT6Widget = __bjs_helpers_M10TestModuleT6Widget;
+
+            const __bjs_helpers_M10TestModuleT6WidgetT6Layout = __bjs_createStructHelpers_M10TestModuleT6WidgetT6Layout();
+            structHelpers.M10TestModuleT6WidgetT6Layout = __bjs_helpers_M10TestModuleT6WidgetT6Layout;
+
+            const __bjs_helpers_M10TestModuleT6WidgetT6Bounds = __bjs_createStructHelpers_M10TestModuleT6WidgetT6Bounds();
+            structHelpers.M10TestModuleT6WidgetT6Bounds = __bjs_helpers_M10TestModuleT6WidgetT6Bounds;
+
+            const exports = {
+                Shape: {
+                    init: function(label) {
+                        const labelBytes = textEncoder.encode(label);
+                        const labelId = swift.memory.retain(labelBytes);
+                        instance.exports.bjs_Shape_init(labelId, labelBytes.length);
+                        const structValue = structHelpers.M10TestModuleT5Shape.lift();
+                        return structValue;
+                    },
+                    Kind: KindValues,
+                },
+                Widget: {
+                    init: function(name) {
+                        const nameBytes = textEncoder.encode(name);
+                        const nameId = swift.memory.retain(nameBytes);
+                        instance.exports.bjs_Widget_init(nameId, nameBytes.length);
+                        const structValue = structHelpers.M10TestModuleT6Widget.lift();
+                        return structValue;
+                    },
+                    Variant: VariantValues,
+                    Bounds: {
+                        init: function(width, height) {
+                            instance.exports.bjs_Widget_Bounds_init(width, height);
+                            const structValue = structHelpers.M10TestModuleT6WidgetT6Bounds.lift();
+                            return structValue;
+                        },
+                        get dimensions() {
+                            const ret = instance.exports.bjs_Widget_Bounds_static_dimensions_get();
+                            return ret;
+                        },
+                        zero: function() {
+                            instance.exports.bjs_Widget_Bounds_static_zero();
+                            const structValue = structHelpers.M10TestModuleT6WidgetT6Bounds.lift();
+                            return structValue;
+                        },
+                    },
+                    Layout: {
+                        Alignment: AlignmentValues,
+                    },
+                },
+            };
+            _exports = exports;
+            return exports;
+        },
+    }
+}
\ No newline at end of file
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClass.d.ts b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClass.d.ts
index 6d590950c..2f56a1cb8 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClass.d.ts
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClass.d.ts
@@ -23,16 +23,16 @@ export interface PublicGreeter extends SwiftHeapObject {
 export interface PackageGreeter extends SwiftHeapObject {
 }
 export type Exports = {
+    takeGreeter(greeter: Greeter): void;
     Greeter: {
         new(name: string): Greeter;
         greetAnonymously(): string;
         readonly defaultGreeting: string;
-    }
-    PublicGreeter: {
-    }
+    },
     PackageGreeter: {
-    }
-    takeGreeter(greeter: Greeter): void;
+    },
+    PublicGreeter: {
+    },
 }
 export type Imports = {
     jsRoundTripGreeter(greeter: Greeter): Greeter;
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClass.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClass.js
index 88f04efe9..92ef435fb 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClass.js
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClass.js
@@ -46,14 +46,14 @@ export async function createInstantiator(options, swift) {
             bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) {
                 const source = swift.memory.getObject(sourceId);
                 swift.memory.release(sourceId);
-                const bytes = new Uint8Array(memory.buffer, bytesPtr);
+                const bytes = new Uint8Array(memory.buffer, bytesPtr >>> 0);
                 bytes.set(source);
             }
             bjs["swift_js_make_js_string"] = function(ptr, len) {
                 return swift.memory.retain(decodeString(ptr, len));
             }
             bjs["swift_js_init_memory_with_result"] = function(ptr, len) {
-                const target = new Uint8Array(memory.buffer, ptr, len);
+                const target = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0);
                 target.set(tmpRetBytes);
                 tmpRetBytes = undefined;
             }
@@ -107,6 +107,14 @@ export async function createInstantiator(options, swift) {
                 const copy = memory.buffer.slice(ptr, ptr + byteLen);
                 taStack.push(Array.from(new Ctor(copy)));
             }
+            bjs["bjs_core_register_type_handles"] = function() {};
+            const __bjs_promiseSettlers = Symbol("JavaScriptKit.promiseSettlers");
+            bjs["swift_js_make_promise"] = function() {
+                let resolve, reject;
+                const promise = new Promise((res, rej) => { resolve = res; reject = rej; });
+                promise[__bjs_promiseSettlers] = { resolve, reject };
+                return swift.memory.retain(promise);
+            }
             bjs["swift_js_return_optional_bool"] = function(isSome, value) {
                 if (isSome === 0) {
                     tmpRetOptionalBool = null;
@@ -258,6 +266,7 @@ export async function createInstantiator(options, swift) {
             /// Represents a Swift heap object like a class instance or an actor instance.
             class SwiftHeapObject {
                 static __wrap(pointer, deinit, prototype, identityCache) {
+                    pointer = pointer >>> 0;
                     const makeFresh = (identityMap) => {
                         const obj = Object.create(prototype);
                         const state = { pointer, deinit, hasReleased: false, identityMap };
@@ -366,12 +375,12 @@ export async function createInstantiator(options, swift) {
 
             }
             const exports = {
-                Greeter,
-                PublicGreeter,
-                PackageGreeter,
                 takeGreeter: function bjs_takeGreeter(greeter) {
                     instance.exports.bjs_takeGreeter(greeter.pointer);
                 },
+                Greeter,
+                PackageGreeter,
+                PublicGreeter,
             };
             _exports = exports;
             return exports;
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosure.d.ts b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosure.d.ts
index d024be7dd..70f23c11a 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosure.d.ts
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosure.d.ts
@@ -64,12 +64,6 @@ export interface Person extends SwiftHeapObject {
 export interface TestProcessor extends SwiftHeapObject {
 }
 export type Exports = {
-    Person: {
-        new(name: string): Person;
-    }
-    TestProcessor: {
-        new(transform: (arg0: string) => string): TestProcessor;
-    }
     roundtripAnimal(animalClosure: (arg0: Animal) => Animal): (arg0: Animal) => Animal;
     roundtripOptionalAnimal(animalClosure: (arg0: Animal | null) => Animal | null): (arg0: Animal | null) => Animal | null;
     roundtripString(stringClosure: (arg0: string) => string): (arg0: string) => string;
@@ -84,6 +78,12 @@ export type Exports = {
     roundtripOptionalDouble(doubleClosure: (arg0: number | null) => number | null): (arg0: number | null) => number | null;
     roundtripPerson(personClosure: (arg0: Person) => Person): (arg0: Person) => Person;
     roundtripOptionalPerson(personClosure: (arg0: Person | null) => Person | null): (arg0: Person | null) => Person | null;
+    makeThrowingParser(): (arg0: string) => number;
+    validateWith(validate: (arg0: string) => boolean): void;
+    makeFetcher(): (arg0: string) => Promise<string>;
+    makeAsyncEcho(): (arg0: string) => Promise<string>;
+    makeAnimalLoader(): (arg0: string) => Promise<Animal>;
+    makeResultLoader(): (arg0: boolean) => Promise<APIResultTag>;
     roundtripDirection(callback: (arg0: DirectionTag) => DirectionTag): (arg0: DirectionTag) => DirectionTag;
     roundtripTheme(callback: (arg0: ThemeTag) => ThemeTag): (arg0: ThemeTag) => ThemeTag;
     roundtripHttpStatus(callback: (arg0: HttpStatusTag) => HttpStatusTag): (arg0: HttpStatusTag) => HttpStatusTag;
@@ -99,7 +99,13 @@ export type Exports = {
     APIResult: APIResultObject
     Animal: {
         init(type: string): Animal;
-    }
+    },
+    Person: {
+        new(name: string): Person;
+    },
+    TestProcessor: {
+        new(transform: (arg0: string) => string): TestProcessor;
+    },
 }
 export type Imports = {
 }
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosure.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosure.js
index c82bc5b8d..279a9d3c6 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosure.js
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosure.js
@@ -61,6 +61,329 @@ export async function createInstantiator(options, swift) {
 
     let _exports = null;
     let bjs = null;
+    const __bjs_arrayCodecCache = new WeakMap();
+    function __bjs_arrayCodec(elementCodec) {
+        let codec = __bjs_arrayCodecCache.get(elementCodec);
+        if (codec !== undefined) {
+            return codec;
+        }
+        codec = {
+            lower(value) {
+                for (let i = 0; i < value.length; i++) {
+                    elementCodec.lower(value[i]);
+                }
+                i32Stack.push(value.length);
+            },
+            lift() {
+                const count = i32Stack.pop();
+                if (count === -1) {
+                    return taStack.pop();
+                }
+                const result = new Array(count);
+                for (let i = count - 1; i >= 0; i--) {
+                    result[i] = elementCodec.lift();
+                }
+                return result;
+            },
+        };
+        __bjs_arrayCodecCache.set(elementCodec, codec);
+        return codec;
+    }
+    const __bjs_optionalCodecCache = new WeakMap();
+    const __bjs_optionalCodecUndefinedOrCache = new WeakMap();
+    function __bjs_optionalCodec(elementCodec, isUndefinedOr = false) {
+        const cache = isUndefinedOr ? __bjs_optionalCodecUndefinedOrCache : __bjs_optionalCodecCache;
+        let codec = cache.get(elementCodec);
+        if (codec !== undefined) {
+            return codec;
+        }
+        codec = {
+            lower(value) {
+                const isSome = isUndefinedOr ? value !== undefined : value != null;
+                if (isSome) {
+                    elementCodec.lower(value);
+                    i32Stack.push(1);
+                } else {
+                    i32Stack.push(0);
+                }
+            },
+            lift() {
+                if (i32Stack.pop() === 0) {
+                    return isUndefinedOr ? undefined : null;
+                }
+                return elementCodec.lift();
+            },
+        };
+        cache.set(elementCodec, codec);
+        return codec;
+    }
+    const __bjs_dictCodecCache = new WeakMap();
+    function __bjs_dictCodec(valueCodec) {
+        let codec = __bjs_dictCodecCache.get(valueCodec);
+        if (codec !== undefined) {
+            return codec;
+        }
+        codec = {
+            lower(value) {
+                const keys = Object.keys(value);
+                for (let i = 0; i < keys.length; i++) {
+                    __bjs_stringCodec.lower(keys[i]);
+                    valueCodec.lower(value[keys[i]]);
+                }
+                i32Stack.push(keys.length);
+            },
+            lift() {
+                const count = i32Stack.pop();
+                const result = {};
+                for (let i = 0; i < count; i++) {
+                    const value = valueCodec.lift();
+                    const key = __bjs_stringCodec.lift();
+                    result[key] = value;
+                }
+                return result;
+            },
+        };
+        __bjs_dictCodecCache.set(valueCodec, codec);
+        return codec;
+    }
+
+    const __bjs_stringCodec = {
+        lower: (v) => {
+            const bytes = textEncoder.encode(v);
+            const id = swift.memory.retain(bytes);
+            i32Stack.push(bytes.length);
+            i32Stack.push(id);
+        },
+        lift: () => {
+            const string = strStack.pop();
+            return string;
+        },
+    };
+    const __bjs_primitiveCodecs = {
+        Bool: {
+            lower: (v) => {
+                i32Stack.push(v ? 1 : 0);
+            },
+            lift: () => {
+                const bool = i32Stack.pop() !== 0;
+                return bool;
+            },
+        },
+        Int: {
+            lower: (v) => {
+                i32Stack.push((v | 0));
+            },
+            lift: () => {
+                const int = i32Stack.pop();
+                return int;
+            },
+        },
+        Int8: {
+            lower: (v) => {
+                i32Stack.push((v | 0));
+            },
+            lift: () => {
+                const int = i32Stack.pop();
+                return int;
+            },
+        },
+        UInt8: {
+            lower: (v) => {
+                i32Stack.push((v | 0));
+            },
+            lift: () => {
+                const int = i32Stack.pop() >>> 0;
+                return int;
+            },
+        },
+        Int16: {
+            lower: (v) => {
+                i32Stack.push((v | 0));
+            },
+            lift: () => {
+                const int = i32Stack.pop();
+                return int;
+            },
+        },
+        UInt16: {
+            lower: (v) => {
+                i32Stack.push((v | 0));
+            },
+            lift: () => {
+                const int = i32Stack.pop() >>> 0;
+                return int;
+            },
+        },
+        Int32: {
+            lower: (v) => {
+                i32Stack.push((v | 0));
+            },
+            lift: () => {
+                const int = i32Stack.pop();
+                return int;
+            },
+        },
+        UInt32: {
+            lower: (v) => {
+                i32Stack.push((v | 0));
+            },
+            lift: () => {
+                const int = i32Stack.pop() >>> 0;
+                return int;
+            },
+        },
+        UInt: {
+            lower: (v) => {
+                i32Stack.push((v | 0));
+            },
+            lift: () => {
+                const int = i32Stack.pop() >>> 0;
+                return int;
+            },
+        },
+        Int64: {
+            lower: (v) => {
+                i64Stack.push(v);
+            },
+            lift: () => {
+                const int = i64Stack.pop();
+                return int;
+            },
+        },
+        UInt64: {
+            lower: (v) => {
+                i64Stack.push(v);
+            },
+            lift: () => {
+                const int = i64Stack.pop();
+                return int;
+            },
+        },
+        Float: {
+            lower: (v) => {
+                f32Stack.push(Math.fround(v));
+            },
+            lift: () => {
+                const f32 = f32Stack.pop();
+                return f32;
+            },
+        },
+        Double: {
+            lower: (v) => {
+                f64Stack.push(v);
+            },
+            lift: () => {
+                const f64 = f64Stack.pop();
+                return f64;
+            },
+        },
+        String: __bjs_stringCodec,
+        JSValue: {
+            lower: (v) => {
+                const [vKind, vPayload1, vPayload2] = __bjs_jsValueLower(v);
+                i32Stack.push(vKind);
+                i32Stack.push(vPayload1);
+                f64Stack.push(vPayload2);
+            },
+            lift: () => {
+                const jsValuePayload2 = f64Stack.pop();
+                const jsValuePayload1 = i32Stack.pop();
+                const jsValueKind = i32Stack.pop();
+                const jsValue = __bjs_jsValueLift(jsValueKind, jsValuePayload1, jsValuePayload2);
+                return jsValue;
+            },
+        },
+    };
+
+    function __bjs_jsValueLower(value) {
+        let kind;
+        let payload1;
+        let payload2;
+        if (value === null) {
+            kind = 4;
+            payload1 = 0;
+            payload2 = 0;
+        } else {
+            switch (typeof value) {
+                case "boolean":
+                    kind = 0;
+                    payload1 = value ? 1 : 0;
+                    payload2 = 0;
+                    break;
+                case "number":
+                    kind = 2;
+                    payload1 = 0;
+                    payload2 = value;
+                    break;
+                case "string":
+                    kind = 1;
+                    payload1 = swift.memory.retain(value);
+                    payload2 = 0;
+                    break;
+                case "undefined":
+                    kind = 5;
+                    payload1 = 0;
+                    payload2 = 0;
+                    break;
+                case "object":
+                    kind = 3;
+                    payload1 = swift.memory.retain(value);
+                    payload2 = 0;
+                    break;
+                case "function":
+                    kind = 3;
+                    payload1 = swift.memory.retain(value);
+                    payload2 = 0;
+                    break;
+                case "symbol":
+                    kind = 7;
+                    payload1 = swift.memory.retain(value);
+                    payload2 = 0;
+                    break;
+                case "bigint":
+                    kind = 8;
+                    payload1 = swift.memory.retain(value);
+                    payload2 = 0;
+                    break;
+                default:
+                    throw new TypeError("Unsupported JSValue type");
+            }
+        }
+        return [kind, payload1, payload2];
+    }
+    function __bjs_jsValueLift(kind, payload1, payload2) {
+        let jsValue;
+        switch (kind) {
+            case 0:
+                jsValue = payload1 !== 0;
+                break;
+            case 1:
+                jsValue = swift.memory.getObject(payload1);
+                break;
+            case 2:
+                jsValue = payload2;
+                break;
+            case 3:
+                jsValue = swift.memory.getObject(payload1);
+                break;
+            case 4:
+                jsValue = null;
+                break;
+            case 5:
+                jsValue = undefined;
+                break;
+            case 7:
+                jsValue = swift.memory.getObject(payload1);
+                break;
+            case 8:
+                jsValue = swift.memory.getObject(payload1);
+                break;
+            default:
+                throw new TypeError("Unsupported JSValue kind " + kind);
+        }
+        return jsValue;
+    }
+
     const swiftClosureRegistry = (typeof FinalizationRegistry === "undefined") ? { register: () => {}, unregister: () => {} } : new FinalizationRegistry((state) => {
         if (state.unregistered) { return; }
         instance?.exports?.bjs_release_swift_closure(state.pointer);
@@ -69,7 +392,7 @@ export async function createInstantiator(options, swift) {
         const state = { pointer, file, line, unregistered: false };
         const real = (...args) => {
             if (state.unregistered) {
-                const bytes = new Uint8Array(memory.buffer, state.file);
+                const bytes = new Uint8Array(memory.buffer, state.file >>> 0);
                 let length = 0;
                 while (bytes[length] !== 0) { length += 1; }
                 const fileID = decodeString(state.file, length);
@@ -86,7 +409,18 @@ export async function createInstantiator(options, swift) {
         return swift.memory.retain(real);
     };
 
-    const __bjs_createAnimalHelpers = () => ({
+    const __bjs_codec_M10TestModuleT6Animal = {
+        lower: (v) => {
+            structHelpers.M10TestModuleT6Animal.lower(v);
+        },
+        lift: () => {
+            const struct = structHelpers.M10TestModuleT6Animal.lift();
+            return struct;
+        },
+    };
+    const __bjs_codec_Optional_M10TestModuleT6Animal = __bjs_optionalCodec(__bjs_codec_M10TestModuleT6Animal);
+
+    const __bjs_createStructHelpers_M10TestModuleT6Animal = () => ({
         lower: (value) => {
             const bytes = textEncoder.encode(value.type);
             const id = swift.memory.retain(bytes);
@@ -98,7 +432,7 @@ export async function createInstantiator(options, swift) {
             return { type: string };
         }
     });
-    const __bjs_createAPIResultValuesHelpers = () => ({
+    const __bjs_createEnumHelpers_M10TestModuleT9APIResult = () => ({
         lower: (value) => {
             const enumTag = value.tag;
             switch (enumTag) {
@@ -173,14 +507,14 @@ export async function createInstantiator(options, swift) {
             bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) {
                 const source = swift.memory.getObject(sourceId);
                 swift.memory.release(sourceId);
-                const bytes = new Uint8Array(memory.buffer, bytesPtr);
+                const bytes = new Uint8Array(memory.buffer, bytesPtr >>> 0);
                 bytes.set(source);
             }
             bjs["swift_js_make_js_string"] = function(ptr, len) {
                 return swift.memory.retain(decodeString(ptr, len));
             }
             bjs["swift_js_init_memory_with_result"] = function(ptr, len) {
-                const target = new Uint8Array(memory.buffer, ptr, len);
+                const target = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0);
                 target.set(tmpRetBytes);
                 tmpRetBytes = undefined;
             }
@@ -235,12 +569,53 @@ export async function createInstantiator(options, swift) {
                 taStack.push(Array.from(new Ctor(copy)));
             }
             bjs["swift_js_struct_lower_Animal"] = function(objectId) {
-                structHelpers.Animal.lower(swift.memory.getObject(objectId));
+                structHelpers.M10TestModuleT6Animal.lower(swift.memory.getObject(objectId));
             }
             bjs["swift_js_struct_lift_Animal"] = function() {
-                const value = structHelpers.Animal.lift();
+                const value = structHelpers.M10TestModuleT6Animal.lift();
                 return swift.memory.retain(value);
             }
+            bjs["bjs_core_register_type_handles"] = function() {};
+            bjs["bjs_TestModule_register_type_handles"] = function() {};
+            const __bjs_promiseSettlers = Symbol("JavaScriptKit.promiseSettlers");
+            bjs["swift_js_make_promise"] = function() {
+                let resolve, reject;
+                const promise = new Promise((res, rej) => { resolve = res; reject = rej; });
+                promise[__bjs_promiseSettlers] = { resolve, reject };
+                return swift.memory.retain(promise);
+            }
+            bjs["promise_resolve_TestModule_SS"] = function(promise, valueBytes, valueCount) {
+                try {
+                    const string = decodeString(valueBytes, valueCount);
+                    swift.memory.getObject(promise)[__bjs_promiseSettlers].resolve(string);
+                } catch (error) {
+                    setException(error);
+                }
+            }
+            bjs["promise_resolve_TestModule_6AnimalV"] = function(promise) {
+                try {
+                    const structValue = structHelpers.M10TestModuleT6Animal.lift();
+                    swift.memory.getObject(promise)[__bjs_promiseSettlers].resolve(structValue);
+                } catch (error) {
+                    setException(error);
+                }
+            }
+            bjs["promise_resolve_TestModule_9APIResultO"] = function(promise, value) {
+                try {
+                    const enumValue = enumHelpers.M10TestModuleT9APIResult.lift(value);
+                    swift.memory.getObject(promise)[__bjs_promiseSettlers].resolve(enumValue);
+                } catch (error) {
+                    setException(error);
+                }
+            }
+            bjs["promise_reject_TestModule"] = function(promise, valueKind, valuePayload1, valuePayload2) {
+                try {
+                    const jsValue = __bjs_jsValueLift(valueKind, valuePayload1, valuePayload2);
+                    swift.memory.getObject(promise)[__bjs_promiseSettlers].reject(jsValue);
+                } catch (error) {
+                    setException(error);
+                }
+            }
             bjs["swift_js_return_optional_bool"] = function(isSome, value) {
                 if (isSome === 0) {
                     tmpRetOptionalBool = null;
@@ -389,18 +764,18 @@ export async function createInstantiator(options, swift) {
             bjs["invoke_js_callback_TestModule_10TestModule6AnimalV_6AnimalV"] = function(callbackId) {
                 try {
                     const callback = swift.memory.getObject(callbackId);
-                    const structValue = structHelpers.Animal.lift();
+                    const structValue = structHelpers.M10TestModuleT6Animal.lift();
                     let ret = callback(structValue);
-                    structHelpers.Animal.lower(ret);
+                    structHelpers.M10TestModuleT6Animal.lower(ret);
                 } catch (error) {
                     setException(error);
                 }
             }
             bjs["make_swift_closure_TestModule_10TestModule6AnimalV_6AnimalV"] = function(boxPtr, file, line) {
                 const lower_closure_TestModule_10TestModule6AnimalV_6AnimalV = function(param0) {
-                    structHelpers.Animal.lower(param0);
+                    structHelpers.M10TestModuleT6Animal.lower(param0);
                     instance.exports.invoke_swift_closure_TestModule_10TestModule6AnimalV_6AnimalV(boxPtr);
-                    const structValue = structHelpers.Animal.lift();
+                    const structValue = structHelpers.M10TestModuleT6Animal.lift();
                     if (tmpRetException) {
                         const error = swift.memory.getObject(tmpRetException);
                         swift.memory.release(tmpRetException);
@@ -437,9 +812,9 @@ export async function createInstantiator(options, swift) {
             bjs["invoke_js_callback_TestModule_10TestModule9APIResultO_9APIResultO"] = function(callbackId, param0) {
                 try {
                     const callback = swift.memory.getObject(callbackId);
-                    const enumValue = enumHelpers.APIResult.lift(param0);
+                    const enumValue = enumHelpers.M10TestModuleT9APIResult.lift(param0);
                     let ret = callback(enumValue);
-                    const caseId = enumHelpers.APIResult.lower(ret);
+                    const caseId = enumHelpers.M10TestModuleT9APIResult.lower(ret);
                     return caseId;
                 } catch (error) {
                     setException(error);
@@ -447,9 +822,9 @@ export async function createInstantiator(options, swift) {
             }
             bjs["make_swift_closure_TestModule_10TestModule9APIResultO_9APIResultO"] = function(boxPtr, file, line) {
                 const lower_closure_TestModule_10TestModule9APIResultO_9APIResultO = function(param0) {
-                    const param0CaseId = enumHelpers.APIResult.lower(param0);
+                    const param0CaseId = enumHelpers.M10TestModuleT9APIResult.lower(param0);
                     instance.exports.invoke_swift_closure_TestModule_10TestModule9APIResultO_9APIResultO(boxPtr, param0CaseId);
-                    const ret = enumHelpers.APIResult.lift(i32Stack.pop());
+                    const ret = enumHelpers.M10TestModuleT9APIResult.lift(i32Stack.pop());
                     if (tmpRetException) {
                         const error = swift.memory.getObject(tmpRetException);
                         swift.memory.release(tmpRetException);
@@ -483,6 +858,58 @@ export async function createInstantiator(options, swift) {
                 };
                 return makeClosure(boxPtr, file, line, lower_closure_TestModule_10TestModule9DirectionO_9DirectionO);
             }
+            bjs["invoke_js_callback_TestModule_10TestModuleKSS_Sb"] = function(callbackId, param0Bytes, param0Count) {
+                try {
+                    const callback = swift.memory.getObject(callbackId);
+                    const string = decodeString(param0Bytes, param0Count);
+                    let ret = callback(string);
+                    return ret ? 1 : 0;
+                } catch (error) {
+                    setException(error);
+                    return 0
+                }
+            }
+            bjs["make_swift_closure_TestModule_10TestModuleKSS_Sb"] = function(boxPtr, file, line) {
+                const lower_closure_TestModule_10TestModuleKSS_Sb = function(param0) {
+                    const param0Bytes = textEncoder.encode(param0);
+                    const param0Id = swift.memory.retain(param0Bytes);
+                    const ret = instance.exports.invoke_swift_closure_TestModule_10TestModuleKSS_Sb(boxPtr, param0Id, param0Bytes.length);
+                    if (tmpRetException) {
+                        const error = swift.memory.getObject(tmpRetException);
+                        swift.memory.release(tmpRetException);
+                        tmpRetException = undefined;
+                        throw error;
+                    }
+                    return ret !== 0;
+                };
+                return makeClosure(boxPtr, file, line, lower_closure_TestModule_10TestModuleKSS_Sb);
+            }
+            bjs["invoke_js_callback_TestModule_10TestModuleKSS_Si"] = function(callbackId, param0Bytes, param0Count) {
+                try {
+                    const callback = swift.memory.getObject(callbackId);
+                    const string = decodeString(param0Bytes, param0Count);
+                    let ret = callback(string);
+                    return ret;
+                } catch (error) {
+                    setException(error);
+                    return 0
+                }
+            }
+            bjs["make_swift_closure_TestModule_10TestModuleKSS_Si"] = function(boxPtr, file, line) {
+                const lower_closure_TestModule_10TestModuleKSS_Si = function(param0) {
+                    const param0Bytes = textEncoder.encode(param0);
+                    const param0Id = swift.memory.retain(param0Bytes);
+                    const ret = instance.exports.invoke_swift_closure_TestModule_10TestModuleKSS_Si(boxPtr, param0Id, param0Bytes.length);
+                    if (tmpRetException) {
+                        const error = swift.memory.getObject(tmpRetException);
+                        swift.memory.release(tmpRetException);
+                        tmpRetException = undefined;
+                        throw error;
+                    }
+                    return ret;
+                };
+                return makeClosure(boxPtr, file, line, lower_closure_TestModule_10TestModuleKSS_Si);
+            }
             bjs["invoke_js_callback_TestModule_10TestModuleSS_SS"] = function(callbackId, param0Bytes, param0Count) {
                 try {
                     const callback = swift.memory.getObject(callbackId);
@@ -672,43 +1099,28 @@ export async function createInstantiator(options, swift) {
                 };
                 return makeClosure(boxPtr, file, line, lower_closure_TestModule_10TestModuleSq5ThemeO_Sq5ThemeO);
             }
-            bjs["invoke_js_callback_TestModule_10TestModuleSq6AnimalV_Sq6AnimalV"] = function(callbackId, param0) {
+            bjs["invoke_js_callback_TestModule_10TestModuleSq6AnimalV_Sq6AnimalV"] = function(callbackId) {
                 try {
                     const callback = swift.memory.getObject(callbackId);
-                    let optResult;
-                    if (param0) {
-                        const struct = structHelpers.Animal.lift();
-                        optResult = struct;
-                    } else {
-                        optResult = null;
-                    }
-                    let ret = callback(optResult);
-                    const isSome = ret != null;
-                    if (isSome) {
-                        structHelpers.Animal.lower(ret);
-                    }
-                    i32Stack.push(isSome ? 1 : 0);
+                    const optValue = __bjs_codec_Optional_M10TestModuleT6Animal.lift();
+                    let ret = callback(optValue);
+                    __bjs_codec_Optional_M10TestModuleT6Animal.lower(ret);
                 } catch (error) {
                     setException(error);
                 }
             }
             bjs["make_swift_closure_TestModule_10TestModuleSq6AnimalV_Sq6AnimalV"] = function(boxPtr, file, line) {
                 const lower_closure_TestModule_10TestModuleSq6AnimalV_Sq6AnimalV = function(param0) {
-                    const isSome = param0 != null;
-                    if (isSome) {
-                        structHelpers.Animal.lower(param0);
-                    }
-                    i32Stack.push(+isSome);
+                    __bjs_codec_Optional_M10TestModuleT6Animal.lower(param0);
                     instance.exports.invoke_swift_closure_TestModule_10TestModuleSq6AnimalV_Sq6AnimalV(boxPtr);
-                    const isSome1 = i32Stack.pop();
-                    const optResult = isSome1 ? structHelpers.Animal.lift() : null;
+                    const optValue = __bjs_codec_Optional_M10TestModuleT6Animal.lift();
                     if (tmpRetException) {
                         const error = swift.memory.getObject(tmpRetException);
                         swift.memory.release(tmpRetException);
                         tmpRetException = undefined;
                         throw error;
                     }
-                    return optResult;
+                    return optValue;
                 };
                 return makeClosure(boxPtr, file, line, lower_closure_TestModule_10TestModuleSq6AnimalV_Sq6AnimalV);
             }
@@ -750,7 +1162,7 @@ export async function createInstantiator(options, swift) {
                     const callback = swift.memory.getObject(callbackId);
                     let optResult;
                     if (param0IsSome) {
-                        const enumValue = enumHelpers.APIResult.lift(param0CaseId);
+                        const enumValue = enumHelpers.M10TestModuleT9APIResult.lift(param0CaseId);
                         optResult = enumValue;
                     } else {
                         optResult = null;
@@ -758,7 +1170,7 @@ export async function createInstantiator(options, swift) {
                     let ret = callback(optResult);
                     const isSome = ret != null;
                     if (isSome) {
-                        const caseId = enumHelpers.APIResult.lower(ret);
+                        const caseId = enumHelpers.M10TestModuleT9APIResult.lower(ret);
                         return caseId;
                     } else {
                         return -1;
@@ -772,14 +1184,14 @@ export async function createInstantiator(options, swift) {
                     const isSome = param0 != null;
                     let result;
                     if (isSome) {
-                        const param0CaseId = enumHelpers.APIResult.lower(param0);
+                        const param0CaseId = enumHelpers.M10TestModuleT9APIResult.lower(param0);
                         result = param0CaseId;
                     } else {
                         result = 0;
                     }
                     instance.exports.invoke_swift_closure_TestModule_10TestModuleSq9APIResultO_Sq9APIResultO(boxPtr, +isSome, result);
                     const tag = i32Stack.pop();
-                    const optResult = tag === -1 ? null : enumHelpers.APIResult.lift(tag);
+                    const optResult = tag === -1 ? null : enumHelpers.M10TestModuleT9APIResult.lift(tag);
                     if (tmpRetException) {
                         const error = swift.memory.getObject(tmpRetException);
                         swift.memory.release(tmpRetException);
@@ -963,6 +1375,176 @@ export async function createInstantiator(options, swift) {
                 };
                 return makeClosure(boxPtr, file, line, lower_closure_TestModule_10TestModuleSqSi_SqSi);
             }
+            bjs["invoke_js_callback_TestModule_10TestModuleYaKSS_SS"] = function(resolveRef, rejectRef, callbackId, param0Bytes, param0Count) {
+                const resolve = swift.memory.getObject(resolveRef);
+                const reject = swift.memory.getObject(rejectRef);
+                const callback = swift.memory.getObject(callbackId);
+                const string = decodeString(param0Bytes, param0Count);
+                callback(string).then(resolve, reject);
+            }
+            bjs["make_swift_closure_TestModule_10TestModuleYaKSS_SS"] = function(boxPtr, file, line) {
+                const lower_closure_TestModule_10TestModuleYaKSS_SS = function(param0) {
+                    const param0Bytes = textEncoder.encode(param0);
+                    const param0Id = swift.memory.retain(param0Bytes);
+                    const ret = instance.exports.invoke_swift_closure_TestModule_10TestModuleYaKSS_SS(boxPtr, param0Id, param0Bytes.length);
+                    const ret1 = swift.memory.getObject(ret);
+                    swift.memory.release(ret);
+                    if (tmpRetException) {
+                        const error = swift.memory.getObject(tmpRetException);
+                        swift.memory.release(tmpRetException);
+                        tmpRetException = undefined;
+                        throw error;
+                    }
+                    return ret1;
+                };
+                return makeClosure(boxPtr, file, line, lower_closure_TestModule_10TestModuleYaKSS_SS);
+            }
+            bjs["invoke_js_callback_TestModule_10TestModuleYaKSb_9APIResultO"] = function(resolveRef, rejectRef, callbackId, param0) {
+                const resolve = swift.memory.getObject(resolveRef);
+                const reject = swift.memory.getObject(rejectRef);
+                const callback = swift.memory.getObject(callbackId);
+                callback(param0 !== 0).then(resolve, reject);
+            }
+            bjs["make_swift_closure_TestModule_10TestModuleYaKSb_9APIResultO"] = function(boxPtr, file, line) {
+                const lower_closure_TestModule_10TestModuleYaKSb_9APIResultO = function(param0) {
+                    const ret = instance.exports.invoke_swift_closure_TestModule_10TestModuleYaKSb_9APIResultO(boxPtr, param0);
+                    const ret1 = swift.memory.getObject(ret);
+                    swift.memory.release(ret);
+                    if (tmpRetException) {
+                        const error = swift.memory.getObject(tmpRetException);
+                        swift.memory.release(tmpRetException);
+                        tmpRetException = undefined;
+                        throw error;
+                    }
+                    return ret1;
+                };
+                return makeClosure(boxPtr, file, line, lower_closure_TestModule_10TestModuleYaKSb_9APIResultO);
+            }
+            bjs["invoke_js_callback_TestModule_10TestModuleYaSS_6AnimalV"] = function(resolveRef, rejectRef, callbackId, param0Bytes, param0Count) {
+                const resolve = swift.memory.getObject(resolveRef);
+                const reject = swift.memory.getObject(rejectRef);
+                const callback = swift.memory.getObject(callbackId);
+                const string = decodeString(param0Bytes, param0Count);
+                callback(string).then(resolve, reject);
+            }
+            bjs["make_swift_closure_TestModule_10TestModuleYaSS_6AnimalV"] = function(boxPtr, file, line) {
+                const lower_closure_TestModule_10TestModuleYaSS_6AnimalV = function(param0) {
+                    const param0Bytes = textEncoder.encode(param0);
+                    const param0Id = swift.memory.retain(param0Bytes);
+                    const ret = instance.exports.invoke_swift_closure_TestModule_10TestModuleYaSS_6AnimalV(boxPtr, param0Id, param0Bytes.length);
+                    const ret1 = swift.memory.getObject(ret);
+                    swift.memory.release(ret);
+                    return ret1;
+                };
+                return makeClosure(boxPtr, file, line, lower_closure_TestModule_10TestModuleYaSS_6AnimalV);
+            }
+            bjs["invoke_js_callback_TestModule_10TestModuleYaSS_SS"] = function(resolveRef, rejectRef, callbackId, param0Bytes, param0Count) {
+                const resolve = swift.memory.getObject(resolveRef);
+                const reject = swift.memory.getObject(rejectRef);
+                const callback = swift.memory.getObject(callbackId);
+                const string = decodeString(param0Bytes, param0Count);
+                callback(string).then(resolve, reject);
+            }
+            bjs["make_swift_closure_TestModule_10TestModuleYaSS_SS"] = function(boxPtr, file, line) {
+                const lower_closure_TestModule_10TestModuleYaSS_SS = function(param0) {
+                    const param0Bytes = textEncoder.encode(param0);
+                    const param0Id = swift.memory.retain(param0Bytes);
+                    const ret = instance.exports.invoke_swift_closure_TestModule_10TestModuleYaSS_SS(boxPtr, param0Id, param0Bytes.length);
+                    const ret1 = swift.memory.getObject(ret);
+                    swift.memory.release(ret);
+                    return ret1;
+                };
+                return makeClosure(boxPtr, file, line, lower_closure_TestModule_10TestModuleYaSS_SS);
+            }
+            bjs["invoke_js_callback_TestModule_10TestModules6AnimalV_y"] = function(callbackId) {
+                try {
+                    const callback = swift.memory.getObject(callbackId);
+                    const structValue = structHelpers.M10TestModuleT6Animal.lift();
+                    callback(structValue);
+                } catch (error) {
+                    setException(error);
+                }
+            }
+            bjs["make_swift_closure_TestModule_10TestModules6AnimalV_y"] = function(boxPtr, file, line) {
+                const lower_closure_TestModule_10TestModules6AnimalV_y = function(param0) {
+                    structHelpers.M10TestModuleT6Animal.lower(param0);
+                    instance.exports.invoke_swift_closure_TestModule_10TestModules6AnimalV_y(boxPtr);
+                    if (tmpRetException) {
+                        const error = swift.memory.getObject(tmpRetException);
+                        swift.memory.release(tmpRetException);
+                        tmpRetException = undefined;
+                        throw error;
+                    }
+                };
+                return makeClosure(boxPtr, file, line, lower_closure_TestModule_10TestModules6AnimalV_y);
+            }
+            bjs["invoke_js_callback_TestModule_10TestModules7JSValueV_y"] = function(callbackId, param0Kind, param0Payload1, param0Payload2) {
+                try {
+                    const callback = swift.memory.getObject(callbackId);
+                    const jsValue = __bjs_jsValueLift(param0Kind, param0Payload1, param0Payload2);
+                    callback(jsValue);
+                } catch (error) {
+                    setException(error);
+                }
+            }
+            bjs["make_swift_closure_TestModule_10TestModules7JSValueV_y"] = function(boxPtr, file, line) {
+                const lower_closure_TestModule_10TestModules7JSValueV_y = function(param0) {
+                    const [param0Kind, param0Payload1, param0Payload2] = __bjs_jsValueLower(param0);
+                    instance.exports.invoke_swift_closure_TestModule_10TestModules7JSValueV_y(boxPtr, param0Kind, param0Payload1, param0Payload2);
+                    if (tmpRetException) {
+                        const error = swift.memory.getObject(tmpRetException);
+                        swift.memory.release(tmpRetException);
+                        tmpRetException = undefined;
+                        throw error;
+                    }
+                };
+                return makeClosure(boxPtr, file, line, lower_closure_TestModule_10TestModules7JSValueV_y);
+            }
+            bjs["invoke_js_callback_TestModule_10TestModules9APIResultO_y"] = function(callbackId, param0) {
+                try {
+                    const callback = swift.memory.getObject(callbackId);
+                    const enumValue = enumHelpers.M10TestModuleT9APIResult.lift(param0);
+                    callback(enumValue);
+                } catch (error) {
+                    setException(error);
+                }
+            }
+            bjs["make_swift_closure_TestModule_10TestModules9APIResultO_y"] = function(boxPtr, file, line) {
+                const lower_closure_TestModule_10TestModules9APIResultO_y = function(param0) {
+                    const param0CaseId = enumHelpers.M10TestModuleT9APIResult.lower(param0);
+                    instance.exports.invoke_swift_closure_TestModule_10TestModules9APIResultO_y(boxPtr, param0CaseId);
+                    if (tmpRetException) {
+                        const error = swift.memory.getObject(tmpRetException);
+                        swift.memory.release(tmpRetException);
+                        tmpRetException = undefined;
+                        throw error;
+                    }
+                };
+                return makeClosure(boxPtr, file, line, lower_closure_TestModule_10TestModules9APIResultO_y);
+            }
+            bjs["invoke_js_callback_TestModule_10TestModulesSS_y"] = function(callbackId, param0Bytes, param0Count) {
+                try {
+                    const callback = swift.memory.getObject(callbackId);
+                    const string = decodeString(param0Bytes, param0Count);
+                    callback(string);
+                } catch (error) {
+                    setException(error);
+                }
+            }
+            bjs["make_swift_closure_TestModule_10TestModulesSS_y"] = function(boxPtr, file, line) {
+                const lower_closure_TestModule_10TestModulesSS_y = function(param0) {
+                    const param0Bytes = textEncoder.encode(param0);
+                    const param0Id = swift.memory.retain(param0Bytes);
+                    instance.exports.invoke_swift_closure_TestModule_10TestModulesSS_y(boxPtr, param0Id, param0Bytes.length);
+                    if (tmpRetException) {
+                        const error = swift.memory.getObject(tmpRetException);
+                        swift.memory.release(tmpRetException);
+                        tmpRetException = undefined;
+                        throw error;
+                    }
+                };
+                return makeClosure(boxPtr, file, line, lower_closure_TestModule_10TestModulesSS_y);
+            }
             // Wrapper functions for module: TestModule
             if (!importObject["TestModule"]) {
                 importObject["TestModule"] = {};
@@ -1001,6 +1583,7 @@ export async function createInstantiator(options, swift) {
             /// Represents a Swift heap object like a class instance or an actor instance.
             class SwiftHeapObject {
                 static __wrap(pointer, deinit, prototype, identityCache) {
+                    pointer = pointer >>> 0;
                     const makeFresh = (identityMap) => {
                         const obj = Object.create(prototype);
                         const state = { pointer, deinit, hasReleased: false, identityMap };
@@ -1063,15 +1646,13 @@ export async function createInstantiator(options, swift) {
                     return TestProcessor.__construct(ret);
                 }
             }
-            const AnimalHelpers = __bjs_createAnimalHelpers();
-            structHelpers.Animal = AnimalHelpers;
+            const __bjs_helpers_M10TestModuleT6Animal = __bjs_createStructHelpers_M10TestModuleT6Animal();
+            structHelpers.M10TestModuleT6Animal = __bjs_helpers_M10TestModuleT6Animal;
 
-            const APIResultHelpers = __bjs_createAPIResultValuesHelpers();
-            enumHelpers.APIResult = APIResultHelpers;
+            const __bjs_helpers_M10TestModuleT9APIResult = __bjs_createEnumHelpers_M10TestModuleT9APIResult();
+            enumHelpers.M10TestModuleT9APIResult = __bjs_helpers_M10TestModuleT9APIResult;
 
             const exports = {
-                Person,
-                TestProcessor,
                 roundtripAnimal: function bjs_roundtripAnimal(animalClosure) {
                     const callbackId = swift.memory.retain(animalClosure);
                     const ret = instance.exports.bjs_roundtripAnimal(callbackId);
@@ -1142,6 +1723,30 @@ export async function createInstantiator(options, swift) {
                     const ret = instance.exports.bjs_roundtripOptionalPerson(callbackId);
                     return swift.memory.getObject(ret);
                 },
+                makeThrowingParser: function bjs_makeThrowingParser() {
+                    const ret = instance.exports.bjs_makeThrowingParser();
+                    return swift.memory.getObject(ret);
+                },
+                validateWith: function bjs_validateWith(validate) {
+                    const callbackId = swift.memory.retain(validate);
+                    instance.exports.bjs_validateWith(callbackId);
+                },
+                makeFetcher: function bjs_makeFetcher() {
+                    const ret = instance.exports.bjs_makeFetcher();
+                    return swift.memory.getObject(ret);
+                },
+                makeAsyncEcho: function bjs_makeAsyncEcho() {
+                    const ret = instance.exports.bjs_makeAsyncEcho();
+                    return swift.memory.getObject(ret);
+                },
+                makeAnimalLoader: function bjs_makeAnimalLoader() {
+                    const ret = instance.exports.bjs_makeAnimalLoader();
+                    return swift.memory.getObject(ret);
+                },
+                makeResultLoader: function bjs_makeResultLoader() {
+                    const ret = instance.exports.bjs_makeResultLoader();
+                    return swift.memory.getObject(ret);
+                },
                 roundtripDirection: function bjs_roundtripDirection(callback) {
                     const callbackId = swift.memory.retain(callback);
                     const ret = instance.exports.bjs_roundtripDirection(callbackId);
@@ -1196,10 +1801,12 @@ export async function createInstantiator(options, swift) {
                         const typeBytes = textEncoder.encode(type);
                         const typeId = swift.memory.retain(typeBytes);
                         instance.exports.bjs_Animal_init(typeId, typeBytes.length);
-                        const structValue = structHelpers.Animal.lift();
+                        const structValue = structHelpers.M10TestModuleT6Animal.lift();
                         return structValue;
                     },
                 },
+                Person,
+                TestProcessor,
             };
             _exports = exports;
             return exports;
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosureImports.d.ts b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosureImports.d.ts
index ebf493910..b66f960f8 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosureImports.d.ts
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosureImports.d.ts
@@ -5,6 +5,8 @@
 // `swift package bridge-js`.
 
 export type Exports = {
+    runValidator(cb: (arg0: string) => boolean): void;
+    loadEach(fetch: (arg0: string) => Promise<string>): void;
 }
 export type Imports = {
     applyInt(value: number, transform: (arg0: number) => number): number;
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosureImports.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosureImports.js
index cffbdcf67..96c78dd22 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosureImports.js
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosureImports.js
@@ -31,6 +31,95 @@ export async function createInstantiator(options, swift) {
 
     let _exports = null;
     let bjs = null;
+    function __bjs_jsValueLower(value) {
+        let kind;
+        let payload1;
+        let payload2;
+        if (value === null) {
+            kind = 4;
+            payload1 = 0;
+            payload2 = 0;
+        } else {
+            switch (typeof value) {
+                case "boolean":
+                    kind = 0;
+                    payload1 = value ? 1 : 0;
+                    payload2 = 0;
+                    break;
+                case "number":
+                    kind = 2;
+                    payload1 = 0;
+                    payload2 = value;
+                    break;
+                case "string":
+                    kind = 1;
+                    payload1 = swift.memory.retain(value);
+                    payload2 = 0;
+                    break;
+                case "undefined":
+                    kind = 5;
+                    payload1 = 0;
+                    payload2 = 0;
+                    break;
+                case "object":
+                    kind = 3;
+                    payload1 = swift.memory.retain(value);
+                    payload2 = 0;
+                    break;
+                case "function":
+                    kind = 3;
+                    payload1 = swift.memory.retain(value);
+                    payload2 = 0;
+                    break;
+                case "symbol":
+                    kind = 7;
+                    payload1 = swift.memory.retain(value);
+                    payload2 = 0;
+                    break;
+                case "bigint":
+                    kind = 8;
+                    payload1 = swift.memory.retain(value);
+                    payload2 = 0;
+                    break;
+                default:
+                    throw new TypeError("Unsupported JSValue type");
+            }
+        }
+        return [kind, payload1, payload2];
+    }
+    function __bjs_jsValueLift(kind, payload1, payload2) {
+        let jsValue;
+        switch (kind) {
+            case 0:
+                jsValue = payload1 !== 0;
+                break;
+            case 1:
+                jsValue = swift.memory.getObject(payload1);
+                break;
+            case 2:
+                jsValue = payload2;
+                break;
+            case 3:
+                jsValue = swift.memory.getObject(payload1);
+                break;
+            case 4:
+                jsValue = null;
+                break;
+            case 5:
+                jsValue = undefined;
+                break;
+            case 7:
+                jsValue = swift.memory.getObject(payload1);
+                break;
+            case 8:
+                jsValue = swift.memory.getObject(payload1);
+                break;
+            default:
+                throw new TypeError("Unsupported JSValue kind " + kind);
+        }
+        return jsValue;
+    }
+
     const swiftClosureRegistry = (typeof FinalizationRegistry === "undefined") ? { register: () => {}, unregister: () => {} } : new FinalizationRegistry((state) => {
         if (state.unregistered) { return; }
         instance?.exports?.bjs_release_swift_closure(state.pointer);
@@ -39,7 +128,7 @@ export async function createInstantiator(options, swift) {
         const state = { pointer, file, line, unregistered: false };
         const real = (...args) => {
             if (state.unregistered) {
-                const bytes = new Uint8Array(memory.buffer, state.file);
+                const bytes = new Uint8Array(memory.buffer, state.file >>> 0);
                 let length = 0;
                 while (bytes[length] !== 0) { length += 1; }
                 const fileID = decodeString(state.file, length);
@@ -71,14 +160,14 @@ export async function createInstantiator(options, swift) {
             bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) {
                 const source = swift.memory.getObject(sourceId);
                 swift.memory.release(sourceId);
-                const bytes = new Uint8Array(memory.buffer, bytesPtr);
+                const bytes = new Uint8Array(memory.buffer, bytesPtr >>> 0);
                 bytes.set(source);
             }
             bjs["swift_js_make_js_string"] = function(ptr, len) {
                 return swift.memory.retain(decodeString(ptr, len));
             }
             bjs["swift_js_init_memory_with_result"] = function(ptr, len) {
-                const target = new Uint8Array(memory.buffer, ptr, len);
+                const target = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0);
                 target.set(tmpRetBytes);
                 tmpRetBytes = undefined;
             }
@@ -132,6 +221,30 @@ export async function createInstantiator(options, swift) {
                 const copy = memory.buffer.slice(ptr, ptr + byteLen);
                 taStack.push(Array.from(new Ctor(copy)));
             }
+            bjs["bjs_core_register_type_handles"] = function() {};
+            const __bjs_promiseSettlers = Symbol("JavaScriptKit.promiseSettlers");
+            bjs["swift_js_make_promise"] = function() {
+                let resolve, reject;
+                const promise = new Promise((res, rej) => { resolve = res; reject = rej; });
+                promise[__bjs_promiseSettlers] = { resolve, reject };
+                return swift.memory.retain(promise);
+            }
+            bjs["promise_resolve_TestModule_SS"] = function(promise, valueBytes, valueCount) {
+                try {
+                    const string = decodeString(valueBytes, valueCount);
+                    swift.memory.getObject(promise)[__bjs_promiseSettlers].resolve(string);
+                } catch (error) {
+                    setException(error);
+                }
+            }
+            bjs["promise_reject_TestModule"] = function(promise, valueKind, valuePayload1, valuePayload2) {
+                try {
+                    const jsValue = __bjs_jsValueLift(valueKind, valuePayload1, valuePayload2);
+                    swift.memory.getObject(promise)[__bjs_promiseSettlers].reject(jsValue);
+                } catch (error) {
+                    setException(error);
+                }
+            }
             bjs["swift_js_return_optional_bool"] = function(isSome, value) {
                 if (isSome === 0) {
                     tmpRetOptionalBool = null;
@@ -226,6 +339,32 @@ export async function createInstantiator(options, swift) {
                 const func = swift.memory.getObject(funcRef);
                 func.__unregister();
             }
+            bjs["invoke_js_callback_TestModule_10TestModuleKSS_Sb"] = function(callbackId, param0Bytes, param0Count) {
+                try {
+                    const callback = swift.memory.getObject(callbackId);
+                    const string = decodeString(param0Bytes, param0Count);
+                    let ret = callback(string);
+                    return ret ? 1 : 0;
+                } catch (error) {
+                    setException(error);
+                    return 0
+                }
+            }
+            bjs["make_swift_closure_TestModule_10TestModuleKSS_Sb"] = function(boxPtr, file, line) {
+                const lower_closure_TestModule_10TestModuleKSS_Sb = function(param0) {
+                    const param0Bytes = textEncoder.encode(param0);
+                    const param0Id = swift.memory.retain(param0Bytes);
+                    const ret = instance.exports.invoke_swift_closure_TestModule_10TestModuleKSS_Sb(boxPtr, param0Id, param0Bytes.length);
+                    if (tmpRetException) {
+                        const error = swift.memory.getObject(tmpRetException);
+                        swift.memory.release(tmpRetException);
+                        tmpRetException = undefined;
+                        throw error;
+                    }
+                    return ret !== 0;
+                };
+                return makeClosure(boxPtr, file, line, lower_closure_TestModule_10TestModuleKSS_Sb);
+            }
             bjs["invoke_js_callback_TestModule_10TestModuleSi_Si"] = function(callbackId, param0) {
                 try {
                     const callback = swift.memory.getObject(callbackId);
@@ -249,6 +388,75 @@ export async function createInstantiator(options, swift) {
                 };
                 return makeClosure(boxPtr, file, line, lower_closure_TestModule_10TestModuleSi_Si);
             }
+            bjs["invoke_js_callback_TestModule_10TestModuleYaKSS_SS"] = function(resolveRef, rejectRef, callbackId, param0Bytes, param0Count) {
+                const resolve = swift.memory.getObject(resolveRef);
+                const reject = swift.memory.getObject(rejectRef);
+                const callback = swift.memory.getObject(callbackId);
+                const string = decodeString(param0Bytes, param0Count);
+                callback(string).then(resolve, reject);
+            }
+            bjs["make_swift_closure_TestModule_10TestModuleYaKSS_SS"] = function(boxPtr, file, line) {
+                const lower_closure_TestModule_10TestModuleYaKSS_SS = function(param0) {
+                    const param0Bytes = textEncoder.encode(param0);
+                    const param0Id = swift.memory.retain(param0Bytes);
+                    const ret = instance.exports.invoke_swift_closure_TestModule_10TestModuleYaKSS_SS(boxPtr, param0Id, param0Bytes.length);
+                    const ret1 = swift.memory.getObject(ret);
+                    swift.memory.release(ret);
+                    if (tmpRetException) {
+                        const error = swift.memory.getObject(tmpRetException);
+                        swift.memory.release(tmpRetException);
+                        tmpRetException = undefined;
+                        throw error;
+                    }
+                    return ret1;
+                };
+                return makeClosure(boxPtr, file, line, lower_closure_TestModule_10TestModuleYaKSS_SS);
+            }
+            bjs["invoke_js_callback_TestModule_10TestModules7JSValueV_y"] = function(callbackId, param0Kind, param0Payload1, param0Payload2) {
+                try {
+                    const callback = swift.memory.getObject(callbackId);
+                    const jsValue = __bjs_jsValueLift(param0Kind, param0Payload1, param0Payload2);
+                    callback(jsValue);
+                } catch (error) {
+                    setException(error);
+                }
+            }
+            bjs["make_swift_closure_TestModule_10TestModules7JSValueV_y"] = function(boxPtr, file, line) {
+                const lower_closure_TestModule_10TestModules7JSValueV_y = function(param0) {
+                    const [param0Kind, param0Payload1, param0Payload2] = __bjs_jsValueLower(param0);
+                    instance.exports.invoke_swift_closure_TestModule_10TestModules7JSValueV_y(boxPtr, param0Kind, param0Payload1, param0Payload2);
+                    if (tmpRetException) {
+                        const error = swift.memory.getObject(tmpRetException);
+                        swift.memory.release(tmpRetException);
+                        tmpRetException = undefined;
+                        throw error;
+                    }
+                };
+                return makeClosure(boxPtr, file, line, lower_closure_TestModule_10TestModules7JSValueV_y);
+            }
+            bjs["invoke_js_callback_TestModule_10TestModulesSS_y"] = function(callbackId, param0Bytes, param0Count) {
+                try {
+                    const callback = swift.memory.getObject(callbackId);
+                    const string = decodeString(param0Bytes, param0Count);
+                    callback(string);
+                } catch (error) {
+                    setException(error);
+                }
+            }
+            bjs["make_swift_closure_TestModule_10TestModulesSS_y"] = function(boxPtr, file, line) {
+                const lower_closure_TestModule_10TestModulesSS_y = function(param0) {
+                    const param0Bytes = textEncoder.encode(param0);
+                    const param0Id = swift.memory.retain(param0Bytes);
+                    instance.exports.invoke_swift_closure_TestModule_10TestModulesSS_y(boxPtr, param0Id, param0Bytes.length);
+                    if (tmpRetException) {
+                        const error = swift.memory.getObject(tmpRetException);
+                        swift.memory.release(tmpRetException);
+                        tmpRetException = undefined;
+                        throw error;
+                    }
+                };
+                return makeClosure(boxPtr, file, line, lower_closure_TestModule_10TestModulesSS_y);
+            }
             const TestModule = importObject["TestModule"] = importObject["TestModule"] || {};
             TestModule["bjs_applyInt"] = function bjs_applyInt(value, transform) {
                 try {
@@ -286,6 +494,14 @@ export async function createInstantiator(options, swift) {
         createExports: (instance) => {
             const js = swift.memory.heap;
             const exports = {
+                runValidator: function bjs_runValidator(cb) {
+                    const callbackId = swift.memory.retain(cb);
+                    instance.exports.bjs_runValidator(callbackId);
+                },
+                loadEach: function bjs_loadEach(fetch) {
+                    const callbackId = swift.memory.retain(fetch);
+                    instance.exports.bjs_loadEach(callbackId);
+                },
             };
             _exports = exports;
             return exports;
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStruct.d.ts b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStruct.d.ts
index bf4ebc71f..3b394fb06 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStruct.d.ts
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStruct.d.ts
@@ -48,6 +48,7 @@ export interface Vector2D {
     dy: number;
     magnitude(): number;
     scaled(factor: number): Vector2D;
+    describe(): string;
 }
 export type PrecisionObject = typeof PrecisionValues;
 
@@ -63,24 +64,24 @@ export interface Greeter extends SwiftHeapObject {
     name: string;
 }
 export type Exports = {
-    Greeter: {
-        new(name: string): Greeter;
-    }
     roundtrip(session: Person): Person;
     roundtripContainer(container: Container): Container;
     Precision: PrecisionObject
-    DataPoint: {
-        init(x: number, y: number, label: string, optCount: number | null, optFlag: boolean | null): DataPoint;
-        readonly dimensions: number;
-        origin(): DataPoint;
-    }
     ConfigStruct: {
         readonly maxRetries: number;
         defaultConfig: string;
         timeout: number;
         readonly computedSetting: string;
         update(timeout: number): number;
-    }
+    },
+    DataPoint: {
+        init(x: number, y: number, label: string, optCount: number | null, optFlag: boolean | null): DataPoint;
+        readonly dimensions: number;
+        origin(): DataPoint;
+    },
+    Greeter: {
+        new(name: string): Greeter;
+    },
 }
 export type Imports = {
 }
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStruct.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStruct.js
index d55d5c095..fc3d9ddbb 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStruct.js
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStruct.js
@@ -36,7 +36,357 @@ export async function createInstantiator(options, swift) {
 
     let _exports = null;
     let bjs = null;
-    const __bjs_createDataPointHelpers = () => ({
+    const __bjs_arrayCodecCache = new WeakMap();
+    function __bjs_arrayCodec(elementCodec) {
+        let codec = __bjs_arrayCodecCache.get(elementCodec);
+        if (codec !== undefined) {
+            return codec;
+        }
+        codec = {
+            lower(value) {
+                for (let i = 0; i < value.length; i++) {
+                    elementCodec.lower(value[i]);
+                }
+                i32Stack.push(value.length);
+            },
+            lift() {
+                const count = i32Stack.pop();
+                if (count === -1) {
+                    return taStack.pop();
+                }
+                const result = new Array(count);
+                for (let i = count - 1; i >= 0; i--) {
+                    result[i] = elementCodec.lift();
+                }
+                return result;
+            },
+        };
+        __bjs_arrayCodecCache.set(elementCodec, codec);
+        return codec;
+    }
+    const __bjs_optionalCodecCache = new WeakMap();
+    const __bjs_optionalCodecUndefinedOrCache = new WeakMap();
+    function __bjs_optionalCodec(elementCodec, isUndefinedOr = false) {
+        const cache = isUndefinedOr ? __bjs_optionalCodecUndefinedOrCache : __bjs_optionalCodecCache;
+        let codec = cache.get(elementCodec);
+        if (codec !== undefined) {
+            return codec;
+        }
+        codec = {
+            lower(value) {
+                const isSome = isUndefinedOr ? value !== undefined : value != null;
+                if (isSome) {
+                    elementCodec.lower(value);
+                    i32Stack.push(1);
+                } else {
+                    i32Stack.push(0);
+                }
+            },
+            lift() {
+                if (i32Stack.pop() === 0) {
+                    return isUndefinedOr ? undefined : null;
+                }
+                return elementCodec.lift();
+            },
+        };
+        cache.set(elementCodec, codec);
+        return codec;
+    }
+    const __bjs_dictCodecCache = new WeakMap();
+    function __bjs_dictCodec(valueCodec) {
+        let codec = __bjs_dictCodecCache.get(valueCodec);
+        if (codec !== undefined) {
+            return codec;
+        }
+        codec = {
+            lower(value) {
+                const keys = Object.keys(value);
+                for (let i = 0; i < keys.length; i++) {
+                    __bjs_stringCodec.lower(keys[i]);
+                    valueCodec.lower(value[keys[i]]);
+                }
+                i32Stack.push(keys.length);
+            },
+            lift() {
+                const count = i32Stack.pop();
+                const result = {};
+                for (let i = 0; i < count; i++) {
+                    const value = valueCodec.lift();
+                    const key = __bjs_stringCodec.lift();
+                    result[key] = value;
+                }
+                return result;
+            },
+        };
+        __bjs_dictCodecCache.set(valueCodec, codec);
+        return codec;
+    }
+
+    const __bjs_stringCodec = {
+        lower: (v) => {
+            const bytes = textEncoder.encode(v);
+            const id = swift.memory.retain(bytes);
+            i32Stack.push(bytes.length);
+            i32Stack.push(id);
+        },
+        lift: () => {
+            const string = strStack.pop();
+            return string;
+        },
+    };
+    const __bjs_primitiveCodecs = {
+        Bool: {
+            lower: (v) => {
+                i32Stack.push(v ? 1 : 0);
+            },
+            lift: () => {
+                const bool = i32Stack.pop() !== 0;
+                return bool;
+            },
+        },
+        Int: {
+            lower: (v) => {
+                i32Stack.push((v | 0));
+            },
+            lift: () => {
+                const int = i32Stack.pop();
+                return int;
+            },
+        },
+        Int8: {
+            lower: (v) => {
+                i32Stack.push((v | 0));
+            },
+            lift: () => {
+                const int = i32Stack.pop();
+                return int;
+            },
+        },
+        UInt8: {
+            lower: (v) => {
+                i32Stack.push((v | 0));
+            },
+            lift: () => {
+                const int = i32Stack.pop() >>> 0;
+                return int;
+            },
+        },
+        Int16: {
+            lower: (v) => {
+                i32Stack.push((v | 0));
+            },
+            lift: () => {
+                const int = i32Stack.pop();
+                return int;
+            },
+        },
+        UInt16: {
+            lower: (v) => {
+                i32Stack.push((v | 0));
+            },
+            lift: () => {
+                const int = i32Stack.pop() >>> 0;
+                return int;
+            },
+        },
+        Int32: {
+            lower: (v) => {
+                i32Stack.push((v | 0));
+            },
+            lift: () => {
+                const int = i32Stack.pop();
+                return int;
+            },
+        },
+        UInt32: {
+            lower: (v) => {
+                i32Stack.push((v | 0));
+            },
+            lift: () => {
+                const int = i32Stack.pop() >>> 0;
+                return int;
+            },
+        },
+        UInt: {
+            lower: (v) => {
+                i32Stack.push((v | 0));
+            },
+            lift: () => {
+                const int = i32Stack.pop() >>> 0;
+                return int;
+            },
+        },
+        Int64: {
+            lower: (v) => {
+                i64Stack.push(v);
+            },
+            lift: () => {
+                const int = i64Stack.pop();
+                return int;
+            },
+        },
+        UInt64: {
+            lower: (v) => {
+                i64Stack.push(v);
+            },
+            lift: () => {
+                const int = i64Stack.pop();
+                return int;
+            },
+        },
+        Float: {
+            lower: (v) => {
+                f32Stack.push(Math.fround(v));
+            },
+            lift: () => {
+                const f32 = f32Stack.pop();
+                return f32;
+            },
+        },
+        Double: {
+            lower: (v) => {
+                f64Stack.push(v);
+            },
+            lift: () => {
+                const f64 = f64Stack.pop();
+                return f64;
+            },
+        },
+        String: __bjs_stringCodec,
+        JSValue: {
+            lower: (v) => {
+                const [vKind, vPayload1, vPayload2] = __bjs_jsValueLower(v);
+                i32Stack.push(vKind);
+                i32Stack.push(vPayload1);
+                f64Stack.push(vPayload2);
+            },
+            lift: () => {
+                const jsValuePayload2 = f64Stack.pop();
+                const jsValuePayload1 = i32Stack.pop();
+                const jsValueKind = i32Stack.pop();
+                const jsValue = __bjs_jsValueLift(jsValueKind, jsValuePayload1, jsValuePayload2);
+                return jsValue;
+            },
+        },
+    };
+
+    function __bjs_jsValueLower(value) {
+        let kind;
+        let payload1;
+        let payload2;
+        if (value === null) {
+            kind = 4;
+            payload1 = 0;
+            payload2 = 0;
+        } else {
+            switch (typeof value) {
+                case "boolean":
+                    kind = 0;
+                    payload1 = value ? 1 : 0;
+                    payload2 = 0;
+                    break;
+                case "number":
+                    kind = 2;
+                    payload1 = 0;
+                    payload2 = value;
+                    break;
+                case "string":
+                    kind = 1;
+                    payload1 = swift.memory.retain(value);
+                    payload2 = 0;
+                    break;
+                case "undefined":
+                    kind = 5;
+                    payload1 = 0;
+                    payload2 = 0;
+                    break;
+                case "object":
+                    kind = 3;
+                    payload1 = swift.memory.retain(value);
+                    payload2 = 0;
+                    break;
+                case "function":
+                    kind = 3;
+                    payload1 = swift.memory.retain(value);
+                    payload2 = 0;
+                    break;
+                case "symbol":
+                    kind = 7;
+                    payload1 = swift.memory.retain(value);
+                    payload2 = 0;
+                    break;
+                case "bigint":
+                    kind = 8;
+                    payload1 = swift.memory.retain(value);
+                    payload2 = 0;
+                    break;
+                default:
+                    throw new TypeError("Unsupported JSValue type");
+            }
+        }
+        return [kind, payload1, payload2];
+    }
+    function __bjs_jsValueLift(kind, payload1, payload2) {
+        let jsValue;
+        switch (kind) {
+            case 0:
+                jsValue = payload1 !== 0;
+                break;
+            case 1:
+                jsValue = swift.memory.getObject(payload1);
+                break;
+            case 2:
+                jsValue = payload2;
+                break;
+            case 3:
+                jsValue = swift.memory.getObject(payload1);
+                break;
+            case 4:
+                jsValue = null;
+                break;
+            case 5:
+                jsValue = undefined;
+                break;
+            case 7:
+                jsValue = swift.memory.getObject(payload1);
+                break;
+            case 8:
+                jsValue = swift.memory.getObject(payload1);
+                break;
+            default:
+                throw new TypeError("Unsupported JSValue kind " + kind);
+        }
+        return jsValue;
+    }
+
+    const __bjs_codec_Optional_Int = __bjs_optionalCodec(__bjs_primitiveCodecs.Int);
+    const __bjs_codec_Optional_Bool = __bjs_optionalCodec(__bjs_primitiveCodecs.Bool);
+    const __bjs_codec_Optional_String = __bjs_optionalCodec(__bjs_stringCodec);
+    const __bjs_codec_M10TestModuleT9Precision = {
+        lower: (v) => {
+            f32Stack.push(Math.fround(v));
+        },
+        lift: () => {
+            const rawValue = f32Stack.pop();
+            return rawValue;
+        },
+    };
+    const __bjs_codec_Optional_M10TestModuleT9Precision = __bjs_optionalCodec(__bjs_codec_M10TestModuleT9Precision);
+    const __bjs_codec_JSObject = {
+        lower: (v) => {
+            const objId = swift.memory.retain(v);
+            i32Stack.push(objId);
+        },
+        lift: () => {
+            const objId = i32Stack.pop();
+            const obj = swift.memory.getObject(objId);
+            swift.memory.release(objId);
+            return obj;
+        },
+    };
+    const __bjs_codec_Optional_JSObject = __bjs_optionalCodec(__bjs_codec_JSObject);
+
+    const __bjs_createStructHelpers_M10TestModuleT9DataPoint = () => ({
         lower: (value) => {
             f64Stack.push(value.x);
             f64Stack.push(value.y);
@@ -44,41 +394,19 @@ export async function createInstantiator(options, swift) {
             const id = swift.memory.retain(bytes);
             i32Stack.push(bytes.length);
             i32Stack.push(id);
-            const isSome = value.optCount != null ? 1 : 0;
-            if (isSome) {
-                i32Stack.push((value.optCount | 0));
-            }
-            i32Stack.push(isSome);
-            const isSome1 = value.optFlag != null ? 1 : 0;
-            if (isSome1) {
-                i32Stack.push(value.optFlag ? 1 : 0);
-            }
-            i32Stack.push(isSome1);
+            __bjs_codec_Optional_Int.lower(value.optCount);
+            __bjs_codec_Optional_Bool.lower(value.optFlag);
         },
         lift: () => {
-            const isSome = i32Stack.pop();
-            let optValue;
-            if (isSome === 0) {
-                optValue = null;
-            } else {
-                const bool = i32Stack.pop() !== 0;
-                optValue = bool;
-            }
-            const isSome1 = i32Stack.pop();
-            let optValue1;
-            if (isSome1 === 0) {
-                optValue1 = null;
-            } else {
-                const int = i32Stack.pop();
-                optValue1 = int;
-            }
+            const optValue = __bjs_codec_Optional_Bool.lift();
+            const optValue1 = __bjs_codec_Optional_Int.lift();
             const string = strStack.pop();
             const f64 = f64Stack.pop();
             const f641 = f64Stack.pop();
             return { x: f641, y: f64, label: string, optCount: optValue1, optFlag: optValue };
         }
     });
-    const __bjs_createAddressHelpers = () => ({
+    const __bjs_createStructHelpers_M10TestModuleT7Address = () => ({
         lower: (value) => {
             const bytes = textEncoder.encode(value.street);
             const id = swift.memory.retain(bytes);
@@ -88,59 +416,34 @@ export async function createInstantiator(options, swift) {
             const id1 = swift.memory.retain(bytes1);
             i32Stack.push(bytes1.length);
             i32Stack.push(id1);
-            const isSome = value.zipCode != null ? 1 : 0;
-            if (isSome) {
-                i32Stack.push((value.zipCode | 0));
-            }
-            i32Stack.push(isSome);
+            __bjs_codec_Optional_Int.lower(value.zipCode);
         },
         lift: () => {
-            const isSome = i32Stack.pop();
-            let optValue;
-            if (isSome === 0) {
-                optValue = null;
-            } else {
-                const int = i32Stack.pop();
-                optValue = int;
-            }
+            const optValue = __bjs_codec_Optional_Int.lift();
             const string = strStack.pop();
             const string1 = strStack.pop();
             return { street: string1, city: string, zipCode: optValue };
         }
     });
-    const __bjs_createPersonHelpers = () => ({
+    const __bjs_createStructHelpers_M10TestModuleT6Person = () => ({
         lower: (value) => {
             const bytes = textEncoder.encode(value.name);
             const id = swift.memory.retain(bytes);
             i32Stack.push(bytes.length);
             i32Stack.push(id);
             i32Stack.push((value.age | 0));
-            structHelpers.Address.lower(value.address);
-            const isSome = value.email != null ? 1 : 0;
-            if (isSome) {
-                const bytes1 = textEncoder.encode(value.email);
-                const id1 = swift.memory.retain(bytes1);
-                i32Stack.push(bytes1.length);
-                i32Stack.push(id1);
-            }
-            i32Stack.push(isSome);
+            structHelpers.M10TestModuleT7Address.lower(value.address);
+            __bjs_codec_Optional_String.lower(value.email);
         },
         lift: () => {
-            const isSome = i32Stack.pop();
-            let optValue;
-            if (isSome === 0) {
-                optValue = null;
-            } else {
-                const string = strStack.pop();
-                optValue = string;
-            }
-            const struct = structHelpers.Address.lift();
+            const optValue = __bjs_codec_Optional_String.lift();
+            const struct = structHelpers.M10TestModuleT7Address.lift();
             const int = i32Stack.pop();
-            const string1 = strStack.pop();
-            return { name: string1, age: int, address: struct, email: optValue };
+            const string = strStack.pop();
+            return { name: string, age: int, address: struct, email: optValue };
         }
     });
-    const __bjs_createSessionHelpers = () => ({
+    const __bjs_createStructHelpers_M10TestModuleT7Session = () => ({
         lower: (value) => {
             i32Stack.push((value.id | 0));
             ptrStack.push(value.owner.pointer);
@@ -152,38 +455,27 @@ export async function createInstantiator(options, swift) {
             return { id: int, owner: obj };
         }
     });
-    const __bjs_createMeasurementHelpers = () => ({
+    const __bjs_createStructHelpers_M10TestModuleT11Measurement = () => ({
         lower: (value) => {
             f64Stack.push(value.value);
             f32Stack.push(Math.fround(value.precision));
-            const isSome = value.optionalPrecision != null ? 1 : 0;
-            if (isSome) {
-                f32Stack.push(Math.fround(value.optionalPrecision));
-            }
-            i32Stack.push(isSome);
+            __bjs_codec_Optional_M10TestModuleT9Precision.lower(value.optionalPrecision);
         },
         lift: () => {
-            const isSome = i32Stack.pop();
-            let optValue;
-            if (isSome === 0) {
-                optValue = null;
-            } else {
-                const rawValue = f32Stack.pop();
-                optValue = rawValue;
-            }
-            const rawValue1 = f32Stack.pop();
+            const optValue = __bjs_codec_Optional_M10TestModuleT9Precision.lift();
+            const rawValue = f32Stack.pop();
             const f64 = f64Stack.pop();
-            return { value: f64, precision: rawValue1, optionalPrecision: optValue };
+            return { value: f64, precision: rawValue, optionalPrecision: optValue };
         }
     });
-    const __bjs_createConfigStructHelpers = () => ({
+    const __bjs_createStructHelpers_M10TestModuleT12ConfigStruct = () => ({
         lower: (value) => {
         },
         lift: () => {
             return {  };
         }
     });
-    const __bjs_createContainerHelpers = () => ({
+    const __bjs_createStructHelpers_M10TestModuleT9Container = () => ({
         lower: (value) => {
             let id;
             if (value.object != null) {
@@ -192,24 +484,10 @@ export async function createInstantiator(options, swift) {
                 id = undefined;
             }
             i32Stack.push(id !== undefined ? id : 0);
-            const isSome = value.optionalObject != null ? 1 : 0;
-            if (isSome) {
-                const objId = swift.memory.retain(value.optionalObject);
-                i32Stack.push(objId);
-            }
-            i32Stack.push(isSome);
+            __bjs_codec_Optional_JSObject.lower(value.optionalObject);
         },
         lift: () => {
-            const isSome = i32Stack.pop();
-            let optValue;
-            if (isSome === 0) {
-                optValue = null;
-            } else {
-                const objId = i32Stack.pop();
-                const obj = swift.memory.getObject(objId);
-                swift.memory.release(objId);
-                optValue = obj;
-            }
+            const optValue = __bjs_codec_Optional_JSObject.lift();
             const objectId = i32Stack.pop();
             let value;
             if (objectId !== 0) {
@@ -221,7 +499,7 @@ export async function createInstantiator(options, swift) {
             return { object: value, optionalObject: optValue };
         }
     });
-    const __bjs_createVector2DHelpers = () => ({
+    const __bjs_createStructHelpers_M10TestModuleT8Vector2D = () => ({
         lower: (value) => {
             f64Stack.push(value.dx);
             f64Stack.push(value.dy);
@@ -231,16 +509,23 @@ export async function createInstantiator(options, swift) {
             const f641 = f64Stack.pop();
             const instance1 = { dx: f641, dy: f64 };
             instance1.magnitude = function() {
-                structHelpers.Vector2D.lower(this);
+                structHelpers.M10TestModuleT8Vector2D.lower(this);
                 const ret = instance.exports.bjs_Vector2D_magnitude();
                 return ret;
             }.bind(instance1);
             instance1.scaled = function(factor) {
-                structHelpers.Vector2D.lower(this);
-                const ret = instance.exports.bjs_Vector2D_scaled(factor);
-                const structValue = structHelpers.Vector2D.lift();
+                structHelpers.M10TestModuleT8Vector2D.lower(this);
+                const ret1 = instance.exports.bjs_Vector2D_scaled(factor);
+                const structValue = structHelpers.M10TestModuleT8Vector2D.lift();
                 return structValue;
             }.bind(instance1);
+            instance1.describe = function() {
+                structHelpers.M10TestModuleT8Vector2D.lower(this);
+                const ret2 = instance.exports.bjs_Vector2D_describe();
+                const ret3 = tmpRetString;
+                tmpRetString = undefined;
+                return ret3;
+            }.bind(instance1);
             return instance1;
         }
     });
@@ -258,14 +543,14 @@ export async function createInstantiator(options, swift) {
             bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) {
                 const source = swift.memory.getObject(sourceId);
                 swift.memory.release(sourceId);
-                const bytes = new Uint8Array(memory.buffer, bytesPtr);
+                const bytes = new Uint8Array(memory.buffer, bytesPtr >>> 0);
                 bytes.set(source);
             }
             bjs["swift_js_make_js_string"] = function(ptr, len) {
                 return swift.memory.retain(decodeString(ptr, len));
             }
             bjs["swift_js_init_memory_with_result"] = function(ptr, len) {
-                const target = new Uint8Array(memory.buffer, ptr, len);
+                const target = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0);
                 target.set(tmpRetBytes);
                 tmpRetBytes = undefined;
             }
@@ -320,61 +605,70 @@ export async function createInstantiator(options, swift) {
                 taStack.push(Array.from(new Ctor(copy)));
             }
             bjs["swift_js_struct_lower_DataPoint"] = function(objectId) {
-                structHelpers.DataPoint.lower(swift.memory.getObject(objectId));
+                structHelpers.M10TestModuleT9DataPoint.lower(swift.memory.getObject(objectId));
             }
             bjs["swift_js_struct_lift_DataPoint"] = function() {
-                const value = structHelpers.DataPoint.lift();
+                const value = structHelpers.M10TestModuleT9DataPoint.lift();
                 return swift.memory.retain(value);
             }
             bjs["swift_js_struct_lower_Address"] = function(objectId) {
-                structHelpers.Address.lower(swift.memory.getObject(objectId));
+                structHelpers.M10TestModuleT7Address.lower(swift.memory.getObject(objectId));
             }
             bjs["swift_js_struct_lift_Address"] = function() {
-                const value = structHelpers.Address.lift();
+                const value = structHelpers.M10TestModuleT7Address.lift();
                 return swift.memory.retain(value);
             }
             bjs["swift_js_struct_lower_Person"] = function(objectId) {
-                structHelpers.Person.lower(swift.memory.getObject(objectId));
+                structHelpers.M10TestModuleT6Person.lower(swift.memory.getObject(objectId));
             }
             bjs["swift_js_struct_lift_Person"] = function() {
-                const value = structHelpers.Person.lift();
+                const value = structHelpers.M10TestModuleT6Person.lift();
                 return swift.memory.retain(value);
             }
             bjs["swift_js_struct_lower_Session"] = function(objectId) {
-                structHelpers.Session.lower(swift.memory.getObject(objectId));
+                structHelpers.M10TestModuleT7Session.lower(swift.memory.getObject(objectId));
             }
             bjs["swift_js_struct_lift_Session"] = function() {
-                const value = structHelpers.Session.lift();
+                const value = structHelpers.M10TestModuleT7Session.lift();
                 return swift.memory.retain(value);
             }
             bjs["swift_js_struct_lower_Measurement"] = function(objectId) {
-                structHelpers.Measurement.lower(swift.memory.getObject(objectId));
+                structHelpers.M10TestModuleT11Measurement.lower(swift.memory.getObject(objectId));
             }
             bjs["swift_js_struct_lift_Measurement"] = function() {
-                const value = structHelpers.Measurement.lift();
+                const value = structHelpers.M10TestModuleT11Measurement.lift();
                 return swift.memory.retain(value);
             }
             bjs["swift_js_struct_lower_ConfigStruct"] = function(objectId) {
-                structHelpers.ConfigStruct.lower(swift.memory.getObject(objectId));
+                structHelpers.M10TestModuleT12ConfigStruct.lower(swift.memory.getObject(objectId));
             }
             bjs["swift_js_struct_lift_ConfigStruct"] = function() {
-                const value = structHelpers.ConfigStruct.lift();
+                const value = structHelpers.M10TestModuleT12ConfigStruct.lift();
                 return swift.memory.retain(value);
             }
             bjs["swift_js_struct_lower_Container"] = function(objectId) {
-                structHelpers.Container.lower(swift.memory.getObject(objectId));
+                structHelpers.M10TestModuleT9Container.lower(swift.memory.getObject(objectId));
             }
             bjs["swift_js_struct_lift_Container"] = function() {
-                const value = structHelpers.Container.lift();
+                const value = structHelpers.M10TestModuleT9Container.lift();
                 return swift.memory.retain(value);
             }
             bjs["swift_js_struct_lower_Vector2D"] = function(objectId) {
-                structHelpers.Vector2D.lower(swift.memory.getObject(objectId));
+                structHelpers.M10TestModuleT8Vector2D.lower(swift.memory.getObject(objectId));
             }
             bjs["swift_js_struct_lift_Vector2D"] = function() {
-                const value = structHelpers.Vector2D.lift();
+                const value = structHelpers.M10TestModuleT8Vector2D.lift();
                 return swift.memory.retain(value);
             }
+            bjs["bjs_core_register_type_handles"] = function() {};
+            bjs["bjs_TestModule_register_type_handles"] = function() {};
+            const __bjs_promiseSettlers = Symbol("JavaScriptKit.promiseSettlers");
+            bjs["swift_js_make_promise"] = function() {
+                let resolve, reject;
+                const promise = new Promise((res, rej) => { resolve = res; reject = rej; });
+                promise[__bjs_promiseSettlers] = { resolve, reject };
+                return swift.memory.retain(promise);
+            }
             bjs["swift_js_return_optional_bool"] = function(isSome, value) {
                 if (isSome === 0) {
                     tmpRetOptionalBool = null;
@@ -499,6 +793,7 @@ export async function createInstantiator(options, swift) {
             /// Represents a Swift heap object like a class instance or an actor instance.
             class SwiftHeapObject {
                 static __wrap(pointer, deinit, prototype, identityCache) {
+                    pointer = pointer >>> 0;
                     const makeFresh = (identityMap) => {
                         const obj = Object.create(prototype);
                         const state = { pointer, deinit, hasReleased: false, identityMap };
@@ -567,65 +862,44 @@ export async function createInstantiator(options, swift) {
                     instance.exports.bjs_Greeter_name_set(this.pointer, valueId, valueBytes.length);
                 }
             }
-            const DataPointHelpers = __bjs_createDataPointHelpers();
-            structHelpers.DataPoint = DataPointHelpers;
+            const __bjs_helpers_M10TestModuleT9DataPoint = __bjs_createStructHelpers_M10TestModuleT9DataPoint();
+            structHelpers.M10TestModuleT9DataPoint = __bjs_helpers_M10TestModuleT9DataPoint;
 
-            const AddressHelpers = __bjs_createAddressHelpers();
-            structHelpers.Address = AddressHelpers;
+            const __bjs_helpers_M10TestModuleT7Address = __bjs_createStructHelpers_M10TestModuleT7Address();
+            structHelpers.M10TestModuleT7Address = __bjs_helpers_M10TestModuleT7Address;
 
-            const PersonHelpers = __bjs_createPersonHelpers();
-            structHelpers.Person = PersonHelpers;
+            const __bjs_helpers_M10TestModuleT6Person = __bjs_createStructHelpers_M10TestModuleT6Person();
+            structHelpers.M10TestModuleT6Person = __bjs_helpers_M10TestModuleT6Person;
 
-            const SessionHelpers = __bjs_createSessionHelpers();
-            structHelpers.Session = SessionHelpers;
+            const __bjs_helpers_M10TestModuleT7Session = __bjs_createStructHelpers_M10TestModuleT7Session();
+            structHelpers.M10TestModuleT7Session = __bjs_helpers_M10TestModuleT7Session;
 
-            const MeasurementHelpers = __bjs_createMeasurementHelpers();
-            structHelpers.Measurement = MeasurementHelpers;
+            const __bjs_helpers_M10TestModuleT11Measurement = __bjs_createStructHelpers_M10TestModuleT11Measurement();
+            structHelpers.M10TestModuleT11Measurement = __bjs_helpers_M10TestModuleT11Measurement;
 
-            const ConfigStructHelpers = __bjs_createConfigStructHelpers();
-            structHelpers.ConfigStruct = ConfigStructHelpers;
+            const __bjs_helpers_M10TestModuleT12ConfigStruct = __bjs_createStructHelpers_M10TestModuleT12ConfigStruct();
+            structHelpers.M10TestModuleT12ConfigStruct = __bjs_helpers_M10TestModuleT12ConfigStruct;
 
-            const ContainerHelpers = __bjs_createContainerHelpers();
-            structHelpers.Container = ContainerHelpers;
+            const __bjs_helpers_M10TestModuleT9Container = __bjs_createStructHelpers_M10TestModuleT9Container();
+            structHelpers.M10TestModuleT9Container = __bjs_helpers_M10TestModuleT9Container;
 
-            const Vector2DHelpers = __bjs_createVector2DHelpers();
-            structHelpers.Vector2D = Vector2DHelpers;
+            const __bjs_helpers_M10TestModuleT8Vector2D = __bjs_createStructHelpers_M10TestModuleT8Vector2D();
+            structHelpers.M10TestModuleT8Vector2D = __bjs_helpers_M10TestModuleT8Vector2D;
 
             const exports = {
-                Greeter,
                 roundtrip: function bjs_roundtrip(session) {
-                    structHelpers.Person.lower(session);
+                    structHelpers.M10TestModuleT6Person.lower(session);
                     instance.exports.bjs_roundtrip();
-                    const structValue = structHelpers.Person.lift();
+                    const structValue = structHelpers.M10TestModuleT6Person.lift();
                     return structValue;
                 },
                 roundtripContainer: function bjs_roundtripContainer(container) {
-                    structHelpers.Container.lower(container);
+                    structHelpers.M10TestModuleT9Container.lower(container);
                     instance.exports.bjs_roundtripContainer();
-                    const structValue = structHelpers.Container.lift();
+                    const structValue = structHelpers.M10TestModuleT9Container.lift();
                     return structValue;
                 },
                 Precision: PrecisionValues,
-                DataPoint: {
-                    init: function(x, y, label, optCount, optFlag) {
-                        const labelBytes = textEncoder.encode(label);
-                        const labelId = swift.memory.retain(labelBytes);
-                        const isSome = optCount != null;
-                        const isSome1 = optFlag != null;
-                        instance.exports.bjs_DataPoint_init(x, y, labelId, labelBytes.length, +isSome, isSome ? optCount : 0, +isSome1, isSome1 ? optFlag ? 1 : 0 : 0);
-                        const structValue = structHelpers.DataPoint.lift();
-                        return structValue;
-                    },
-                    get dimensions() {
-                        const ret = instance.exports.bjs_DataPoint_static_dimensions_get();
-                        return ret;
-                    },
-                    origin: function() {
-                        instance.exports.bjs_DataPoint_static_origin();
-                        const structValue = structHelpers.DataPoint.lift();
-                        return structValue;
-                    },
-                },
                 ConfigStruct: {
                     get maxRetries() {
                         const ret = instance.exports.bjs_ConfigStruct_static_maxRetries_get();
@@ -660,6 +934,27 @@ export async function createInstantiator(options, swift) {
                         return ret;
                     },
                 },
+                DataPoint: {
+                    init: function(x, y, label, optCount, optFlag) {
+                        const labelBytes = textEncoder.encode(label);
+                        const labelId = swift.memory.retain(labelBytes);
+                        const isSome = optCount != null;
+                        const isSome1 = optFlag != null;
+                        instance.exports.bjs_DataPoint_init(x, y, labelId, labelBytes.length, +isSome, isSome ? optCount : 0, +isSome1, isSome1 ? optFlag ? 1 : 0 : 0);
+                        const structValue = structHelpers.M10TestModuleT9DataPoint.lift();
+                        return structValue;
+                    },
+                    get dimensions() {
+                        const ret = instance.exports.bjs_DataPoint_static_dimensions_get();
+                        return ret;
+                    },
+                    origin: function() {
+                        instance.exports.bjs_DataPoint_static_origin();
+                        const structValue = structHelpers.M10TestModuleT9DataPoint.lift();
+                        return structValue;
+                    },
+                },
+                Greeter,
             };
             _exports = exports;
             return exports;
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStructImports.d.ts b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStructImports.d.ts
index 3677f1e44..e97b50fda 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStructImports.d.ts
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStructImports.d.ts
@@ -12,6 +12,7 @@ export type Exports = {
 }
 export type Imports = {
     translate(point: Point, dx: number, dy: number): Point;
+    roundTripOptional(point: Point | null): Point | null;
 }
 export function createInstantiator(options: {
     imports: Imports;
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStructImports.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStructImports.js
index 0197aefe8..134d7c28e 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStructImports.js
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStructImports.js
@@ -31,7 +31,341 @@ export async function createInstantiator(options, swift) {
 
     let _exports = null;
     let bjs = null;
-    const __bjs_createPointHelpers = () => ({
+    const __bjs_arrayCodecCache = new WeakMap();
+    function __bjs_arrayCodec(elementCodec) {
+        let codec = __bjs_arrayCodecCache.get(elementCodec);
+        if (codec !== undefined) {
+            return codec;
+        }
+        codec = {
+            lower(value) {
+                for (let i = 0; i < value.length; i++) {
+                    elementCodec.lower(value[i]);
+                }
+                i32Stack.push(value.length);
+            },
+            lift() {
+                const count = i32Stack.pop();
+                if (count === -1) {
+                    return taStack.pop();
+                }
+                const result = new Array(count);
+                for (let i = count - 1; i >= 0; i--) {
+                    result[i] = elementCodec.lift();
+                }
+                return result;
+            },
+        };
+        __bjs_arrayCodecCache.set(elementCodec, codec);
+        return codec;
+    }
+    const __bjs_optionalCodecCache = new WeakMap();
+    const __bjs_optionalCodecUndefinedOrCache = new WeakMap();
+    function __bjs_optionalCodec(elementCodec, isUndefinedOr = false) {
+        const cache = isUndefinedOr ? __bjs_optionalCodecUndefinedOrCache : __bjs_optionalCodecCache;
+        let codec = cache.get(elementCodec);
+        if (codec !== undefined) {
+            return codec;
+        }
+        codec = {
+            lower(value) {
+                const isSome = isUndefinedOr ? value !== undefined : value != null;
+                if (isSome) {
+                    elementCodec.lower(value);
+                    i32Stack.push(1);
+                } else {
+                    i32Stack.push(0);
+                }
+            },
+            lift() {
+                if (i32Stack.pop() === 0) {
+                    return isUndefinedOr ? undefined : null;
+                }
+                return elementCodec.lift();
+            },
+        };
+        cache.set(elementCodec, codec);
+        return codec;
+    }
+    const __bjs_dictCodecCache = new WeakMap();
+    function __bjs_dictCodec(valueCodec) {
+        let codec = __bjs_dictCodecCache.get(valueCodec);
+        if (codec !== undefined) {
+            return codec;
+        }
+        codec = {
+            lower(value) {
+                const keys = Object.keys(value);
+                for (let i = 0; i < keys.length; i++) {
+                    __bjs_stringCodec.lower(keys[i]);
+                    valueCodec.lower(value[keys[i]]);
+                }
+                i32Stack.push(keys.length);
+            },
+            lift() {
+                const count = i32Stack.pop();
+                const result = {};
+                for (let i = 0; i < count; i++) {
+                    const value = valueCodec.lift();
+                    const key = __bjs_stringCodec.lift();
+                    result[key] = value;
+                }
+                return result;
+            },
+        };
+        __bjs_dictCodecCache.set(valueCodec, codec);
+        return codec;
+    }
+
+    const __bjs_stringCodec = {
+        lower: (v) => {
+            const bytes = textEncoder.encode(v);
+            const id = swift.memory.retain(bytes);
+            i32Stack.push(bytes.length);
+            i32Stack.push(id);
+        },
+        lift: () => {
+            const string = strStack.pop();
+            return string;
+        },
+    };
+    const __bjs_primitiveCodecs = {
+        Bool: {
+            lower: (v) => {
+                i32Stack.push(v ? 1 : 0);
+            },
+            lift: () => {
+                const bool = i32Stack.pop() !== 0;
+                return bool;
+            },
+        },
+        Int: {
+            lower: (v) => {
+                i32Stack.push((v | 0));
+            },
+            lift: () => {
+                const int = i32Stack.pop();
+                return int;
+            },
+        },
+        Int8: {
+            lower: (v) => {
+                i32Stack.push((v | 0));
+            },
+            lift: () => {
+                const int = i32Stack.pop();
+                return int;
+            },
+        },
+        UInt8: {
+            lower: (v) => {
+                i32Stack.push((v | 0));
+            },
+            lift: () => {
+                const int = i32Stack.pop() >>> 0;
+                return int;
+            },
+        },
+        Int16: {
+            lower: (v) => {
+                i32Stack.push((v | 0));
+            },
+            lift: () => {
+                const int = i32Stack.pop();
+                return int;
+            },
+        },
+        UInt16: {
+            lower: (v) => {
+                i32Stack.push((v | 0));
+            },
+            lift: () => {
+                const int = i32Stack.pop() >>> 0;
+                return int;
+            },
+        },
+        Int32: {
+            lower: (v) => {
+                i32Stack.push((v | 0));
+            },
+            lift: () => {
+                const int = i32Stack.pop();
+                return int;
+            },
+        },
+        UInt32: {
+            lower: (v) => {
+                i32Stack.push((v | 0));
+            },
+            lift: () => {
+                const int = i32Stack.pop() >>> 0;
+                return int;
+            },
+        },
+        UInt: {
+            lower: (v) => {
+                i32Stack.push((v | 0));
+            },
+            lift: () => {
+                const int = i32Stack.pop() >>> 0;
+                return int;
+            },
+        },
+        Int64: {
+            lower: (v) => {
+                i64Stack.push(v);
+            },
+            lift: () => {
+                const int = i64Stack.pop();
+                return int;
+            },
+        },
+        UInt64: {
+            lower: (v) => {
+                i64Stack.push(v);
+            },
+            lift: () => {
+                const int = i64Stack.pop();
+                return int;
+            },
+        },
+        Float: {
+            lower: (v) => {
+                f32Stack.push(Math.fround(v));
+            },
+            lift: () => {
+                const f32 = f32Stack.pop();
+                return f32;
+            },
+        },
+        Double: {
+            lower: (v) => {
+                f64Stack.push(v);
+            },
+            lift: () => {
+                const f64 = f64Stack.pop();
+                return f64;
+            },
+        },
+        String: __bjs_stringCodec,
+        JSValue: {
+            lower: (v) => {
+                const [vKind, vPayload1, vPayload2] = __bjs_jsValueLower(v);
+                i32Stack.push(vKind);
+                i32Stack.push(vPayload1);
+                f64Stack.push(vPayload2);
+            },
+            lift: () => {
+                const jsValuePayload2 = f64Stack.pop();
+                const jsValuePayload1 = i32Stack.pop();
+                const jsValueKind = i32Stack.pop();
+                const jsValue = __bjs_jsValueLift(jsValueKind, jsValuePayload1, jsValuePayload2);
+                return jsValue;
+            },
+        },
+    };
+
+    function __bjs_jsValueLower(value) {
+        let kind;
+        let payload1;
+        let payload2;
+        if (value === null) {
+            kind = 4;
+            payload1 = 0;
+            payload2 = 0;
+        } else {
+            switch (typeof value) {
+                case "boolean":
+                    kind = 0;
+                    payload1 = value ? 1 : 0;
+                    payload2 = 0;
+                    break;
+                case "number":
+                    kind = 2;
+                    payload1 = 0;
+                    payload2 = value;
+                    break;
+                case "string":
+                    kind = 1;
+                    payload1 = swift.memory.retain(value);
+                    payload2 = 0;
+                    break;
+                case "undefined":
+                    kind = 5;
+                    payload1 = 0;
+                    payload2 = 0;
+                    break;
+                case "object":
+                    kind = 3;
+                    payload1 = swift.memory.retain(value);
+                    payload2 = 0;
+                    break;
+                case "function":
+                    kind = 3;
+                    payload1 = swift.memory.retain(value);
+                    payload2 = 0;
+                    break;
+                case "symbol":
+                    kind = 7;
+                    payload1 = swift.memory.retain(value);
+                    payload2 = 0;
+                    break;
+                case "bigint":
+                    kind = 8;
+                    payload1 = swift.memory.retain(value);
+                    payload2 = 0;
+                    break;
+                default:
+                    throw new TypeError("Unsupported JSValue type");
+            }
+        }
+        return [kind, payload1, payload2];
+    }
+    function __bjs_jsValueLift(kind, payload1, payload2) {
+        let jsValue;
+        switch (kind) {
+            case 0:
+                jsValue = payload1 !== 0;
+                break;
+            case 1:
+                jsValue = swift.memory.getObject(payload1);
+                break;
+            case 2:
+                jsValue = payload2;
+                break;
+            case 3:
+                jsValue = swift.memory.getObject(payload1);
+                break;
+            case 4:
+                jsValue = null;
+                break;
+            case 5:
+                jsValue = undefined;
+                break;
+            case 7:
+                jsValue = swift.memory.getObject(payload1);
+                break;
+            case 8:
+                jsValue = swift.memory.getObject(payload1);
+                break;
+            default:
+                throw new TypeError("Unsupported JSValue kind " + kind);
+        }
+        return jsValue;
+    }
+
+    const __bjs_codec_M10TestModuleT5Point = {
+        lower: (v) => {
+            structHelpers.M10TestModuleT5Point.lower(v);
+        },
+        lift: () => {
+            const struct = structHelpers.M10TestModuleT5Point.lift();
+            return struct;
+        },
+    };
+    const __bjs_codec_Optional_M10TestModuleT5Point = __bjs_optionalCodec(__bjs_codec_M10TestModuleT5Point);
+
+    const __bjs_createStructHelpers_M10TestModuleT5Point = () => ({
         lower: (value) => {
             i32Stack.push((value.x | 0));
             i32Stack.push((value.y | 0));
@@ -57,14 +391,14 @@ export async function createInstantiator(options, swift) {
             bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) {
                 const source = swift.memory.getObject(sourceId);
                 swift.memory.release(sourceId);
-                const bytes = new Uint8Array(memory.buffer, bytesPtr);
+                const bytes = new Uint8Array(memory.buffer, bytesPtr >>> 0);
                 bytes.set(source);
             }
             bjs["swift_js_make_js_string"] = function(ptr, len) {
                 return swift.memory.retain(decodeString(ptr, len));
             }
             bjs["swift_js_init_memory_with_result"] = function(ptr, len) {
-                const target = new Uint8Array(memory.buffer, ptr, len);
+                const target = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0);
                 target.set(tmpRetBytes);
                 tmpRetBytes = undefined;
             }
@@ -119,12 +453,21 @@ export async function createInstantiator(options, swift) {
                 taStack.push(Array.from(new Ctor(copy)));
             }
             bjs["swift_js_struct_lower_Point"] = function(objectId) {
-                structHelpers.Point.lower(swift.memory.getObject(objectId));
+                structHelpers.M10TestModuleT5Point.lower(swift.memory.getObject(objectId));
             }
             bjs["swift_js_struct_lift_Point"] = function() {
-                const value = structHelpers.Point.lift();
+                const value = structHelpers.M10TestModuleT5Point.lift();
                 return swift.memory.retain(value);
             }
+            bjs["bjs_core_register_type_handles"] = function() {};
+            bjs["bjs_TestModule_register_type_handles"] = function() {};
+            const __bjs_promiseSettlers = Symbol("JavaScriptKit.promiseSettlers");
+            bjs["swift_js_make_promise"] = function() {
+                let resolve, reject;
+                const promise = new Promise((res, rej) => { resolve = res; reject = rej; });
+                promise[__bjs_promiseSettlers] = { resolve, reject };
+                return swift.memory.retain(promise);
+            }
             bjs["swift_js_return_optional_bool"] = function(isSome, value) {
                 if (isSome === 0) {
                     tmpRetOptionalBool = null;
@@ -216,12 +559,20 @@ export async function createInstantiator(options, swift) {
             }
             bjs["swift_js_closure_unregister"] = function(funcRef) {}
             const TestModule = importObject["TestModule"] = importObject["TestModule"] || {};
-            TestModule["bjs_translate"] = function bjs_translate(point, dx, dy) {
+            TestModule["bjs_translate"] = function bjs_translate(dx, dy) {
+                try {
+                    const structValue = structHelpers.M10TestModuleT5Point.lift();
+                    let ret = imports.translate(structValue, dx, dy);
+                    structHelpers.M10TestModuleT5Point.lower(ret);
+                } catch (error) {
+                    setException(error);
+                }
+            }
+            TestModule["bjs_roundTripOptional"] = function bjs_roundTripOptional() {
                 try {
-                    const value = swift.memory.getObject(point);
-                    swift.memory.release(point);
-                    let ret = imports.translate(value, dx, dy);
-                    return swift.memory.retain(ret);
+                    const optValue = __bjs_codec_Optional_M10TestModuleT5Point.lift();
+                    let ret = imports.roundTripOptional(optValue);
+                    __bjs_codec_Optional_M10TestModuleT5Point.lower(ret);
                 } catch (error) {
                     setException(error);
                 }
@@ -240,8 +591,8 @@ export async function createInstantiator(options, swift) {
         /** @param {WebAssembly.Instance} instance */
         createExports: (instance) => {
             const js = swift.memory.heap;
-            const PointHelpers = __bjs_createPointHelpers();
-            structHelpers.Point = PointHelpers;
+            const __bjs_helpers_M10TestModuleT5Point = __bjs_createStructHelpers_M10TestModuleT5Point();
+            structHelpers.M10TestModuleT5Point = __bjs_helpers_M10TestModuleT5Point;
 
             const exports = {
             };
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftTypedClosureAccess.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftTypedClosureAccess.js
index 2b51ebd3b..500a005a3 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftTypedClosureAccess.js
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftTypedClosureAccess.js
@@ -39,7 +39,7 @@ export async function createInstantiator(options, swift) {
         const state = { pointer, file, line, unregistered: false };
         const real = (...args) => {
             if (state.unregistered) {
-                const bytes = new Uint8Array(memory.buffer, state.file);
+                const bytes = new Uint8Array(memory.buffer, state.file >>> 0);
                 let length = 0;
                 while (bytes[length] !== 0) { length += 1; }
                 const fileID = decodeString(state.file, length);
@@ -70,14 +70,14 @@ export async function createInstantiator(options, swift) {
             bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) {
                 const source = swift.memory.getObject(sourceId);
                 swift.memory.release(sourceId);
-                const bytes = new Uint8Array(memory.buffer, bytesPtr);
+                const bytes = new Uint8Array(memory.buffer, bytesPtr >>> 0);
                 bytes.set(source);
             }
             bjs["swift_js_make_js_string"] = function(ptr, len) {
                 return swift.memory.retain(decodeString(ptr, len));
             }
             bjs["swift_js_init_memory_with_result"] = function(ptr, len) {
-                const target = new Uint8Array(memory.buffer, ptr, len);
+                const target = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0);
                 target.set(tmpRetBytes);
                 tmpRetBytes = undefined;
             }
@@ -131,6 +131,14 @@ export async function createInstantiator(options, swift) {
                 const copy = memory.buffer.slice(ptr, ptr + byteLen);
                 taStack.push(Array.from(new Ctor(copy)));
             }
+            bjs["bjs_core_register_type_handles"] = function() {};
+            const __bjs_promiseSettlers = Symbol("JavaScriptKit.promiseSettlers");
+            bjs["swift_js_make_promise"] = function() {
+                let resolve, reject;
+                const promise = new Promise((res, rej) => { resolve = res; reject = rej; });
+                promise[__bjs_promiseSettlers] = { resolve, reject };
+                return swift.memory.retain(promise);
+            }
             bjs["swift_js_return_optional_bool"] = function(isSome, value) {
                 if (isSome === 0) {
                     tmpRetOptionalBool = null;
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Throws.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Throws.js
index 9c41c3061..58ff6a85a 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Throws.js
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Throws.js
@@ -45,14 +45,14 @@ export async function createInstantiator(options, swift) {
             bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) {
                 const source = swift.memory.getObject(sourceId);
                 swift.memory.release(sourceId);
-                const bytes = new Uint8Array(memory.buffer, bytesPtr);
+                const bytes = new Uint8Array(memory.buffer, bytesPtr >>> 0);
                 bytes.set(source);
             }
             bjs["swift_js_make_js_string"] = function(ptr, len) {
                 return swift.memory.retain(decodeString(ptr, len));
             }
             bjs["swift_js_init_memory_with_result"] = function(ptr, len) {
-                const target = new Uint8Array(memory.buffer, ptr, len);
+                const target = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0);
                 target.set(tmpRetBytes);
                 tmpRetBytes = undefined;
             }
@@ -106,6 +106,14 @@ export async function createInstantiator(options, swift) {
                 const copy = memory.buffer.slice(ptr, ptr + byteLen);
                 taStack.push(Array.from(new Ctor(copy)));
             }
+            bjs["bjs_core_register_type_handles"] = function() {};
+            const __bjs_promiseSettlers = Symbol("JavaScriptKit.promiseSettlers");
+            bjs["swift_js_make_promise"] = function() {
+                let resolve, reject;
+                const promise = new Promise((res, rej) => { resolve = res; reject = rej; });
+                promise[__bjs_promiseSettlers] = { resolve, reject };
+                return swift.memory.retain(promise);
+            }
             bjs["swift_js_return_optional_bool"] = function(isSome, value) {
                 if (isSome === 0) {
                     tmpRetOptionalBool = null;
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/UnsafePointer.d.ts b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/UnsafePointer.d.ts
index 4f9aa4e4a..5a4ee78ce 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/UnsafePointer.d.ts
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/UnsafePointer.d.ts
@@ -25,7 +25,7 @@ export type Exports = {
     roundTripPointerFields(value: PointerFields): PointerFields;
     PointerFields: {
         init(raw: number, mutRaw: number, opaque: number, ptr: number, mutPtr: number): PointerFields;
-    }
+    },
 }
 export type Imports = {
 }
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/UnsafePointer.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/UnsafePointer.js
index 97a00c278..416e5c281 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/UnsafePointer.js
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/UnsafePointer.js
@@ -31,7 +31,7 @@ export async function createInstantiator(options, swift) {
 
     let _exports = null;
     let bjs = null;
-    const __bjs_createPointerFieldsHelpers = () => ({
+    const __bjs_createStructHelpers_M10TestModuleT13PointerFields = () => ({
         lower: (value) => {
             ptrStack.push((value.raw | 0));
             ptrStack.push((value.mutRaw | 0));
@@ -62,14 +62,14 @@ export async function createInstantiator(options, swift) {
             bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) {
                 const source = swift.memory.getObject(sourceId);
                 swift.memory.release(sourceId);
-                const bytes = new Uint8Array(memory.buffer, bytesPtr);
+                const bytes = new Uint8Array(memory.buffer, bytesPtr >>> 0);
                 bytes.set(source);
             }
             bjs["swift_js_make_js_string"] = function(ptr, len) {
                 return swift.memory.retain(decodeString(ptr, len));
             }
             bjs["swift_js_init_memory_with_result"] = function(ptr, len) {
-                const target = new Uint8Array(memory.buffer, ptr, len);
+                const target = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0);
                 target.set(tmpRetBytes);
                 tmpRetBytes = undefined;
             }
@@ -124,12 +124,21 @@ export async function createInstantiator(options, swift) {
                 taStack.push(Array.from(new Ctor(copy)));
             }
             bjs["swift_js_struct_lower_PointerFields"] = function(objectId) {
-                structHelpers.PointerFields.lower(swift.memory.getObject(objectId));
+                structHelpers.M10TestModuleT13PointerFields.lower(swift.memory.getObject(objectId));
             }
             bjs["swift_js_struct_lift_PointerFields"] = function() {
-                const value = structHelpers.PointerFields.lift();
+                const value = structHelpers.M10TestModuleT13PointerFields.lift();
                 return swift.memory.retain(value);
             }
+            bjs["bjs_core_register_type_handles"] = function() {};
+            bjs["bjs_TestModule_register_type_handles"] = function() {};
+            const __bjs_promiseSettlers = Symbol("JavaScriptKit.promiseSettlers");
+            bjs["swift_js_make_promise"] = function() {
+                let resolve, reject;
+                const promise = new Promise((res, rej) => { resolve = res; reject = rej; });
+                promise[__bjs_promiseSettlers] = { resolve, reject };
+                return swift.memory.retain(promise);
+            }
             bjs["swift_js_return_optional_bool"] = function(isSome, value) {
                 if (isSome === 0) {
                     tmpRetOptionalBool = null;
@@ -234,8 +243,8 @@ export async function createInstantiator(options, swift) {
         /** @param {WebAssembly.Instance} instance */
         createExports: (instance) => {
             const js = swift.memory.heap;
-            const PointerFieldsHelpers = __bjs_createPointerFieldsHelpers();
-            structHelpers.PointerFields = PointerFieldsHelpers;
+            const __bjs_helpers_M10TestModuleT13PointerFields = __bjs_createStructHelpers_M10TestModuleT13PointerFields();
+            structHelpers.M10TestModuleT13PointerFields = __bjs_helpers_M10TestModuleT13PointerFields;
 
             const exports = {
                 takeUnsafeRawPointer: function bjs_takeUnsafeRawPointer(p) {
@@ -274,15 +283,15 @@ export async function createInstantiator(options, swift) {
                     return ret;
                 },
                 roundTripPointerFields: function bjs_roundTripPointerFields(value) {
-                    structHelpers.PointerFields.lower(value);
+                    structHelpers.M10TestModuleT13PointerFields.lower(value);
                     instance.exports.bjs_roundTripPointerFields();
-                    const structValue = structHelpers.PointerFields.lift();
+                    const structValue = structHelpers.M10TestModuleT13PointerFields.lift();
                     return structValue;
                 },
                 PointerFields: {
                     init: function(raw, mutRaw, opaque, ptr, mutPtr) {
                         instance.exports.bjs_PointerFields_init(raw, mutRaw, opaque, ptr, mutPtr);
-                        const structValue = structHelpers.PointerFields.lift();
+                        const structValue = structHelpers.M10TestModuleT13PointerFields.lift();
                         return structValue;
                     },
                 },
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/VoidParameterVoidReturn.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/VoidParameterVoidReturn.js
index 2951ef5f8..81b09eaf4 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/VoidParameterVoidReturn.js
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/VoidParameterVoidReturn.js
@@ -46,14 +46,14 @@ export async function createInstantiator(options, swift) {
             bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) {
                 const source = swift.memory.getObject(sourceId);
                 swift.memory.release(sourceId);
-                const bytes = new Uint8Array(memory.buffer, bytesPtr);
+                const bytes = new Uint8Array(memory.buffer, bytesPtr >>> 0);
                 bytes.set(source);
             }
             bjs["swift_js_make_js_string"] = function(ptr, len) {
                 return swift.memory.retain(decodeString(ptr, len));
             }
             bjs["swift_js_init_memory_with_result"] = function(ptr, len) {
-                const target = new Uint8Array(memory.buffer, ptr, len);
+                const target = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0);
                 target.set(tmpRetBytes);
                 tmpRetBytes = undefined;
             }
@@ -107,6 +107,14 @@ export async function createInstantiator(options, swift) {
                 const copy = memory.buffer.slice(ptr, ptr + byteLen);
                 taStack.push(Array.from(new Ctor(copy)));
             }
+            bjs["bjs_core_register_type_handles"] = function() {};
+            const __bjs_promiseSettlers = Symbol("JavaScriptKit.promiseSettlers");
+            bjs["swift_js_make_promise"] = function() {
+                let resolve, reject;
+                const promise = new Promise((res, rej) => { resolve = res; reject = rej; });
+                promise[__bjs_promiseSettlers] = { resolve, reject };
+                return swift.memory.retain(promise);
+            }
             bjs["swift_js_return_optional_bool"] = function(isSome, value) {
                 if (isSome === 0) {
                     tmpRetOptionalBool = null;
diff --git a/Plugins/PackageToJS/Sources/PackageToJS.swift b/Plugins/PackageToJS/Sources/PackageToJS.swift
index ff3e2ce5a..c8adb9346 100644
--- a/Plugins/PackageToJS/Sources/PackageToJS.swift
+++ b/Plugins/PackageToJS/Sources/PackageToJS.swift
@@ -69,15 +69,31 @@ struct PackageToJS {
         var packageOptions: PackageOptions
     }
 
-    static func deriveBuildConfiguration(wasmProductArtifact: URL) -> (configuration: String, triple: String) {
+    /// Derives the build configuration from the path of the wasm product artifact.
+    /// Returns "debug" or "release"
+    static func deriveBuildConfiguration(wasmProductArtifact: URL) -> String {
+        // For "--build-system swiftbuild"
+        // e.g. path/to/.build/out/Products/Debug-webassembly-wasm32/Basic.wasm
+        // ref: https://github.com/swiftlang/swift-build/blob/48498f5450c85da3f8c09808168f0286d207329b/Sources/SWBCore/Core.swift#L631-L643
+        //
+        // For "--build-system native"
         // e.g. path/to/.build/wasm32-unknown-wasi/debug/Basic.wasm -> ("debug", "wasm32-unknown-wasi")
 
         // First, resolve symlink to get the actual path as SwiftPM 6.0 and earlier returns unresolved
         // symlink path for product artifact.
         let wasmProductArtifact = wasmProductArtifact.resolvingSymlinksInPath()
-        let buildConfiguration = wasmProductArtifact.deletingLastPathComponent().lastPathComponent
-        let triple = wasmProductArtifact.deletingLastPathComponent().deletingLastPathComponent().lastPathComponent
-        return (buildConfiguration, triple)
+        let swiftBuildSuffix = "-webassembly-wasm32"
+        let parentDirName = wasmProductArtifact.deletingLastPathComponent().lastPathComponent
+        if parentDirName.hasSuffix(swiftBuildSuffix) {
+            // This is SwiftBuild backend mode
+            let swiftBuildConfig = String(parentDirName.dropLast(swiftBuildSuffix.count))
+            guard let mappedConfig = ["Debug": "debug", "Release": "release"][swiftBuildConfig] else {
+                fatalError("Unknown SwiftPM build configuration: \(swiftBuildConfig)")
+            }
+            return mappedConfig
+        }
+        // This is native backend mode, the parent directory name is the build configuration
+        return parentDirName
     }
 
     static func runTest(testRunner: URL, currentDirectoryURL: URL, outputDir: URL, testOptions: TestOptions) throws {
@@ -273,6 +289,7 @@ struct PackageToJSError: Swift.Error, CustomStringConvertible {
 
 protocol PackagingSystem {
     func createDirectory(atPath: String) throws
+    func removeItemIfExists(atPath: String) throws
     func syncFile(from: String, to: String) throws
     func writeFile(atPath: String, content: Data) throws
 
@@ -281,6 +298,12 @@ protocol PackagingSystem {
 }
 
 extension PackagingSystem {
+    func removeItemIfExists(atPath: String) throws {
+        if FileManager.default.fileExists(atPath: atPath) {
+            try FileManager.default.removeItem(atPath: atPath)
+        }
+    }
+
     func createDirectory(atPath: String) throws {
         guard !FileManager.default.fileExists(atPath: atPath) else { return }
         try FileManager.default.createDirectory(
@@ -387,8 +410,18 @@ private func runCommand(_ command: URL, _ arguments: [String]) throws {
     }
 }
 
+struct BridgeJSSkeletonInput {
+    let source: URL
+    let targetDirectory: URL
+}
+
 /// Plans the build for packaging.
 struct PackagingPlanner {
+    struct JavaScriptModuleInput {
+        let source: BuildPath
+        let relativeOutputPath: String
+    }
+
     /// The options for packaging
     let options: PackageToJS.PackageOptions
     /// The package ID of the package that this plugin is running on
@@ -398,7 +431,7 @@ struct PackagingPlanner {
     /// The path of this file itself, used to capture changes of planner code
     let selfPath: BuildPath
     /// The BridgeJS API skeletons source files
-    let skeletons: [BuildPath]
+    let skeletons: [BridgeJSSkeletonInput]
     /// The directory for the final output
     let outputDir: BuildPath
     /// The directory for intermediate files
@@ -409,8 +442,6 @@ struct PackagingPlanner {
     let wasmProductArtifact: BuildPath
     /// The build configuration
     let configuration: String
-    /// The target triple
-    let triple: String
     /// The system interface to use
     let system: any PackagingSystem
 
@@ -419,12 +450,11 @@ struct PackagingPlanner {
         packageId: String,
         intermediatesDir: BuildPath,
         selfPackageDir: BuildPath,
-        skeletons: [BuildPath],
+        skeletons: [BridgeJSSkeletonInput],
         outputDir: BuildPath,
         wasmProductArtifact: BuildPath,
         wasmFilename: String,
         configuration: String,
-        triple: String,
         // NOTE: We should use `ProcessInfo.processInfo.arguments[0]` instead of `CommandLine.arguments[0]`
         // because the latter may not always be the full executable path (e.g. when invoked through PATH lookup).
         // https://github.com/swiftlang/swift-foundation/blob/f5143f96d01cdb6d280665de8221b75fc8631d95/Sources/FoundationEssentials/ProcessInfo/ProcessInfo.swift#L47
@@ -441,7 +471,6 @@ struct PackagingPlanner {
         self.selfPath = selfPath
         self.wasmProductArtifact = wasmProductArtifact
         self.configuration = configuration
-        self.triple = triple
         self.system = system
     }
 
@@ -452,7 +481,7 @@ struct PackagingPlanner {
         make: inout MiniMake,
         buildOptions: PackageToJS.BuildOptions
     ) throws -> MiniMake.TaskKey {
-        let (allTasks, _, _, _) = try planBuildInternal(
+        let (allTasks, _, _, _, _) = try planBuildInternal(
             make: &make,
             noOptimize: buildOptions.noOptimize,
             debugInfoFormat: buildOptions.debugInfoFormat
@@ -472,7 +501,8 @@ struct PackagingPlanner {
         allTasks: [MiniMake.TaskKey],
         outputDirTask: MiniMake.TaskKey,
         intermediatesDirTask: MiniMake.TaskKey,
-        packageJsonTask: MiniMake.TaskKey
+        packageJsonTask: MiniMake.TaskKey,
+        wasmImportsTask: MiniMake.TaskKey
     ) {
         // Prepare output directory
         let outputDirTask = make.addTask(
@@ -558,20 +588,8 @@ struct PackagingPlanner {
         }
         packageInputs.append(wasm)
 
-        let wasmImportsPath = intermediatesDir.appending(path: "wasm-imports.json")
-        let wasmImportsTask = make.addTask(
-            inputFiles: [selfPath, finalWasmPath],
-            inputTasks: [outputDirTask, intermediatesDirTask, wasm],
-            output: wasmImportsPath
-        ) {
-            let metadata = try parseImports(
-                moduleBytes: try Data(contentsOf: URL(fileURLWithPath: $1.resolve(path: finalWasmPath).path))
-            )
-            let jsonEncoder = JSONEncoder()
-            jsonEncoder.outputFormatting = .prettyPrinted
-            let jsonData = try jsonEncoder.encode(metadata)
-            try system.writeFile(atPath: $1.resolve(path: $0.output).path, content: jsonData)
-        }
+        let wasmImportsPath = self.wasmImportsPath
+        let wasmImportsTask = planWasmImports(make: &make, intermediatesDirTask: intermediatesDirTask)
 
         packageInputs.append(wasmImportsTask)
 
@@ -589,30 +607,20 @@ struct PackagingPlanner {
             file: "Plugins/PackageToJS/Templates/package.json",
             output: "package.json",
             outputDirTask: outputDirTask,
+            wasmImportsTask: wasmImportsTask,
             inputFiles: [],
             inputTasks: []
         )
         packageInputs.append(packageJsonTask)
 
-        if skeletons.count > 0 {
-            let bridgeJs = outputDir.appending(path: "bridge-js.js")
-            let bridgeDts = outputDir.appending(path: "bridge-js.d.ts")
+        if !skeletons.isEmpty {
             packageInputs.append(
-                make.addTask(inputFiles: skeletons + [selfPath], output: bridgeJs) { _, scope in
-                    var link = BridgeJSLink(
-                        sharedMemory: Self.isSharedMemoryEnabled(triple: triple)
-                    )
-
-                    // Decode skeleton format
-                    for skeletonPath in skeletons {
-                        let data = try Data(contentsOf: URL(fileURLWithPath: scope.resolve(path: skeletonPath).path))
-                        try link.addSkeletonFile(data: data)
-                    }
-
-                    let (outputJs, outputDts) = try link.link()
-                    try system.writeFile(atPath: scope.resolve(path: bridgeJs).path, content: Data(outputJs.utf8))
-                    try system.writeFile(atPath: scope.resolve(path: bridgeDts).path, content: Data(outputDts.utf8))
-                }
+                contentsOf: try planBridgeJS(
+                    make: &make,
+                    outputDirTask: outputDirTask,
+                    intermediatesDirTask: intermediatesDirTask,
+                    wasmImportsTask: wasmImportsTask
+                )
             )
         }
 
@@ -636,39 +644,246 @@ struct PackagingPlanner {
                     file: file,
                     output: output,
                     outputDirTask: outputDirTask,
-                    inputFiles: [wasmImportsPath],
-                    inputTasks: [platformsDirTask, wasmImportsTask],
-                    wasmImportsPath: wasmImportsPath
+                    wasmImportsTask: wasmImportsTask,
+                    inputFiles: [],
+                    inputTasks: [platformsDirTask]
+                )
+            )
+        }
+        return (packageInputs, outputDirTask, intermediatesDirTask, packageJsonTask, wasmImportsTask)
+    }
+
+    private func loadBridgeJS() throws -> (
+        link: BridgeJSLink,
+        modules: [JavaScriptModuleInput]
+    ) {
+        var link = BridgeJSLink()
+        var moduleSources: [String: BuildPath] = [:]
+
+        for input in skeletons {
+            let skeleton = try link.addSkeletonFile(data: Data(contentsOf: input.source))
+            // Only target-local modules are files we copy. Bare specifiers (e.g. "node:path",
+            // "lodash") are resolved by the JavaScript host at load time, so there is
+            // nothing to find on disk and nothing to place in the output.
+            for reference in ImportedJSModuleRegistry.collectSnippetFiles(skeletons: [skeleton]) {
+                guard
+                    let sourceURL = JavaScriptModulePath.resolve(
+                        reference.path,
+                        relativeTo: input.targetDirectory
+                    ),
+                    JavaScriptModulePath.isRegularFile(at: sourceURL)
+                else {
+                    throw PackageToJSError(
+                        "JavaScript module file was not found at '\(reference.path)' in target '\(skeleton.moduleName)'."
+                    )
+                }
+                let source = BuildPath(absolute: sourceURL.path)
+                if let existing = moduleSources[reference.relativeOutputPath], existing != source {
+                    throw PackageToJSError(
+                        "Conflicting JavaScript module sources for '\(reference.relativeOutputPath)'."
+                    )
+                }
+                moduleSources[reference.relativeOutputPath] = source
+            }
+        }
+
+        return (
+            link,
+            moduleSources.sorted { $0.key < $1.key }.map {
+                JavaScriptModuleInput(source: $0.value, relativeOutputPath: $0.key)
+            }
+        )
+    }
+
+    /// Plan the artifacts that several per-runner test bundles packaged as subdirectories
+    /// share.
+    ///
+    /// Node resolves `node_modules` by walking up the directory tree, so a single install
+    /// here serves every runner underneath, avoiding one install per test target. The glue
+    /// generated here describes every test target rather than the one target a runner links
+    /// in, so that test preludes - which are loaded for every runner and import it by a
+    /// fixed path - see the whole package's API.
+    func planSharedTestArtifacts(make: inout MiniMake) throws -> MiniMake.TaskKey {
+        let outputDirTask = make.addTask(
+            inputFiles: [selfPath],
+            output: outputDir,
+            attributes: [.silent]
+        ) {
+            try system.createDirectory(atPath: $1.resolve(path: $0.output).path)
+        }
+        let intermediatesDirTask = make.addTask(
+            inputFiles: [selfPath],
+            output: intermediatesDir,
+            attributes: [.silent]
+        ) {
+            try system.createDirectory(atPath: $1.resolve(path: $0.output).path)
+        }
+        let wasmImportsTask = planWasmImports(make: &make, intermediatesDirTask: intermediatesDirTask)
+        let packageJsonTask = planCopyTemplateFile(
+            make: &make,
+            file: "Plugins/PackageToJS/Templates/package.json",
+            output: "package.json",
+            outputDirTask: outputDirTask,
+            wasmImportsTask: wasmImportsTask,
+            inputFiles: [],
+            inputTasks: []
+        )
+        var tasks = [
+            planNpmInstall(
+                make: &make,
+                intermediatesDirTask: intermediatesDirTask,
+                packageJsonTask: packageJsonTask
+            )
+        ]
+        if !skeletons.isEmpty {
+            tasks.append(
+                contentsOf: try planBridgeJS(
+                    make: &make,
+                    outputDirTask: outputDirTask,
+                    intermediatesDirTask: intermediatesDirTask,
+                    wasmImportsTask: wasmImportsTask
+                )
+            )
+        }
+        return make.addTask(
+            inputTasks: tasks,
+            output: BuildPath(phony: "shared-test-artifacts"),
+            attributes: [.phony, .silent]
+        )
+    }
+
+    /// Plan the tasks generating the BridgeJS glue and syncing the JavaScript modules it
+    /// imports into the output directory
+    private func planBridgeJS(
+        make: inout MiniMake,
+        outputDirTask: MiniMake.TaskKey,
+        intermediatesDirTask: MiniMake.TaskKey,
+        wasmImportsTask: MiniMake.TaskKey
+    ) throws -> [MiniMake.TaskKey] {
+        let bridge = try loadBridgeJS()
+        let skeletonFiles = skeletons.map { BuildPath(absolute: $0.source.path) }
+        let wasmImportsPath = self.wasmImportsPath
+        let bridgeJs = outputDir.appending(path: "bridge-js.js")
+        let bridgeDts = outputDir.appending(path: "bridge-js.d.ts")
+        let bridgeModules = outputDir.appending(path: "bridge-js-modules")
+        let bridgeJsTask = make.addTask(
+            inputFiles: skeletonFiles + [selfPath, wasmImportsPath],
+            inputTasks: [outputDirTask, wasmImportsTask],
+            output: bridgeJs
+        ) { _, scope in
+            let features = try Self.loadWasmFeatures(at: scope.resolve(path: wasmImportsPath))
+            let output = try bridge.link.link(sharedMemory: features.sharedMemory)
+            try system.writeFile(
+                atPath: scope.resolve(path: bridgeJs).path,
+                content: Data(output.outputJs.utf8)
+            )
+            try system.writeFile(
+                atPath: scope.resolve(path: bridgeDts).path,
+                content: Data(output.outputDts.utf8)
+            )
+        }
+        let bridgeModulesStamp = intermediatesDir.appending(path: "bridge-js-modules.stamp")
+        let bridgeModulesTask = make.addTask(
+            inputFiles: skeletonFiles + bridge.modules.map(\.source) + [selfPath],
+            inputTasks: [outputDirTask, intermediatesDirTask],
+            output: bridgeModulesStamp
+        ) { _, scope in
+            let modulesDirectory = scope.resolve(path: bridgeModules)
+            try system.removeItemIfExists(atPath: modulesDirectory.path)
+            if !bridge.modules.isEmpty {
+                try system.createDirectory(atPath: modulesDirectory.path)
+            }
+            for module in bridge.modules {
+                let destination = scope.resolve(path: outputDir.appending(path: module.relativeOutputPath))
+                try system.createDirectory(atPath: destination.deletingLastPathComponent().path)
+                try system.syncFile(
+                    from: scope.resolve(path: module.source).path,
+                    to: destination.path
                 )
+            }
+            try system.writeFile(
+                atPath: scope.resolve(path: bridgeModulesStamp).path,
+                content: Data()
+            )
+        }
+        return [bridgeJsTask, bridgeModulesTask]
+    }
+
+    /// Plan the task parsing the imports of the product .wasm file
+    ///
+    /// NOTE: The imports are parsed from the product artifact instead of the final .wasm
+    /// file because wasm-opt removes unreferenced imports, and the presence of an import
+    /// decides how the JavaScript glue code is generated.
+    private func planWasmImports(
+        make: inout MiniMake,
+        intermediatesDirTask: MiniMake.TaskKey
+    ) -> MiniMake.TaskKey {
+        make.addTask(
+            inputFiles: [selfPath, wasmProductArtifact],
+            inputTasks: [intermediatesDirTask],
+            output: wasmImportsPath
+        ) {
+            let metadata = try parseImports(
+                moduleBytes: try Data(contentsOf: URL(fileURLWithPath: $1.resolve(path: wasmProductArtifact).path))
             )
+            let jsonEncoder = JSONEncoder()
+            jsonEncoder.outputFormatting = .prettyPrinted
+            let jsonData = try jsonEncoder.encode(metadata)
+            let outputPath = $1.resolve(path: $0.output)
+            // Every task consuming the imports depends on this file, so leave it untouched
+            // when the imports are unchanged. Rewriting it would give it a newer timestamp
+            // and re-run them (including `npm install`) for unrelated Swift source changes.
+            if let lastImports = try? Data(contentsOf: outputPath), lastImports == jsonData {
+                return
+            }
+            try system.writeFile(atPath: outputPath.path, content: jsonData)
+        }
+    }
+
+    private func planNpmInstall(
+        make: inout MiniMake,
+        intermediatesDirTask: MiniMake.TaskKey,
+        packageJsonTask: MiniMake.TaskKey
+    ) -> MiniMake.TaskKey {
+        make.addTask(
+            inputFiles: [
+                selfPath,
+                outputDir.appending(path: "package.json"),
+            ],
+            inputTasks: [intermediatesDirTask, packageJsonTask],
+            output: intermediatesDir.appending(path: "npm-install.stamp")
+        ) {
+            try system.npmInstall(packageDir: $1.resolve(path: outputDir).path)
+            try system.writeFile(atPath: $1.resolve(path: $0.output).path, content: Data())
         }
-        return (packageInputs, outputDirTask, intermediatesDirTask, packageJsonTask)
     }
 
     /// Construct the test build plan and return the root task key
+    ///
+    /// - Parameter installNodeModules: whether to install the test harness's npm
+    ///   dependencies into this bundle's directory. Pass `false` when several runners share
+    ///   a single `node_modules` planned once via `planSharedNodeModules`.
     func planTestBuild(
-        make: inout MiniMake
+        make: inout MiniMake,
+        installNodeModules: Bool = true
     ) throws -> (rootTask: MiniMake.TaskKey, binDir: BuildPath) {
-        var (allTasks, outputDirTask, intermediatesDirTask, packageJsonTask) = try planBuildInternal(
+        var (allTasks, outputDirTask, intermediatesDirTask, packageJsonTask, wasmImportsTask) = try planBuildInternal(
             make: &make,
             noOptimize: false,
             debugInfoFormat: .dwarf
         )
 
-        // Install npm dependencies used in the test harness
-        allTasks.append(
-            make.addTask(
-                inputFiles: [
-                    selfPath,
-                    outputDir.appending(path: "package.json"),
-                ],
-                inputTasks: [intermediatesDirTask, packageJsonTask],
-                output: intermediatesDir.appending(path: "npm-install.stamp")
-            ) {
-                try system.npmInstall(packageDir: $1.resolve(path: outputDir).path)
-                try system.writeFile(atPath: $1.resolve(path: $0.output).path, content: Data())
-            }
-        )
+        // Install npm dependencies used in the test harness, unless a shared node_modules is
+        // provided in a parent directory (see planSharedNodeModules).
+        if installNodeModules {
+            allTasks.append(
+                planNpmInstall(
+                    make: &make,
+                    intermediatesDirTask: intermediatesDirTask,
+                    packageJsonTask: packageJsonTask
+                )
+            )
+        }
 
         let binDir = outputDir.appending(path: "bin")
         let binDirTask = make.addTask(
@@ -693,6 +908,7 @@ struct PackagingPlanner {
                     file: file,
                     output: output,
                     outputDirTask: outputDirTask,
+                    wasmImportsTask: wasmImportsTask,
                     inputFiles: [],
                     inputTasks: [binDirTask]
                 )
@@ -711,9 +927,9 @@ struct PackagingPlanner {
         file: String,
         output: String,
         outputDirTask: MiniMake.TaskKey,
+        wasmImportsTask: MiniMake.TaskKey,
         inputFiles: [BuildPath],
-        inputTasks: [MiniMake.TaskKey],
-        wasmImportsPath: BuildPath? = nil
+        inputTasks: [MiniMake.TaskKey]
     ) -> MiniMake.TaskKey {
 
         struct Salt: Encodable {
@@ -722,9 +938,10 @@ struct PackagingPlanner {
         }
 
         let inputPath = selfPackageDir.appending(path: file)
-        let conditions: [String: Bool] = [
-            "USE_SHARED_MEMORY": Self.isSharedMemoryEnabled(triple: triple),
-            "IS_WASI": triple.hasPrefix("wasm32-unknown-wasi"),
+        // NOTE: The conditions derived from the .wasm binary are not part of the salt because
+        // they are not known until the imports are parsed. The imports file is an input of
+        // this task instead, so a change in them still re-runs the preprocessing.
+        let staticConditions: [String: Bool] = [
             "USE_WASI_CDN": options.useCDN,
             "HAS_BRIDGE": skeletons.count > 0,
             "HAS_IMPORTS": skeletons.count > 0,
@@ -735,30 +952,26 @@ struct PackagingPlanner {
             "PACKAGE_TO_JS_MODULE_PATH": wasmFilename,
             "PACKAGE_TO_JS_PACKAGE_NAME": options.packageName ?? packageId.lowercased(),
         ]
-        let salt = Salt(conditions: conditions, substitutions: constantSubstitutions)
+        let salt = Salt(conditions: staticConditions, substitutions: constantSubstitutions)
+        let wasmImportsPath = self.wasmImportsPath
 
         return make.addTask(
-            inputFiles: [selfPath, inputPath] + inputFiles,
-            inputTasks: [outputDirTask] + inputTasks,
+            inputFiles: [selfPath, inputPath, wasmImportsPath] + inputFiles,
+            inputTasks: [outputDirTask, wasmImportsTask] + inputTasks,
             output: outputDir.appending(path: output),
             salt: salt
         ) {
             var substitutions = constantSubstitutions
+            let features = try Self.loadWasmFeatures(at: $1.resolve(path: wasmImportsPath))
 
-            if let wasmImportsPath = wasmImportsPath {
-                let wasmImportsPath = $1.resolve(path: wasmImportsPath)
-                let importEntries = try JSONDecoder().decode(
-                    [ImportEntry].self,
-                    from: Data(contentsOf: wasmImportsPath)
-                )
-                let memoryImport = importEntries.first {
-                    $0.module == "env" && $0.name == "memory"
-                }
-                if case .memory(let type) = memoryImport?.kind {
-                    substitutions["PACKAGE_TO_JS_MEMORY_INITIAL"] = type.minimum.description
-                    substitutions["PACKAGE_TO_JS_MEMORY_MAXIMUM"] = (type.maximum ?? type.minimum).description
-                    substitutions["PACKAGE_TO_JS_MEMORY_SHARED"] = type.shared.description
-                }
+            var conditions = staticConditions
+            conditions["USE_SHARED_MEMORY"] = features.sharedMemory
+            conditions["IS_WASI"] = features.isWASI
+
+            if let memory = features.importedMemory {
+                substitutions["PACKAGE_TO_JS_MEMORY_INITIAL"] = memory.minimum.description
+                substitutions["PACKAGE_TO_JS_MEMORY_MAXIMUM"] = (memory.maximum ?? memory.minimum).description
+                substitutions["PACKAGE_TO_JS_MEMORY_SHARED"] = memory.shared.description
             }
 
             let inputPath = $1.resolve(path: inputPath)
@@ -769,8 +982,38 @@ struct PackagingPlanner {
         }
     }
 
-    private static func isSharedMemoryEnabled(triple: String) -> Bool {
-        return triple == "wasm32-unknown-wasip1-threads"
+    /// The path to the JSON file describing the imports of the product .wasm file
+    var wasmImportsPath: BuildPath {
+        intermediatesDir.appending(path: "wasm-imports.json")
+    }
+
+    static func loadWasmFeatures(at wasmImportsPath: URL) throws -> WasmFeatures {
+        let importEntries = try JSONDecoder().decode(
+            [ImportEntry].self,
+            from: Data(contentsOf: wasmImportsPath)
+        )
+        return WasmFeatures(imports: importEntries)
+    }
+}
+
+/// The traits of a .wasm binary that affect the JavaScript code generated for it
+struct WasmFeatures {
+    /// Whether the module requires a WASI implementation to be instantiated
+    let isWASI: Bool
+    /// Whether the module uses shared memory
+    let sharedMemory: Bool
+    /// The type of the memory imported by the module if any
+    let importedMemory: MemoryType?
+
+    init(imports: [ImportEntry]) {
+        self.isWASI = imports.contains { $0.module == "wasi_snapshot_preview1" }
+        let memoryImport = imports.first { $0.module == "env" && $0.name == "memory" }
+        if case .memory(let type) = memoryImport?.kind {
+            self.importedMemory = type
+        } else {
+            self.importedMemory = nil
+        }
+        self.sharedMemory = self.importedMemory?.shared ?? false
     }
 }
 
diff --git a/Plugins/PackageToJS/Sources/PackageToJSPlugin.swift b/Plugins/PackageToJS/Sources/PackageToJSPlugin.swift
index 7686372f9..560b3e980 100644
--- a/Plugins/PackageToJS/Sources/PackageToJSPlugin.swift
+++ b/Plugins/PackageToJS/Sources/PackageToJSPlugin.swift
@@ -8,7 +8,17 @@
 @preconcurrency import struct Foundation.CocoaError
 @preconcurrency import func Foundation.fputs
 @preconcurrency import func Foundation.exit
-@preconcurrency import var Foundation.stderr
+
+#if canImport(Darwin)
+@preconcurrency import var Darwin.stderr
+#elseif canImport(Glibc)
+@preconcurrency import var Glibc.stderr
+#elseif canImport(Musl)
+@preconcurrency import var Musl.stderr
+#elseif canImport(Android)
+@preconcurrency import var Android.stderr
+#endif
+
 import PackagePlugin
 
 /// The main entry point for the PackageToJS plugin.
@@ -264,69 +274,202 @@ struct PackageToJSPlugin: CommandPlugin {
         let skeletonCollector = SkeletonCollector(context: context)
         let skeletons = skeletonCollector.collectFromTests()
 
-        // NOTE: Find the product artifact from the default build directory
+        // NOTE: Find the product artifact(s) from the default build directory
         //       because PackageManager.BuildResult doesn't include the
         //       product artifact for tests.
         //       This doesn't work when `--scratch-path` is used but
         //       we don't have a way to guess the correct path. (we can find
         //       the path by building a dummy executable product but it's
         //       not worth the overhead)
-        var productArtifact: URL?
-        for fileExtension in ["wasm", "xctest"] {
-            let packageDir = context.package.directoryURL
-            let path = packageDir.appending(path: ".build/debug/\(productName).\(fileExtension)").path
-            if FileManager.default.fileExists(atPath: path) {
-                productArtifact = URL(fileURLWithPath: path)
-                break
-            }
-        }
-        guard let productArtifact = productArtifact else {
-            throw PackageToJSError(
-                "Failed to find '\(productName).wasm' or '\(productName).xctest'"
-            )
-        }
-        let outputDir =
+        let productArtifacts = try findTestProductArtifacts(
+            productName: productName,
+            context: context,
+            options: testOptions.packageOptions
+        )
+
+        let baseOutputDir =
             if let outputPath = testOptions.packageOptions.outputPath {
                 URL(fileURLWithPath: outputPath)
             } else {
                 context.pluginWorkDirectoryURL.appending(path: "PackageTests")
             }
-        var make = MiniMake(
-            explain: testOptions.packageOptions.explain,
-            printProgress: self.printProgress
-        )
-        let planner = PackagingPlanner(
-            options: testOptions.packageOptions,
-            context: context,
-            selfPackage: selfPackage,
-            skeletons: skeletons,
-            outputDir: outputDir,
-            wasmProductArtifact: productArtifact,
-            // If the product artifact doesn't have a .wasm extension, add it
-            // to deliver it with the correct MIME type when serving the test
-            // files for browser tests.
-            wasmFilename: productArtifact.lastPathComponent.hasSuffix(".wasm")
-                ? productArtifact.lastPathComponent
-                : productArtifact.lastPathComponent + ".wasm"
-        )
-        let (rootTask, binDir) = try planner.planTestBuild(
-            make: &make
-        )
-        cleanIfBuildGraphChanged(root: rootTask, make: make, context: context)
-        print("Packaging tests...")
-        let scope = MiniMake.VariableScope(variables: [:])
-        try make.build(output: rootTask, scope: scope)
-        print("Packaging tests finished")
 
-        if !testOptions.buildOnly {
-            let testRunner = scope.resolve(path: binDir.appending(path: "test.js"))
-            try PackageToJS.runTest(
-                testRunner: testRunner,
-                currentDirectoryURL: context.pluginWorkDirectoryURL,
+        // With multiple runners, package what they share into the base directory once: the
+        // test harness's npm dependencies, and the glue describing every test target that
+        // preludes import by a fixed path. Each runner is packaged into a subdirectory of
+        // it.
+        let hasSharedArtifacts = productArtifacts.count > 1
+        if hasSharedArtifacts, let firstArtifact = productArtifacts.first {
+            var make = MiniMake(
+                explain: testOptions.packageOptions.explain,
+                printProgress: self.printProgress
+            )
+            let planner = PackagingPlanner(
+                options: testOptions.packageOptions,
+                context: context,
+                selfPackage: selfPackage,
+                skeletons: skeletons,
+                outputDir: baseOutputDir,
+                wasmProductArtifact: firstArtifact,
+                wasmFilename: firstArtifact.lastPathComponent.hasSuffix(".wasm")
+                    ? firstArtifact.lastPathComponent
+                    : firstArtifact.lastPathComponent + ".wasm"
+            )
+            let rootTask = try planner.planSharedTestArtifacts(make: &make)
+            print("Packaging shared test artifacts...")
+            try make.build(output: rootTask, scope: MiniMake.VariableScope(variables: [:]))
+        }
+
+        // The native build system links every test target into a single combined
+        // `<Package>PackageTests` binary, but SwiftBuild produces one runner per test
+        // target. Package and run each artifact. When there is more than one, give each its
+        // own output subdirectory and build fingerprint so their harnesses don't clobber one
+        // another, and keep going after a failure so every target's results are reported.
+        var anyTestFailed = false
+        for productArtifact in productArtifacts {
+            let runnerName = productArtifact.deletingPathExtension().lastPathComponent
+            let outputDir =
+                productArtifacts.count == 1
+                ? baseOutputDir
+                : baseOutputDir.appending(path: runnerName)
+
+            var make = MiniMake(
+                explain: testOptions.packageOptions.explain,
+                printProgress: self.printProgress
+            )
+            let planner = PackagingPlanner(
+                options: testOptions.packageOptions,
+                context: context,
+                selfPackage: selfPackage,
+                // Generate the glue from what this binary actually links in: the combined
+                // binary holds every test target, while a per-target runner holds one.
+                skeletons: runnerSkeletons(
+                    runnerName: runnerName,
+                    isCombinedBinary: !hasSharedArtifacts,
+                    context: context,
+                    aggregated: skeletons
+                ),
                 outputDir: outputDir,
-                testOptions: testOptions
+                wasmProductArtifact: productArtifact,
+                // If the product artifact doesn't have a .wasm extension, add it
+                // to deliver it with the correct MIME type when serving the test
+                // files for browser tests.
+                wasmFilename: productArtifact.lastPathComponent.hasSuffix(".wasm")
+                    ? productArtifact.lastPathComponent
+                    : productArtifact.lastPathComponent + ".wasm"
+            )
+            let (rootTask, binDir) = try planner.planTestBuild(
+                make: &make,
+                installNodeModules: !hasSharedArtifacts
             )
+            cleanIfBuildGraphChanged(
+                root: rootTask,
+                make: make,
+                context: context,
+                fingerprintName: productArtifacts.count == 1 ? "minimake.json" : "minimake-\(runnerName).json"
+            )
+            if productArtifacts.count == 1 {
+                print("Packaging tests...")
+            } else {
+                print("Packaging tests for '\(runnerName)'...")
+            }
+            let scope = MiniMake.VariableScope(variables: [:])
+            try make.build(output: rootTask, scope: scope)
+            print("Packaging tests finished")
+
+            if !testOptions.buildOnly {
+                let testRunner = scope.resolve(path: binDir.appending(path: "test.js"))
+                do {
+                    try PackageToJS.runTest(
+                        testRunner: testRunner,
+                        currentDirectoryURL: context.pluginWorkDirectoryURL,
+                        outputDir: outputDir,
+                        testOptions: testOptions
+                    )
+                } catch {
+                    // Keep running the remaining test runners, but remember the failure so
+                    // the overall command still exits non-zero.
+                    printStderr("\(runnerName): \(error)")
+                    anyTestFailed = true
+                }
+            }
         }
+
+        if anyTestFailed {
+            exit(1)
+        }
+    }
+
+    /// The skeletons describing the API a single test binary exposes.
+    ///
+    /// The native build system links every test target into one binary, so it gets the
+    /// skeletons of all of them. SwiftBuild produces a `<TestTarget>-test-runner` per test
+    /// target, which only exposes that target and its dependencies.
+    private func runnerSkeletons(
+        runnerName: String,
+        isCombinedBinary: Bool,
+        context: PluginContext,
+        aggregated: [BridgeJSSkeletonInput]
+    ) -> [BridgeJSSkeletonInput] {
+        let testRunnerSuffix = "-test-runner"
+        guard !isCombinedBinary, runnerName.hasSuffix(testRunnerSuffix) else {
+            return aggregated
+        }
+        let targetName = String(runnerName.dropLast(testRunnerSuffix.count))
+        return SkeletonCollector(context: context).collectFromTest(targetName: targetName)
+    }
+
+    /// Locate the test product artifact(s) to run.
+    ///
+    /// The native build system links all test targets into a single combined
+    /// `<Package>PackageTests` binary. SwiftBuild instead emits one
+    /// `<TestTarget>-test-runner.wasm` per test target and only an aggregate
+    /// orchestration product, so fall back to discovering those runners.
+    private func findTestProductArtifacts(
+        productName: String,
+        context: PluginContext,
+        options: PackageToJS.PackageOptions
+    ) throws -> [URL] {
+        let fileManager = FileManager.default
+        let packageDir = context.package.directoryURL
+        let configuration = (options.configuration ?? "debug").lowercased()
+
+        // Native combined test binary.
+        for fileExtension in ["wasm", "xctest"] {
+            let path = packageDir.appending(path: ".build/\(configuration)/\(productName).\(fileExtension)").path
+            if fileManager.fileExists(atPath: path) {
+                return [URL(fileURLWithPath: path)]
+            }
+        }
+
+        // SwiftBuild per-test-target runners:
+        //   .build/out/Products/<Config>-webassembly-wasm32/<TestTarget>-test-runner.wasm
+        let productsDir = packageDir.appending(path: ".build/out/Products")
+        if let configDirs = try? fileManager.contentsOfDirectory(
+            at: productsDir,
+            includingPropertiesForKeys: nil
+        ) {
+            let wasmConfigDirs = configDirs.filter { $0.lastPathComponent.hasSuffix("-webassembly-wasm32") }
+            let chosenDir =
+                wasmConfigDirs.first { $0.lastPathComponent.lowercased().hasPrefix(configuration) }
+                ?? wasmConfigDirs.first
+            if let chosenDir,
+                let entries = try? fileManager.contentsOfDirectory(at: chosenDir, includingPropertiesForKeys: nil)
+            {
+                let runners =
+                    entries
+                    .filter { $0.lastPathComponent.hasSuffix("-test-runner.wasm") }
+                    .sorted { $0.lastPathComponent < $1.lastPathComponent }
+                if !runners.isEmpty {
+                    return runners
+                }
+            }
+        }
+
+        throw PackageToJSError(
+            "Failed to find '\(productName).wasm' or '\(productName).xctest' (native build system), "
+                + "or any '*-test-runner.wasm' under .build/out/Products (swiftbuild build system)"
+        )
     }
 
     private func buildWasm(
@@ -414,9 +557,10 @@ struct PackageToJSPlugin: CommandPlugin {
     private func cleanIfBuildGraphChanged(
         root: MiniMake.TaskKey,
         make: MiniMake,
-        context: PluginContext
+        context: PluginContext,
+        fingerprintName: String = "minimake.json"
     ) {
-        let buildFingerprint = context.pluginWorkDirectoryURL.appending(path: "minimake.json")
+        let buildFingerprint = context.pluginWorkDirectoryURL.appending(path: fingerprintName)
         let lastBuildFingerprint = try? Data(contentsOf: buildFingerprint)
         let currentBuildFingerprint = try? make.computeFingerprint(root: root)
         if lastBuildFingerprint != currentBuildFingerprint {
@@ -704,7 +848,7 @@ class SkeletonCollector {
     private var visitedProducts: Set<Product.ID> = []
     private var visitedTargets: Set<Target.ID> = []
 
-    var skeletons: [URL] = []
+    var skeletons: [BridgeJSSkeletonInput] = []
     let skeletonFile = "BridgeJS.json"
     let context: PluginContext
 
@@ -712,7 +856,7 @@ class SkeletonCollector {
         self.context = context
     }
 
-    func collectFromProduct(name: String) -> [URL] {
+    func collectFromProduct(name: String) -> [BridgeJSSkeletonInput] {
         guard let product = context.package.products.first(where: { $0.name == name }) else {
             return []
         }
@@ -720,17 +864,29 @@ class SkeletonCollector {
         return skeletons
     }
 
-    func collectFromTests() -> [URL] {
-        let tests = context.package.targets.filter {
-            guard let target = $0 as? SwiftSourceModuleTarget else { return false }
-            return target.kind == .test
-        }
-        for test in tests {
+    func collectFromTests() -> [BridgeJSSkeletonInput] {
+        for test in testTargets {
             visit(target: test, package: context.package)
         }
         return skeletons
     }
 
+    /// Collect the skeletons of a single test target and everything it links in.
+    func collectFromTest(targetName: String) -> [BridgeJSSkeletonInput] {
+        guard let test = testTargets.first(where: { $0.name == targetName }) else {
+            return []
+        }
+        visit(target: test, package: context.package)
+        return skeletons
+    }
+
+    private var testTargets: [Target] {
+        context.package.targets.filter {
+            guard let target = $0 as? SwiftSourceModuleTarget else { return false }
+            return target.kind == .test
+        }
+    }
+
     private func visit(product: Product, package: Package) {
         if visitedProducts.contains(product.id) { return }
         visitedProducts.insert(product.id)
@@ -758,7 +914,12 @@ class SkeletonCollector {
             ]
             for skeletonURL in candidates {
                 if FileManager.default.fileExists(atPath: skeletonURL.path) {
-                    skeletons.append(skeletonURL)
+                    skeletons.append(
+                        BridgeJSSkeletonInput(
+                            source: skeletonURL,
+                            targetDirectory: target.directoryURL
+                        )
+                    )
                 }
             }
         }
@@ -788,13 +949,13 @@ extension PackagingPlanner {
         options: PackageToJS.PackageOptions,
         context: PluginContext,
         selfPackage: Package,
-        skeletons: [URL],
+        skeletons: [BridgeJSSkeletonInput],
         outputDir: URL,
         wasmProductArtifact: URL,
         wasmFilename: String
     ) {
         let outputBaseName = outputDir.lastPathComponent
-        let (configuration, triple) = PackageToJS.deriveBuildConfiguration(wasmProductArtifact: wasmProductArtifact)
+        let configuration = PackageToJS.deriveBuildConfiguration(wasmProductArtifact: wasmProductArtifact)
         let system = DefaultPackagingSystem(printWarning: printStderr, which: which(_:))
         self.init(
             options: options,
@@ -803,12 +964,11 @@ extension PackagingPlanner {
                 absolute: context.pluginWorkDirectoryURL.appending(path: outputBaseName + ".tmp").path
             ),
             selfPackageDir: BuildPath(absolute: selfPackage.directoryURL.path),
-            skeletons: skeletons.map { BuildPath(absolute: $0.path) },
+            skeletons: skeletons,
             outputDir: BuildPath(absolute: outputDir.path),
             wasmProductArtifact: BuildPath(absolute: wasmProductArtifact.path),
             wasmFilename: wasmFilename,
             configuration: configuration,
-            triple: triple,
             system: system
         )
     }
diff --git a/Plugins/PackageToJS/Sources/ParseWasm.swift b/Plugins/PackageToJS/Sources/ParseWasm.swift
index 4372b32c5..31cd4a692 100644
--- a/Plugins/PackageToJS/Sources/ParseWasm.swift
+++ b/Plugins/PackageToJS/Sources/ParseWasm.swift
@@ -186,27 +186,29 @@ func parseImports(moduleBytes: Data) throws -> [ImportEntry] {
                 let name = try parseState.readName()
                 let type = try parseState.readByte()
 
+                let kind: ImportEntry.ImportKind
                 switch type {
                 case 0x00:  // Function
                     let index = try parseState.readUnsignedLEB128()
                     guard index < UInt32(types.count) else {
                         throw ParseError.unexpectedEndOfData
                     }
+                    kind = .function
 
                 case 0x01:  // Table
                     _ = try parseTableType(parseState)
+                    kind = .table
 
                 case 0x02:  // Memory
-                    let limits = try parseLimits(parseState)
-                    imports.append(
-                        ImportEntry(module: module, name: name, kind: .memory(type: limits))
-                    )
+                    kind = .memory(type: try parseLimits(parseState))
 
                 case 0x03:  // Global
                     _ = try parseGlobalType(parseState)
+                    kind = .global
                 default:
                     throw ParseError.unknownImportDescriptorType(type)
                 }
+                imports.append(ImportEntry(module: module, name: name, kind: kind))
             }
             // Skip the rest of the module
             return imports
diff --git a/Plugins/PackageToJS/Templates/instantiate.js b/Plugins/PackageToJS/Templates/instantiate.js
index 88e322538..7ceafe715 100644
--- a/Plugins/PackageToJS/Templates/instantiate.js
+++ b/Plugins/PackageToJS/Templates/instantiate.js
@@ -69,6 +69,8 @@ async function createInstantiator(options, swift) {
                 swift_js_pop_i64: unexpectedBjsCall,
                 swift_js_closure_unregister: unexpectedBjsCall,
                 swift_js_push_typed_array: unexpectedBjsCall,
+                swift_js_make_promise: unexpectedBjsCall,
+                bjs_core_register_type_handles: unexpectedBjsCall,
             };
         },
         /** @param {WebAssembly.Instance} instance */
@@ -83,7 +85,7 @@ async function createInstantiator(options, swift) {
 
 /** @type {import('./instantiate.d').instantiate} */
 export async function instantiate(options) {
-    const result = await _instantiate(options);
+    const { instantiator, ...result } = await _instantiate(options);
     /* #if IS_WASI */
     options.wasi.initialize(result.instance);
     /* #endif */
@@ -93,7 +95,7 @@ export async function instantiate(options) {
 
 /** @type {import('./instantiate.d').instantiateForThread} */
 export async function instantiateForThread(tid, startArg, options) {
-    const result = await _instantiate(options);
+    const { instantiator, ...result } = await _instantiate(options);
     /* #if IS_WASI */
     options.wasi.setInstance(result.instance);
     /* #endif */
@@ -101,7 +103,7 @@ export async function instantiateForThread(tid, startArg, options) {
     return result;
 }
 
-/** @type {import('./instantiate.d').instantiate} */
+/** @param {import('./instantiate.d').InstantiateOptions} options */
 async function _instantiate(options) {
     const _WebAssembly = options.WebAssembly || WebAssembly;
     const moduleSource = options.module;
@@ -183,5 +185,6 @@ async function _instantiate(options) {
         instance,
         swift,
         exports,
+        instantiator,
     };
 }
diff --git a/Plugins/PackageToJS/Templates/runtime.mjs b/Plugins/PackageToJS/Templates/runtime.mjs
index daf4f3ab0..b0be54bb4 100644
--- a/Plugins/PackageToJS/Templates/runtime.mjs
+++ b/Plugins/PackageToJS/Templates/runtime.mjs
@@ -49,13 +49,15 @@ const decode = (kind, payload1, payload2, objectSpace) => {
 // Note:
 // `decodeValues` assumes that the size of RawJSValue is 16.
 const decodeArray = (ptr, length, memory, objectSpace) => {
+    const basePtr = ptr >>> 0;
+    const count = length >>> 0;
     // fast path for empty array
-    if (length === 0) {
+    if (count === 0) {
         return [];
     }
     let result = [];
-    for (let index = 0; index < length; index++) {
-        const base = ptr + 16 * index;
+    for (let index = 0; index < count; index++) {
+        const base = basePtr + 16 * index;
         const kind = memory.getUint32(base, true);
         const payload1 = memory.getUint32(base + 4, true);
         const payload2 = memory.getFloat64(base + 8, true);
@@ -69,25 +71,27 @@ const decodeArray = (ptr, length, memory, objectSpace) => {
 // This function should be used only when kind flag is stored in memory.
 const write = (value, kind_ptr, payload1_ptr, payload2_ptr, is_exception, memory, objectSpace) => {
     const kind = writeAndReturnKindBits(value, payload1_ptr, payload2_ptr, is_exception, memory, objectSpace);
-    memory.setUint32(kind_ptr, kind, true);
+    memory.setUint32(kind_ptr >>> 0, kind, true);
 };
 const writeAndReturnKindBits = (value, payload1_ptr, payload2_ptr, is_exception, memory, objectSpace) => {
     const exceptionBit = (is_exception ? 1 : 0) << 31;
+    const payload1Offset = payload1_ptr >>> 0;
+    const payload2Offset = payload2_ptr >>> 0;
     if (value === null) {
         return exceptionBit | 4 /* Kind.Null */;
     }
     const writeRef = (kind) => {
-        memory.setUint32(payload1_ptr, objectSpace.retain(value), true);
+        memory.setUint32(payload1Offset, objectSpace.retain(value), true);
         return exceptionBit | kind;
     };
     const type = typeof value;
     switch (type) {
         case "boolean": {
-            memory.setUint32(payload1_ptr, value ? 1 : 0, true);
+            memory.setUint32(payload1Offset, value ? 1 : 0, true);
             return exceptionBit | 0 /* Kind.Boolean */;
         }
         case "number": {
-            memory.setFloat64(payload2_ptr, value, true);
+            memory.setFloat64(payload2Offset, value, true);
             return exceptionBit | 2 /* Kind.Number */;
         }
         case "string": {
@@ -114,9 +118,11 @@ const writeAndReturnKindBits = (value, payload1_ptr, payload2_ptr, is_exception,
     throw new Error("Unreachable");
 };
 function decodeObjectRefs(ptr, length, memory) {
-    const result = new Array(length);
-    for (let i = 0; i < length; i++) {
-        result[i] = memory.getUint32(ptr + 4 * i, true);
+    const basePtr = ptr >>> 0;
+    const count = length >>> 0;
+    const result = new Array(count);
+    for (let i = 0; i < count; i++) {
+        result[i] = memory.getUint32(basePtr + 4 * i, true);
     }
     return result;
 }
@@ -617,25 +623,29 @@ class SwiftRuntime {
                 const memory = this.memory;
                 const bytes = this.textEncoder.encode(memory.getObject(ref));
                 const bytes_ptr = memory.retain(bytes);
-                this.getDataView().setUint32(bytes_ptr_result, bytes_ptr, true);
+                this.getDataView().setUint32(bytes_ptr_result >>> 0, bytes_ptr, true);
                 return bytes.length;
             },
             swjs_decode_string: 
             // NOTE: TextDecoder can't decode typed arrays backed by SharedArrayBuffer
             this.options.sharedMemory == true
                 ? (bytes_ptr, length) => {
-                    const bytes = this.getUint8Array().slice(bytes_ptr, bytes_ptr + length);
+                    const bytesOffset = bytes_ptr >>> 0;
+                    const byteLength = length >>> 0;
+                    const bytes = this.getUint8Array().slice(bytesOffset, bytesOffset + byteLength);
                     const string = this.textDecoder.decode(bytes);
                     return this.memory.retain(string);
                 }
                 : (bytes_ptr, length) => {
-                    const bytes = this.getUint8Array().subarray(bytes_ptr, bytes_ptr + length);
+                    const bytesOffset = bytes_ptr >>> 0;
+                    const byteLength = length >>> 0;
+                    const bytes = this.getUint8Array().subarray(bytesOffset, bytesOffset + byteLength);
                     const string = this.textDecoder.decode(bytes);
                     return this.memory.retain(string);
                 },
             swjs_load_string: (ref, buffer) => {
                 const bytes = this.memory.getObject(ref);
-                this.getUint8Array().set(bytes, buffer);
+                this.getUint8Array().set(bytes, buffer >>> 0);
             },
             swjs_call_function: (ref, argv, argc, payload1_ptr, payload2_ptr) => {
                 const memory = this.memory;
@@ -739,7 +749,7 @@ class SwiftRuntime {
                     // See https://github.com/swiftwasm/swift/issues/5599
                     return this.memory.retain(new ArrayType());
                 }
-                const array = new ArrayType(this.wasmMemory.buffer, elementsPtr, length);
+                const array = new ArrayType(this.wasmMemory.buffer, elementsPtr >>> 0, length >>> 0);
                 // Call `.slice()` to copy the memory
                 return this.memory.retain(array.slice());
             },
@@ -750,7 +760,7 @@ class SwiftRuntime {
                 const memory = this.memory;
                 const typedArray = memory.getObject(ref);
                 const bytes = new Uint8Array(typedArray.buffer);
-                this.getUint8Array().set(bytes, buffer);
+                this.getUint8Array().set(bytes, buffer >>> 0);
             },
             swjs_release: (ref) => {
                 this.memory.release(ref);
diff --git a/Plugins/PackageToJS/Tests/ExampleTests.swift b/Plugins/PackageToJS/Tests/ExampleTests.swift
index d26832771..d131b329a 100644
--- a/Plugins/PackageToJS/Tests/ExampleTests.swift
+++ b/Plugins/PackageToJS/Tests/ExampleTests.swift
@@ -246,11 +246,26 @@ extension Trait where Self == ConditionTrait {
     func basic() throws {
         let swiftSDKID = try #require(Self.getSwiftSDKID())
         try withPackage(at: "Examples/Basic") { packageDir, _, runSwift in
-            try runSwift(["package", "--swift-sdk", swiftSDKID, "js"], [:])
-            try runSwift(["package", "--swift-sdk", swiftSDKID, "js", "--debug-info-format", "dwarf"], [:])
-            try runSwift(["package", "--swift-sdk", swiftSDKID, "js", "--debug-info-format", "name"], [:])
+            try runSwift(["package", "--build-system", "native", "--swift-sdk", swiftSDKID, "js"], [:])
             try runSwift(
-                ["package", "--swift-sdk", swiftSDKID, "-Xswiftc", "-DJAVASCRIPTKIT_WITHOUT_WEAKREFS", "js"],
+                [
+                    "package", "--build-system", "native", "--swift-sdk", swiftSDKID, "js", "--debug-info-format",
+                    "dwarf",
+                ],
+                [:]
+            )
+            try runSwift(
+                [
+                    "package", "--build-system", "native", "--swift-sdk", swiftSDKID, "js", "--debug-info-format",
+                    "name",
+                ],
+                [:]
+            )
+            try runSwift(
+                [
+                    "package", "--build-system", "native", "--swift-sdk", swiftSDKID, "-Xswiftc",
+                    "-DJAVASCRIPTKIT_WITHOUT_WEAKREFS", "js",
+                ],
                 [:]
             )
         }
@@ -266,7 +281,10 @@ extension Trait where Self == ConditionTrait {
             try runProcess(which("npm"), ["install"], [:])
             try runProcess(which("npx"), ["playwright", "install", "chromium-headless-shell"], [:])
 
-            try runSwift(["package", "--disable-sandbox", "--swift-sdk", swiftSDKID, "js", "test"], [:])
+            try runSwift(
+                ["package", "--build-system", "native", "--disable-sandbox", "--swift-sdk", swiftSDKID, "js", "test"],
+                [:]
+            )
             try withTemporaryDirectory(body: { tempDir, _ in
                 let scriptContent = """
                     const fs = require('fs');
@@ -278,7 +296,8 @@ extension Trait where Self == ConditionTrait {
                 let scriptPath = tempDir.appending(path: "script.js")
                 try runSwift(
                     [
-                        "package", "--disable-sandbox", "--swift-sdk", swiftSDKID, "js", "test",
+                        "package", "--build-system", "native", "--disable-sandbox", "--swift-sdk", swiftSDKID, "js",
+                        "test",
                         "-Xnode=--require=\(scriptPath.path)",
                     ],
                     [:]
@@ -291,20 +310,25 @@ extension Trait where Self == ConditionTrait {
                 )
             })
             try runSwift(
-                ["package", "--disable-sandbox", "--swift-sdk", swiftSDKID, "js", "test", "--environment", "browser"],
+                [
+                    "package", "--build-system", "native", "--disable-sandbox", "--swift-sdk", swiftSDKID, "js", "test",
+                    "--environment", "browser",
+                ],
                 [:]
             )
         }
     }
 
-    #if compiler(>=6.1)
     @Test(.requireSwiftSDK)
     func testingWithCoverage() throws {
         let swiftSDKID = try #require(Self.getSwiftSDKID())
         let swiftPath = try #require(Self.getSwiftPath())
         try withPackage(at: "Examples/Testing") { packageDir, runProcess, runSwift in
             try runSwift(
-                ["package", "--disable-sandbox", "--swift-sdk", swiftSDKID, "js", "test", "--enable-code-coverage"],
+                [
+                    "package", "--build-system", "native", "--disable-sandbox", "--swift-sdk", swiftSDKID, "js", "test",
+                    "--enable-code-coverage",
+                ],
                 [
                     "LLVM_PROFDATA_PATH": URL(fileURLWithPath: swiftPath).appending(path: "llvm-profdata").path
                 ]
@@ -325,14 +349,13 @@ extension Trait where Self == ConditionTrait {
             }
         }
     }
-    #endif
     #endif  // compiler(>=6.3)
 
     @Test(.requireSwiftSDK(triple: "wasm32-unknown-wasip1-threads"))
     func multithreading() throws {
         let swiftSDKID = try #require(Self.getSwiftSDKID())
         try withPackage(at: "Examples/Multithreading") { packageDir, _, runSwift in
-            try runSwift(["package", "--swift-sdk", swiftSDKID, "js"], [:])
+            try runSwift(["package", "--build-system", "native", "--swift-sdk", swiftSDKID, "js"], [:])
         }
     }
 
@@ -340,7 +363,7 @@ extension Trait where Self == ConditionTrait {
     func offscreenCanvas() throws {
         let swiftSDKID = try #require(Self.getSwiftSDKID())
         try withPackage(at: "Examples/OffscrenCanvas") { packageDir, _, runSwift in
-            try runSwift(["package", "--swift-sdk", swiftSDKID, "js"], [:])
+            try runSwift(["package", "--build-system", "native", "--swift-sdk", swiftSDKID, "js"], [:])
         }
     }
 
@@ -348,7 +371,7 @@ extension Trait where Self == ConditionTrait {
     func actorOnWebWorker() throws {
         let swiftSDKID = try #require(Self.getSwiftSDKID())
         try withPackage(at: "Examples/ActorOnWebWorker") { packageDir, _, runSwift in
-            try runSwift(["package", "--swift-sdk", swiftSDKID, "js"], [:])
+            try runSwift(["package", "--build-system", "native", "--swift-sdk", swiftSDKID, "js"], [:])
         }
     }
 
@@ -359,7 +382,7 @@ extension Trait where Self == ConditionTrait {
         let swiftSDKID = try #require(Self.getEmbeddedSwiftSDKID())
         try withPackage(at: "Examples/Embedded") { packageDir, _, runSwift in
             try runSwift(
-                ["package", "--swift-sdk", swiftSDKID, "js", "-c", "release"],
+                ["package", "--build-system", "native", "--swift-sdk", swiftSDKID, "js", "-c", "release"],
                 [
                     "JAVASCRIPTKIT_EXPERIMENTAL_EMBEDDED_WASM": "true"
                 ]
@@ -375,11 +398,13 @@ extension Trait where Self == ConditionTrait {
             at: "Plugins/PackageToJS/Fixtures/ContinuationLeakInTest/XCTest",
             assertTerminationStatus: { $0 != 0 }
         ) { packageDir, _, runSwift in
-            try runSwift(["package", "--disable-sandbox", "--swift-sdk", swiftSDKID, "js", "test"], [:])
+            try runSwift(
+                ["package", "--build-system", "native", "--disable-sandbox", "--swift-sdk", swiftSDKID, "js", "test"],
+                [:]
+            )
         }
     }
 
-    #if compiler(>=6.1)
     // TODO: Remove triple restriction once swift-testing is shipped in p1-threads SDK
     @Test(.requireSwiftSDK(triple: "wasm32-unknown-wasi"))
     func continuationLeakInTest_SwiftTesting() throws {
@@ -388,11 +413,12 @@ extension Trait where Self == ConditionTrait {
             at: "Plugins/PackageToJS/Fixtures/ContinuationLeakInTest/SwiftTesting",
             assertTerminationStatus: { $0 != 0 }
         ) { packageDir, _, runSwift in
-            try runSwift(["package", "--disable-sandbox", "--swift-sdk", swiftSDKID, "js", "test"], [:])
+            try runSwift(
+                ["package", "--build-system", "native", "--disable-sandbox", "--swift-sdk", swiftSDKID, "js", "test"],
+                [:]
+            )
         }
     }
-    #endif
-
     @Test(.requireSwiftSDK)
     func playwrightOnPageLoad_XCTest() throws {
         let swiftSDKID = try #require(Self.getSwiftSDKID())
@@ -405,7 +431,7 @@ extension Trait where Self == ConditionTrait {
 
             try runSwift(
                 ["package", "--disable-sandbox"] + Self.stackSizeLinkerFlags + [
-                    "--swift-sdk", swiftSDKID, "js", "test", "--environment", "browser",
+                    "--build-system", "native", "--swift-sdk", swiftSDKID, "js", "test", "--environment", "browser",
                     "--playwright-expose", "../expose.js",
                 ],
                 [:]
@@ -413,7 +439,6 @@ extension Trait where Self == ConditionTrait {
         }
     }
 
-    #if compiler(>=6.1)
     // TODO: Remove triple restriction once swift-testing is shipped in p1-threads SDK
     @Test(.requireSwiftSDK(triple: "wasm32-unknown-wasi"))
     func playwrightOnPageLoad_SwiftTesting() throws {
@@ -427,12 +452,12 @@ extension Trait where Self == ConditionTrait {
 
             try runSwift(
                 [
-                    "package", "--disable-sandbox", "--swift-sdk", swiftSDKID, "js", "test", "--environment", "browser",
+                    "package", "--build-system", "native", "--disable-sandbox", "--swift-sdk", swiftSDKID, "js", "test",
+                    "--environment", "browser",
                     "--playwright-expose", "../expose.js",
                 ],
                 [:]
             )
         }
     }
-    #endif
 }
diff --git a/Plugins/PackageToJS/Tests/PackagingPlannerTests.swift b/Plugins/PackageToJS/Tests/PackagingPlannerTests.swift
index 3e0d67a3e..4cff48e6c 100644
--- a/Plugins/PackageToJS/Tests/PackagingPlannerTests.swift
+++ b/Plugins/PackageToJS/Tests/PackagingPlannerTests.swift
@@ -9,10 +9,16 @@ import Testing
     }
     class TestPackagingSystem: PackagingSystem {
         var npmInstallCalls: [String] = []
+        var writtenFiles: [String] = []
         func npmInstall(packageDir: String) throws {
             npmInstallCalls.append(packageDir)
         }
 
+        func writeFile(atPath: String, content: Data) throws {
+            writtenFiles.append(atPath)
+            try content.write(to: URL(fileURLWithPath: atPath))
+        }
+
         func wasmOpt(_ arguments: [String], input: String, output: String) throws {
             try FileManager.default.copyItem(
                 at: URL(fileURLWithPath: input),
@@ -70,7 +76,6 @@ import Testing
             wasmProductArtifact: BuildPath(prefix: "WASM_PRODUCT_ARTIFACT"),
             wasmFilename: "main.wasm",
             configuration: configuration,
-            triple: "wasm32-unknown-wasi",
             selfPath: BuildPath(prefix: "PLANNER_SOURCE_PATH"),
             system: system
         )
@@ -100,7 +105,6 @@ import Testing
             wasmProductArtifact: BuildPath(prefix: "WASM_PRODUCT_ARTIFACT"),
             wasmFilename: "main.wasm",
             configuration: "debug",
-            triple: "wasm32-unknown-wasi",
             selfPath: BuildPath(prefix: "PLANNER_SOURCE_PATH"),
             system: system
         )
@@ -110,4 +114,308 @@ import Testing
             return root
         }
     }
+
+    @Test func editingJavaScriptModuleOnlyResyncsModules() throws {
+        try withTemporaryDirectory { temporaryDirectory, _ in
+            let skeleton = temporaryDirectory.appending(path: "BridgeJS.json")
+            let module = temporaryDirectory.appending(path: "module.mjs")
+            let wasm = temporaryDirectory.appending(path: "main.wasm")
+            let plannerSource = temporaryDirectory.appending(path: "PackageToJS.swift")
+            let output = temporaryDirectory.appending(path: "output")
+            let intermediates = temporaryDirectory.appending(path: "intermediates")
+
+            let bridgeSkeleton = BridgeJSSkeleton(
+                moduleName: "TestModule",
+                imported: ImportedModuleSkeleton(
+                    children: [
+                        ImportedFileSkeleton(
+                            functions: [
+                                ImportedFunctionSkeleton(
+                                    name: "value",
+                                    from: .snippet("/module.mjs"),
+                                    parameters: [],
+                                    returnType: .void
+                                )
+                            ],
+                            types: []
+                        )
+                    ]
+                )
+            )
+            try JSONEncoder().encode(bridgeSkeleton).write(to: skeleton)
+            try Data("export const value = 1;\n".utf8).write(to: module)
+            try Data([0x00, 0x61, 0x73, 0x6d, 0x01, 0x00, 0x00, 0x00]).write(to: wasm)
+            try Data().write(to: plannerSource)
+
+            let system = TestPackagingSystem()
+            let planner = PackagingPlanner(
+                options: PackageToJS.PackageOptions(),
+                packageId: "test",
+                intermediatesDir: BuildPath(absolute: intermediates.path),
+                selfPackageDir: BuildPath(
+                    absolute: URL(fileURLWithPath: #filePath)
+                        .deletingLastPathComponent()
+                        .deletingLastPathComponent()
+                        .deletingLastPathComponent()
+                        .deletingLastPathComponent()
+                        .path
+                ),
+                skeletons: [
+                    .init(
+                        source: skeleton,
+                        targetDirectory: temporaryDirectory
+                    )
+                ],
+                outputDir: BuildPath(absolute: output.path),
+                wasmProductArtifact: BuildPath(absolute: wasm.path),
+                wasmFilename: "main.wasm",
+                configuration: "debug",
+                selfPath: BuildPath(absolute: plannerSource.path),
+                system: system
+            )
+            var make = MiniMake(printProgress: { _, _ in })
+            let root = try planner.planBuild(
+                make: &make,
+                buildOptions: PackageToJS.BuildOptions(
+                    product: "test",
+                    noOptimize: false,
+                    debugInfoFormat: .none,
+                    packageOptions: PackageToJS.PackageOptions()
+                )
+            )
+            let scope = MiniMake.VariableScope(variables: [:])
+
+            try make.build(output: root, scope: scope)
+
+            let copiedModule = output.appending(
+                path: "bridge-js-modules/TestModule/module.mjs"
+            )
+            #expect(try String(contentsOf: copiedModule, encoding: .utf8) == "export const value = 1;\n")
+            let initialLinkCount = system.writtenFiles.filter { $0.hasSuffix("/bridge-js.js") }.count
+            #expect(initialLinkCount == 1)
+
+            try Data("export const value = 2;\n".utf8).write(to: module)
+            try FileManager.default.setAttributes(
+                [.modificationDate: Date().addingTimeInterval(10)],
+                ofItemAtPath: module.path
+            )
+            try make.build(output: root, scope: scope)
+
+            #expect(try String(contentsOf: copiedModule, encoding: .utf8) == "export const value = 2;\n")
+            #expect(system.writtenFiles.filter { $0.hasSuffix("/bridge-js.js") }.count == initialLinkCount)
+        }
+    }
+
+    /// A bare specifier must not suppress copying of local modules that appear alongside it.
+    @Test func mixedLocalAndBareModulesBothWork() throws {
+        try withTemporaryDirectory { temporaryDirectory, _ in
+            let skeleton = temporaryDirectory.appending(path: "BridgeJS.json")
+            let module = temporaryDirectory.appending(path: "module.mjs")
+            let wasm = temporaryDirectory.appending(path: "main.wasm")
+            let plannerSource = temporaryDirectory.appending(path: "PackageToJS.swift")
+            let output = temporaryDirectory.appending(path: "output")
+            let intermediates = temporaryDirectory.appending(path: "intermediates")
+
+            let bridgeSkeleton = BridgeJSSkeleton(
+                moduleName: "TestModule",
+                imported: ImportedModuleSkeleton(
+                    children: [
+                        ImportedFileSkeleton(
+                            functions: [
+                                ImportedFunctionSkeleton(
+                                    name: "value",
+                                    from: .snippet("/module.mjs"),
+                                    parameters: [],
+                                    returnType: .void
+                                ),
+                                ImportedFunctionSkeleton(
+                                    name: "basename",
+                                    from: .module("node:path"),
+                                    parameters: [],
+                                    returnType: .void
+                                ),
+                            ],
+                            types: []
+                        )
+                    ]
+                )
+            )
+            try JSONEncoder().encode(bridgeSkeleton).write(to: skeleton)
+            try Data("export const value = 1;\n".utf8).write(to: module)
+            try Data([0x00, 0x61, 0x73, 0x6d, 0x01, 0x00, 0x00, 0x00]).write(to: wasm)
+            try Data().write(to: plannerSource)
+
+            let system = TestPackagingSystem()
+            let planner = PackagingPlanner(
+                options: PackageToJS.PackageOptions(),
+                packageId: "test",
+                intermediatesDir: BuildPath(absolute: intermediates.path),
+                selfPackageDir: BuildPath(
+                    absolute: URL(fileURLWithPath: #filePath)
+                        .deletingLastPathComponent()
+                        .deletingLastPathComponent()
+                        .deletingLastPathComponent()
+                        .deletingLastPathComponent()
+                        .path
+                ),
+                skeletons: [.init(source: skeleton, targetDirectory: temporaryDirectory)],
+                outputDir: BuildPath(absolute: output.path),
+                wasmProductArtifact: BuildPath(absolute: wasm.path),
+                wasmFilename: "main.wasm",
+                configuration: "debug",
+                selfPath: BuildPath(absolute: plannerSource.path),
+                system: system
+            )
+            var make = MiniMake(printProgress: { _, _ in })
+            let root = try planner.planBuild(
+                make: &make,
+                buildOptions: PackageToJS.BuildOptions(
+                    product: "test",
+                    noOptimize: false,
+                    debugInfoFormat: .none,
+                    packageOptions: PackageToJS.PackageOptions()
+                )
+            )
+            try make.build(output: root, scope: MiniMake.VariableScope(variables: [:]))
+
+            let copiedModule = output.appending(path: "bridge-js-modules/TestModule/module.mjs")
+            #expect(try String(contentsOf: copiedModule, encoding: .utf8) == "export const value = 1;\n")
+            let generated = try String(contentsOf: output.appending(path: "bridge-js.js"), encoding: .utf8)
+            #expect(generated.contains("from \"node:path\""))
+            #expect(generated.contains("bridge-js-modules/TestModule/module.mjs"))
+        }
+    }
+
+    /// A bare specifier such as "node:path" is resolved by the JavaScript host at load
+    /// time, so packaging must not look for a file on disk or copy anything for it.
+    @Test func bareJavaScriptModuleIsNotCopied() throws {
+        try withTemporaryDirectory { temporaryDirectory, _ in
+            let skeleton = temporaryDirectory.appending(path: "BridgeJS.json")
+            let wasm = temporaryDirectory.appending(path: "main.wasm")
+            let plannerSource = temporaryDirectory.appending(path: "PackageToJS.swift")
+            let output = temporaryDirectory.appending(path: "output")
+            let intermediates = temporaryDirectory.appending(path: "intermediates")
+
+            let bridgeSkeleton = BridgeJSSkeleton(
+                moduleName: "TestModule",
+                imported: ImportedModuleSkeleton(
+                    children: [
+                        ImportedFileSkeleton(
+                            functions: [
+                                ImportedFunctionSkeleton(
+                                    name: "basename",
+                                    from: .module("node:path"),
+                                    parameters: [],
+                                    returnType: .void
+                                )
+                            ],
+                            types: []
+                        )
+                    ]
+                )
+            )
+            try JSONEncoder().encode(bridgeSkeleton).write(to: skeleton)
+            try Data([0x00, 0x61, 0x73, 0x6d, 0x01, 0x00, 0x00, 0x00]).write(to: wasm)
+            try Data().write(to: plannerSource)
+
+            let system = TestPackagingSystem()
+            let planner = PackagingPlanner(
+                options: PackageToJS.PackageOptions(),
+                packageId: "test",
+                intermediatesDir: BuildPath(absolute: intermediates.path),
+                selfPackageDir: BuildPath(
+                    absolute: URL(fileURLWithPath: #filePath)
+                        .deletingLastPathComponent()
+                        .deletingLastPathComponent()
+                        .deletingLastPathComponent()
+                        .deletingLastPathComponent()
+                        .path
+                ),
+                skeletons: [
+                    .init(
+                        source: skeleton,
+                        targetDirectory: temporaryDirectory
+                    )
+                ],
+                outputDir: BuildPath(absolute: output.path),
+                wasmProductArtifact: BuildPath(absolute: wasm.path),
+                wasmFilename: "main.wasm",
+                configuration: "debug",
+                selfPath: BuildPath(absolute: plannerSource.path),
+                system: system
+            )
+            var make = MiniMake(printProgress: { _, _ in })
+            let root = try planner.planBuild(
+                make: &make,
+                buildOptions: PackageToJS.BuildOptions(
+                    product: "test",
+                    noOptimize: false,
+                    debugInfoFormat: .none,
+                    packageOptions: PackageToJS.PackageOptions()
+                )
+            )
+            try make.build(output: root, scope: MiniMake.VariableScope(variables: [:]))
+
+            #expect(!FileManager.default.fileExists(atPath: output.appending(path: "bridge-js-modules").path))
+            let generated = try String(
+                contentsOf: output.appending(path: "bridge-js.js"),
+                encoding: .utf8
+            )
+            #expect(generated.contains("from \"node:path\""))
+        }
+    }
+}
+
+@Suite struct WasmFeaturesTests {
+    private func memoryImport(shared: Bool) -> ImportEntry {
+        ImportEntry(
+            module: "env",
+            name: "memory",
+            kind: .memory(type: MemoryType(minimum: 17, maximum: 65536, shared: shared, index: .i32))
+        )
+    }
+
+    @Test func noImports() {
+        let features = WasmFeatures(imports: [])
+        #expect(features.isWASI == false)
+        #expect(features.sharedMemory == false)
+        #expect(features.importedMemory == nil)
+    }
+
+    @Test func wasiImport() {
+        let features = WasmFeatures(imports: [
+            ImportEntry(module: "wasi_snapshot_preview1", name: "proc_exit", kind: .function)
+        ])
+        #expect(features.isWASI == true)
+        #expect(features.sharedMemory == false)
+    }
+
+    @Test func unsharedMemoryImport() {
+        let features = WasmFeatures(imports: [memoryImport(shared: false)])
+        #expect(features.sharedMemory == false)
+        #expect(features.importedMemory?.minimum == 17)
+    }
+
+    @Test func sharedMemoryImport() {
+        let features = WasmFeatures(imports: [
+            memoryImport(shared: true),
+            ImportEntry(module: "wasi", name: "thread-spawn", kind: .function),
+        ])
+        #expect(features.sharedMemory == true)
+        #expect(features.isWASI == false)
+    }
+
+    /// Only the memory imported as "env.memory" is the one instantiated by the generated
+    /// JavaScript, so a memory imported under another name must not be picked up.
+    @Test func otherMemoryImport() {
+        let features = WasmFeatures(imports: [
+            ImportEntry(
+                module: "other",
+                name: "memory",
+                kind: .memory(type: MemoryType(minimum: 1, maximum: nil, shared: true, index: .i32))
+            )
+        ])
+        #expect(features.sharedMemory == false)
+        #expect(features.importedMemory == nil)
+    }
 }
diff --git a/Plugins/PackageToJS/Tests/ParseWasmTests.swift b/Plugins/PackageToJS/Tests/ParseWasmTests.swift
new file mode 100644
index 000000000..7da67b6d6
--- /dev/null
+++ b/Plugins/PackageToJS/Tests/ParseWasmTests.swift
@@ -0,0 +1,52 @@
+import Foundation
+import Testing
+
+@testable import PackageToJS
+
+@Suite struct ParseWasmTests {
+    /// A module importing `wasi_snapshot_preview1.proc_exit`, `env.memory` and `env.__stack_pointer`
+    private var moduleBytes: Data {
+        var bytes: [UInt8] = [
+            0x00, 0x61, 0x73, 0x6D,  // magic
+            0x01, 0x00, 0x00, 0x00,  // version
+        ]
+        // Type section: [(i32) -> ()]
+        let typeSection: [UInt8] = [0x01, 0x60, 0x01, 0x7F, 0x00]
+        bytes += [0x01, UInt8(typeSection.count)] + typeSection
+
+        var importSection: [UInt8] = [0x03]  // 3 imports
+        func name(_ value: String) -> [UInt8] {
+            [UInt8(value.utf8.count)] + Array(value.utf8)
+        }
+        importSection += name("wasi_snapshot_preview1") + name("proc_exit") + [0x00, 0x00]
+        importSection += name("env") + name("memory") + [0x02, 0x00, 0x11]
+        importSection += name("env") + name("__stack_pointer") + [0x03, 0x7F, 0x01]
+        bytes += [0x02, UInt8(importSection.count)] + importSection
+
+        return Data(bytes)
+    }
+
+    @Test func parseAllImportKinds() throws {
+        let imports = try parseImports(moduleBytes: moduleBytes)
+        #expect(imports.count == 3)
+        #expect(imports[0].module == "wasi_snapshot_preview1")
+        #expect(imports[0].name == "proc_exit")
+        if case .function = imports[0].kind {
+        } else {
+            Issue.record("expected a function import, got \(imports[0].kind)")
+        }
+        #expect(imports[2].name == "__stack_pointer")
+        if case .global = imports[2].kind {
+        } else {
+            Issue.record("expected a global import, got \(imports[2].kind)")
+        }
+    }
+
+    /// WASI is detected by the imported functions, so they must not be dropped while parsing.
+    @Test func deriveFeaturesFromParsedImports() throws {
+        let features = WasmFeatures(imports: try parseImports(moduleBytes: moduleBytes))
+        #expect(features.isWASI == true)
+        #expect(features.sharedMemory == false)
+        #expect(features.importedMemory?.minimum == 17)
+    }
+}
diff --git a/Plugins/PackageToJS/Tests/__Snapshots__/PackagingPlannerTests/planBuild_debug.json b/Plugins/PackageToJS/Tests/__Snapshots__/PackagingPlannerTests/planBuild_debug.json
index 49cee1f90..fefcda9b2 100644
--- a/Plugins/PackageToJS/Tests/__Snapshots__/PackagingPlannerTests/planBuild_debug.json
+++ b/Plugins/PackageToJS/Tests/__Snapshots__/PackagingPlannerTests/planBuild_debug.json
@@ -17,13 +17,11 @@
     ],
     "inputs" : [
       "$PLANNER_SOURCE_PATH",
-      "$OUTPUT\/main.wasm"
+      "$WASM_PRODUCT_ARTIFACT"
     ],
     "output" : "$INTERMEDIATES\/wasm-imports.json",
     "wants" : [
-      "$OUTPUT",
-      "$INTERMEDIATES",
-      "$OUTPUT\/main.wasm"
+      "$INTERMEDIATES"
     ]
   },
   {
@@ -48,11 +46,11 @@
       "$INTERMEDIATES\/wasm-imports.json"
     ],
     "output" : "$OUTPUT\/index.d.ts",
-    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=",
+    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19",
     "wants" : [
       "$OUTPUT",
-      "$OUTPUT\/platforms",
-      "$INTERMEDIATES\/wasm-imports.json"
+      "$INTERMEDIATES\/wasm-imports.json",
+      "$OUTPUT\/platforms"
     ]
   },
   {
@@ -65,11 +63,11 @@
       "$INTERMEDIATES\/wasm-imports.json"
     ],
     "output" : "$OUTPUT\/index.js",
-    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=",
+    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19",
     "wants" : [
       "$OUTPUT",
-      "$OUTPUT\/platforms",
-      "$INTERMEDIATES\/wasm-imports.json"
+      "$INTERMEDIATES\/wasm-imports.json",
+      "$OUTPUT\/platforms"
     ]
   },
   {
@@ -82,11 +80,11 @@
       "$INTERMEDIATES\/wasm-imports.json"
     ],
     "output" : "$OUTPUT\/instantiate.d.ts",
-    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=",
+    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19",
     "wants" : [
       "$OUTPUT",
-      "$OUTPUT\/platforms",
-      "$INTERMEDIATES\/wasm-imports.json"
+      "$INTERMEDIATES\/wasm-imports.json",
+      "$OUTPUT\/platforms"
     ]
   },
   {
@@ -99,11 +97,11 @@
       "$INTERMEDIATES\/wasm-imports.json"
     ],
     "output" : "$OUTPUT\/instantiate.js",
-    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=",
+    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19",
     "wants" : [
       "$OUTPUT",
-      "$OUTPUT\/platforms",
-      "$INTERMEDIATES\/wasm-imports.json"
+      "$INTERMEDIATES\/wasm-imports.json",
+      "$OUTPUT\/platforms"
     ]
   },
   {
@@ -125,12 +123,14 @@
     ],
     "inputs" : [
       "$PLANNER_SOURCE_PATH",
-      "$SELF_PACKAGE\/Plugins\/PackageToJS\/Templates\/package.json"
+      "$SELF_PACKAGE\/Plugins\/PackageToJS\/Templates\/package.json",
+      "$INTERMEDIATES\/wasm-imports.json"
     ],
     "output" : "$OUTPUT\/package.json",
-    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=",
+    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19",
     "wants" : [
-      "$OUTPUT"
+      "$OUTPUT",
+      "$INTERMEDIATES\/wasm-imports.json"
     ]
   },
   {
@@ -155,11 +155,11 @@
       "$INTERMEDIATES\/wasm-imports.json"
     ],
     "output" : "$OUTPUT\/platforms\/browser.d.ts",
-    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=",
+    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19",
     "wants" : [
       "$OUTPUT",
-      "$OUTPUT\/platforms",
-      "$INTERMEDIATES\/wasm-imports.json"
+      "$INTERMEDIATES\/wasm-imports.json",
+      "$OUTPUT\/platforms"
     ]
   },
   {
@@ -172,11 +172,11 @@
       "$INTERMEDIATES\/wasm-imports.json"
     ],
     "output" : "$OUTPUT\/platforms\/browser.js",
-    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=",
+    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19",
     "wants" : [
       "$OUTPUT",
-      "$OUTPUT\/platforms",
-      "$INTERMEDIATES\/wasm-imports.json"
+      "$INTERMEDIATES\/wasm-imports.json",
+      "$OUTPUT\/platforms"
     ]
   },
   {
@@ -189,11 +189,11 @@
       "$INTERMEDIATES\/wasm-imports.json"
     ],
     "output" : "$OUTPUT\/platforms\/browser.worker.js",
-    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=",
+    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19",
     "wants" : [
       "$OUTPUT",
-      "$OUTPUT\/platforms",
-      "$INTERMEDIATES\/wasm-imports.json"
+      "$INTERMEDIATES\/wasm-imports.json",
+      "$OUTPUT\/platforms"
     ]
   },
   {
@@ -206,11 +206,11 @@
       "$INTERMEDIATES\/wasm-imports.json"
     ],
     "output" : "$OUTPUT\/platforms\/node.d.ts",
-    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=",
+    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19",
     "wants" : [
       "$OUTPUT",
-      "$OUTPUT\/platforms",
-      "$INTERMEDIATES\/wasm-imports.json"
+      "$INTERMEDIATES\/wasm-imports.json",
+      "$OUTPUT\/platforms"
     ]
   },
   {
@@ -223,11 +223,11 @@
       "$INTERMEDIATES\/wasm-imports.json"
     ],
     "output" : "$OUTPUT\/platforms\/node.js",
-    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=",
+    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19",
     "wants" : [
       "$OUTPUT",
-      "$OUTPUT\/platforms",
-      "$INTERMEDIATES\/wasm-imports.json"
+      "$INTERMEDIATES\/wasm-imports.json",
+      "$OUTPUT\/platforms"
     ]
   },
   {
@@ -240,11 +240,11 @@
       "$INTERMEDIATES\/wasm-imports.json"
     ],
     "output" : "$OUTPUT\/runtime.d.ts",
-    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=",
+    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19",
     "wants" : [
       "$OUTPUT",
-      "$OUTPUT\/platforms",
-      "$INTERMEDIATES\/wasm-imports.json"
+      "$INTERMEDIATES\/wasm-imports.json",
+      "$OUTPUT\/platforms"
     ]
   },
   {
@@ -257,11 +257,11 @@
       "$INTERMEDIATES\/wasm-imports.json"
     ],
     "output" : "$OUTPUT\/runtime.js",
-    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=",
+    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19",
     "wants" : [
       "$OUTPUT",
-      "$OUTPUT\/platforms",
-      "$INTERMEDIATES\/wasm-imports.json"
+      "$INTERMEDIATES\/wasm-imports.json",
+      "$OUTPUT\/platforms"
     ]
   },
   {
diff --git a/Plugins/PackageToJS/Tests/__Snapshots__/PackagingPlannerTests/planBuild_release.json b/Plugins/PackageToJS/Tests/__Snapshots__/PackagingPlannerTests/planBuild_release.json
index 6b1e1090c..32fc2b670 100644
--- a/Plugins/PackageToJS/Tests/__Snapshots__/PackagingPlannerTests/planBuild_release.json
+++ b/Plugins/PackageToJS/Tests/__Snapshots__/PackagingPlannerTests/planBuild_release.json
@@ -31,13 +31,11 @@
     ],
     "inputs" : [
       "$PLANNER_SOURCE_PATH",
-      "$OUTPUT\/main.wasm"
+      "$WASM_PRODUCT_ARTIFACT"
     ],
     "output" : "$INTERMEDIATES\/wasm-imports.json",
     "wants" : [
-      "$OUTPUT",
-      "$INTERMEDIATES",
-      "$OUTPUT\/main.wasm"
+      "$INTERMEDIATES"
     ]
   },
   {
@@ -62,11 +60,11 @@
       "$INTERMEDIATES\/wasm-imports.json"
     ],
     "output" : "$OUTPUT\/index.d.ts",
-    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=",
+    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19",
     "wants" : [
       "$OUTPUT",
-      "$OUTPUT\/platforms",
-      "$INTERMEDIATES\/wasm-imports.json"
+      "$INTERMEDIATES\/wasm-imports.json",
+      "$OUTPUT\/platforms"
     ]
   },
   {
@@ -79,11 +77,11 @@
       "$INTERMEDIATES\/wasm-imports.json"
     ],
     "output" : "$OUTPUT\/index.js",
-    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=",
+    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19",
     "wants" : [
       "$OUTPUT",
-      "$OUTPUT\/platforms",
-      "$INTERMEDIATES\/wasm-imports.json"
+      "$INTERMEDIATES\/wasm-imports.json",
+      "$OUTPUT\/platforms"
     ]
   },
   {
@@ -96,11 +94,11 @@
       "$INTERMEDIATES\/wasm-imports.json"
     ],
     "output" : "$OUTPUT\/instantiate.d.ts",
-    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=",
+    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19",
     "wants" : [
       "$OUTPUT",
-      "$OUTPUT\/platforms",
-      "$INTERMEDIATES\/wasm-imports.json"
+      "$INTERMEDIATES\/wasm-imports.json",
+      "$OUTPUT\/platforms"
     ]
   },
   {
@@ -113,11 +111,11 @@
       "$INTERMEDIATES\/wasm-imports.json"
     ],
     "output" : "$OUTPUT\/instantiate.js",
-    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=",
+    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19",
     "wants" : [
       "$OUTPUT",
-      "$OUTPUT\/platforms",
-      "$INTERMEDIATES\/wasm-imports.json"
+      "$INTERMEDIATES\/wasm-imports.json",
+      "$OUTPUT\/platforms"
     ]
   },
   {
@@ -140,12 +138,14 @@
     ],
     "inputs" : [
       "$PLANNER_SOURCE_PATH",
-      "$SELF_PACKAGE\/Plugins\/PackageToJS\/Templates\/package.json"
+      "$SELF_PACKAGE\/Plugins\/PackageToJS\/Templates\/package.json",
+      "$INTERMEDIATES\/wasm-imports.json"
     ],
     "output" : "$OUTPUT\/package.json",
-    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=",
+    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19",
     "wants" : [
-      "$OUTPUT"
+      "$OUTPUT",
+      "$INTERMEDIATES\/wasm-imports.json"
     ]
   },
   {
@@ -170,11 +170,11 @@
       "$INTERMEDIATES\/wasm-imports.json"
     ],
     "output" : "$OUTPUT\/platforms\/browser.d.ts",
-    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=",
+    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19",
     "wants" : [
       "$OUTPUT",
-      "$OUTPUT\/platforms",
-      "$INTERMEDIATES\/wasm-imports.json"
+      "$INTERMEDIATES\/wasm-imports.json",
+      "$OUTPUT\/platforms"
     ]
   },
   {
@@ -187,11 +187,11 @@
       "$INTERMEDIATES\/wasm-imports.json"
     ],
     "output" : "$OUTPUT\/platforms\/browser.js",
-    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=",
+    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19",
     "wants" : [
       "$OUTPUT",
-      "$OUTPUT\/platforms",
-      "$INTERMEDIATES\/wasm-imports.json"
+      "$INTERMEDIATES\/wasm-imports.json",
+      "$OUTPUT\/platforms"
     ]
   },
   {
@@ -204,11 +204,11 @@
       "$INTERMEDIATES\/wasm-imports.json"
     ],
     "output" : "$OUTPUT\/platforms\/browser.worker.js",
-    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=",
+    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19",
     "wants" : [
       "$OUTPUT",
-      "$OUTPUT\/platforms",
-      "$INTERMEDIATES\/wasm-imports.json"
+      "$INTERMEDIATES\/wasm-imports.json",
+      "$OUTPUT\/platforms"
     ]
   },
   {
@@ -221,11 +221,11 @@
       "$INTERMEDIATES\/wasm-imports.json"
     ],
     "output" : "$OUTPUT\/platforms\/node.d.ts",
-    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=",
+    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19",
     "wants" : [
       "$OUTPUT",
-      "$OUTPUT\/platforms",
-      "$INTERMEDIATES\/wasm-imports.json"
+      "$INTERMEDIATES\/wasm-imports.json",
+      "$OUTPUT\/platforms"
     ]
   },
   {
@@ -238,11 +238,11 @@
       "$INTERMEDIATES\/wasm-imports.json"
     ],
     "output" : "$OUTPUT\/platforms\/node.js",
-    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=",
+    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19",
     "wants" : [
       "$OUTPUT",
-      "$OUTPUT\/platforms",
-      "$INTERMEDIATES\/wasm-imports.json"
+      "$INTERMEDIATES\/wasm-imports.json",
+      "$OUTPUT\/platforms"
     ]
   },
   {
@@ -255,11 +255,11 @@
       "$INTERMEDIATES\/wasm-imports.json"
     ],
     "output" : "$OUTPUT\/runtime.d.ts",
-    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=",
+    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19",
     "wants" : [
       "$OUTPUT",
-      "$OUTPUT\/platforms",
-      "$INTERMEDIATES\/wasm-imports.json"
+      "$INTERMEDIATES\/wasm-imports.json",
+      "$OUTPUT\/platforms"
     ]
   },
   {
@@ -272,11 +272,11 @@
       "$INTERMEDIATES\/wasm-imports.json"
     ],
     "output" : "$OUTPUT\/runtime.js",
-    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=",
+    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19",
     "wants" : [
       "$OUTPUT",
-      "$OUTPUT\/platforms",
-      "$INTERMEDIATES\/wasm-imports.json"
+      "$INTERMEDIATES\/wasm-imports.json",
+      "$OUTPUT\/platforms"
     ]
   },
   {
diff --git a/Plugins/PackageToJS/Tests/__Snapshots__/PackagingPlannerTests/planBuild_release_dwarf.json b/Plugins/PackageToJS/Tests/__Snapshots__/PackagingPlannerTests/planBuild_release_dwarf.json
index 49cee1f90..fefcda9b2 100644
--- a/Plugins/PackageToJS/Tests/__Snapshots__/PackagingPlannerTests/planBuild_release_dwarf.json
+++ b/Plugins/PackageToJS/Tests/__Snapshots__/PackagingPlannerTests/planBuild_release_dwarf.json
@@ -17,13 +17,11 @@
     ],
     "inputs" : [
       "$PLANNER_SOURCE_PATH",
-      "$OUTPUT\/main.wasm"
+      "$WASM_PRODUCT_ARTIFACT"
     ],
     "output" : "$INTERMEDIATES\/wasm-imports.json",
     "wants" : [
-      "$OUTPUT",
-      "$INTERMEDIATES",
-      "$OUTPUT\/main.wasm"
+      "$INTERMEDIATES"
     ]
   },
   {
@@ -48,11 +46,11 @@
       "$INTERMEDIATES\/wasm-imports.json"
     ],
     "output" : "$OUTPUT\/index.d.ts",
-    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=",
+    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19",
     "wants" : [
       "$OUTPUT",
-      "$OUTPUT\/platforms",
-      "$INTERMEDIATES\/wasm-imports.json"
+      "$INTERMEDIATES\/wasm-imports.json",
+      "$OUTPUT\/platforms"
     ]
   },
   {
@@ -65,11 +63,11 @@
       "$INTERMEDIATES\/wasm-imports.json"
     ],
     "output" : "$OUTPUT\/index.js",
-    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=",
+    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19",
     "wants" : [
       "$OUTPUT",
-      "$OUTPUT\/platforms",
-      "$INTERMEDIATES\/wasm-imports.json"
+      "$INTERMEDIATES\/wasm-imports.json",
+      "$OUTPUT\/platforms"
     ]
   },
   {
@@ -82,11 +80,11 @@
       "$INTERMEDIATES\/wasm-imports.json"
     ],
     "output" : "$OUTPUT\/instantiate.d.ts",
-    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=",
+    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19",
     "wants" : [
       "$OUTPUT",
-      "$OUTPUT\/platforms",
-      "$INTERMEDIATES\/wasm-imports.json"
+      "$INTERMEDIATES\/wasm-imports.json",
+      "$OUTPUT\/platforms"
     ]
   },
   {
@@ -99,11 +97,11 @@
       "$INTERMEDIATES\/wasm-imports.json"
     ],
     "output" : "$OUTPUT\/instantiate.js",
-    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=",
+    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19",
     "wants" : [
       "$OUTPUT",
-      "$OUTPUT\/platforms",
-      "$INTERMEDIATES\/wasm-imports.json"
+      "$INTERMEDIATES\/wasm-imports.json",
+      "$OUTPUT\/platforms"
     ]
   },
   {
@@ -125,12 +123,14 @@
     ],
     "inputs" : [
       "$PLANNER_SOURCE_PATH",
-      "$SELF_PACKAGE\/Plugins\/PackageToJS\/Templates\/package.json"
+      "$SELF_PACKAGE\/Plugins\/PackageToJS\/Templates\/package.json",
+      "$INTERMEDIATES\/wasm-imports.json"
     ],
     "output" : "$OUTPUT\/package.json",
-    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=",
+    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19",
     "wants" : [
-      "$OUTPUT"
+      "$OUTPUT",
+      "$INTERMEDIATES\/wasm-imports.json"
     ]
   },
   {
@@ -155,11 +155,11 @@
       "$INTERMEDIATES\/wasm-imports.json"
     ],
     "output" : "$OUTPUT\/platforms\/browser.d.ts",
-    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=",
+    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19",
     "wants" : [
       "$OUTPUT",
-      "$OUTPUT\/platforms",
-      "$INTERMEDIATES\/wasm-imports.json"
+      "$INTERMEDIATES\/wasm-imports.json",
+      "$OUTPUT\/platforms"
     ]
   },
   {
@@ -172,11 +172,11 @@
       "$INTERMEDIATES\/wasm-imports.json"
     ],
     "output" : "$OUTPUT\/platforms\/browser.js",
-    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=",
+    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19",
     "wants" : [
       "$OUTPUT",
-      "$OUTPUT\/platforms",
-      "$INTERMEDIATES\/wasm-imports.json"
+      "$INTERMEDIATES\/wasm-imports.json",
+      "$OUTPUT\/platforms"
     ]
   },
   {
@@ -189,11 +189,11 @@
       "$INTERMEDIATES\/wasm-imports.json"
     ],
     "output" : "$OUTPUT\/platforms\/browser.worker.js",
-    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=",
+    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19",
     "wants" : [
       "$OUTPUT",
-      "$OUTPUT\/platforms",
-      "$INTERMEDIATES\/wasm-imports.json"
+      "$INTERMEDIATES\/wasm-imports.json",
+      "$OUTPUT\/platforms"
     ]
   },
   {
@@ -206,11 +206,11 @@
       "$INTERMEDIATES\/wasm-imports.json"
     ],
     "output" : "$OUTPUT\/platforms\/node.d.ts",
-    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=",
+    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19",
     "wants" : [
       "$OUTPUT",
-      "$OUTPUT\/platforms",
-      "$INTERMEDIATES\/wasm-imports.json"
+      "$INTERMEDIATES\/wasm-imports.json",
+      "$OUTPUT\/platforms"
     ]
   },
   {
@@ -223,11 +223,11 @@
       "$INTERMEDIATES\/wasm-imports.json"
     ],
     "output" : "$OUTPUT\/platforms\/node.js",
-    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=",
+    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19",
     "wants" : [
       "$OUTPUT",
-      "$OUTPUT\/platforms",
-      "$INTERMEDIATES\/wasm-imports.json"
+      "$INTERMEDIATES\/wasm-imports.json",
+      "$OUTPUT\/platforms"
     ]
   },
   {
@@ -240,11 +240,11 @@
       "$INTERMEDIATES\/wasm-imports.json"
     ],
     "output" : "$OUTPUT\/runtime.d.ts",
-    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=",
+    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19",
     "wants" : [
       "$OUTPUT",
-      "$OUTPUT\/platforms",
-      "$INTERMEDIATES\/wasm-imports.json"
+      "$INTERMEDIATES\/wasm-imports.json",
+      "$OUTPUT\/platforms"
     ]
   },
   {
@@ -257,11 +257,11 @@
       "$INTERMEDIATES\/wasm-imports.json"
     ],
     "output" : "$OUTPUT\/runtime.js",
-    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=",
+    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19",
     "wants" : [
       "$OUTPUT",
-      "$OUTPUT\/platforms",
-      "$INTERMEDIATES\/wasm-imports.json"
+      "$INTERMEDIATES\/wasm-imports.json",
+      "$OUTPUT\/platforms"
     ]
   },
   {
diff --git a/Plugins/PackageToJS/Tests/__Snapshots__/PackagingPlannerTests/planBuild_release_name.json b/Plugins/PackageToJS/Tests/__Snapshots__/PackagingPlannerTests/planBuild_release_name.json
index 6b1e1090c..32fc2b670 100644
--- a/Plugins/PackageToJS/Tests/__Snapshots__/PackagingPlannerTests/planBuild_release_name.json
+++ b/Plugins/PackageToJS/Tests/__Snapshots__/PackagingPlannerTests/planBuild_release_name.json
@@ -31,13 +31,11 @@
     ],
     "inputs" : [
       "$PLANNER_SOURCE_PATH",
-      "$OUTPUT\/main.wasm"
+      "$WASM_PRODUCT_ARTIFACT"
     ],
     "output" : "$INTERMEDIATES\/wasm-imports.json",
     "wants" : [
-      "$OUTPUT",
-      "$INTERMEDIATES",
-      "$OUTPUT\/main.wasm"
+      "$INTERMEDIATES"
     ]
   },
   {
@@ -62,11 +60,11 @@
       "$INTERMEDIATES\/wasm-imports.json"
     ],
     "output" : "$OUTPUT\/index.d.ts",
-    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=",
+    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19",
     "wants" : [
       "$OUTPUT",
-      "$OUTPUT\/platforms",
-      "$INTERMEDIATES\/wasm-imports.json"
+      "$INTERMEDIATES\/wasm-imports.json",
+      "$OUTPUT\/platforms"
     ]
   },
   {
@@ -79,11 +77,11 @@
       "$INTERMEDIATES\/wasm-imports.json"
     ],
     "output" : "$OUTPUT\/index.js",
-    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=",
+    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19",
     "wants" : [
       "$OUTPUT",
-      "$OUTPUT\/platforms",
-      "$INTERMEDIATES\/wasm-imports.json"
+      "$INTERMEDIATES\/wasm-imports.json",
+      "$OUTPUT\/platforms"
     ]
   },
   {
@@ -96,11 +94,11 @@
       "$INTERMEDIATES\/wasm-imports.json"
     ],
     "output" : "$OUTPUT\/instantiate.d.ts",
-    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=",
+    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19",
     "wants" : [
       "$OUTPUT",
-      "$OUTPUT\/platforms",
-      "$INTERMEDIATES\/wasm-imports.json"
+      "$INTERMEDIATES\/wasm-imports.json",
+      "$OUTPUT\/platforms"
     ]
   },
   {
@@ -113,11 +111,11 @@
       "$INTERMEDIATES\/wasm-imports.json"
     ],
     "output" : "$OUTPUT\/instantiate.js",
-    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=",
+    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19",
     "wants" : [
       "$OUTPUT",
-      "$OUTPUT\/platforms",
-      "$INTERMEDIATES\/wasm-imports.json"
+      "$INTERMEDIATES\/wasm-imports.json",
+      "$OUTPUT\/platforms"
     ]
   },
   {
@@ -140,12 +138,14 @@
     ],
     "inputs" : [
       "$PLANNER_SOURCE_PATH",
-      "$SELF_PACKAGE\/Plugins\/PackageToJS\/Templates\/package.json"
+      "$SELF_PACKAGE\/Plugins\/PackageToJS\/Templates\/package.json",
+      "$INTERMEDIATES\/wasm-imports.json"
     ],
     "output" : "$OUTPUT\/package.json",
-    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=",
+    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19",
     "wants" : [
-      "$OUTPUT"
+      "$OUTPUT",
+      "$INTERMEDIATES\/wasm-imports.json"
     ]
   },
   {
@@ -170,11 +170,11 @@
       "$INTERMEDIATES\/wasm-imports.json"
     ],
     "output" : "$OUTPUT\/platforms\/browser.d.ts",
-    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=",
+    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19",
     "wants" : [
       "$OUTPUT",
-      "$OUTPUT\/platforms",
-      "$INTERMEDIATES\/wasm-imports.json"
+      "$INTERMEDIATES\/wasm-imports.json",
+      "$OUTPUT\/platforms"
     ]
   },
   {
@@ -187,11 +187,11 @@
       "$INTERMEDIATES\/wasm-imports.json"
     ],
     "output" : "$OUTPUT\/platforms\/browser.js",
-    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=",
+    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19",
     "wants" : [
       "$OUTPUT",
-      "$OUTPUT\/platforms",
-      "$INTERMEDIATES\/wasm-imports.json"
+      "$INTERMEDIATES\/wasm-imports.json",
+      "$OUTPUT\/platforms"
     ]
   },
   {
@@ -204,11 +204,11 @@
       "$INTERMEDIATES\/wasm-imports.json"
     ],
     "output" : "$OUTPUT\/platforms\/browser.worker.js",
-    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=",
+    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19",
     "wants" : [
       "$OUTPUT",
-      "$OUTPUT\/platforms",
-      "$INTERMEDIATES\/wasm-imports.json"
+      "$INTERMEDIATES\/wasm-imports.json",
+      "$OUTPUT\/platforms"
     ]
   },
   {
@@ -221,11 +221,11 @@
       "$INTERMEDIATES\/wasm-imports.json"
     ],
     "output" : "$OUTPUT\/platforms\/node.d.ts",
-    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=",
+    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19",
     "wants" : [
       "$OUTPUT",
-      "$OUTPUT\/platforms",
-      "$INTERMEDIATES\/wasm-imports.json"
+      "$INTERMEDIATES\/wasm-imports.json",
+      "$OUTPUT\/platforms"
     ]
   },
   {
@@ -238,11 +238,11 @@
       "$INTERMEDIATES\/wasm-imports.json"
     ],
     "output" : "$OUTPUT\/platforms\/node.js",
-    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=",
+    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19",
     "wants" : [
       "$OUTPUT",
-      "$OUTPUT\/platforms",
-      "$INTERMEDIATES\/wasm-imports.json"
+      "$INTERMEDIATES\/wasm-imports.json",
+      "$OUTPUT\/platforms"
     ]
   },
   {
@@ -255,11 +255,11 @@
       "$INTERMEDIATES\/wasm-imports.json"
     ],
     "output" : "$OUTPUT\/runtime.d.ts",
-    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=",
+    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19",
     "wants" : [
       "$OUTPUT",
-      "$OUTPUT\/platforms",
-      "$INTERMEDIATES\/wasm-imports.json"
+      "$INTERMEDIATES\/wasm-imports.json",
+      "$OUTPUT\/platforms"
     ]
   },
   {
@@ -272,11 +272,11 @@
       "$INTERMEDIATES\/wasm-imports.json"
     ],
     "output" : "$OUTPUT\/runtime.js",
-    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=",
+    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19",
     "wants" : [
       "$OUTPUT",
-      "$OUTPUT\/platforms",
-      "$INTERMEDIATES\/wasm-imports.json"
+      "$INTERMEDIATES\/wasm-imports.json",
+      "$OUTPUT\/platforms"
     ]
   },
   {
diff --git a/Plugins/PackageToJS/Tests/__Snapshots__/PackagingPlannerTests/planBuild_release_no_optimize.json b/Plugins/PackageToJS/Tests/__Snapshots__/PackagingPlannerTests/planBuild_release_no_optimize.json
index 49cee1f90..fefcda9b2 100644
--- a/Plugins/PackageToJS/Tests/__Snapshots__/PackagingPlannerTests/planBuild_release_no_optimize.json
+++ b/Plugins/PackageToJS/Tests/__Snapshots__/PackagingPlannerTests/planBuild_release_no_optimize.json
@@ -17,13 +17,11 @@
     ],
     "inputs" : [
       "$PLANNER_SOURCE_PATH",
-      "$OUTPUT\/main.wasm"
+      "$WASM_PRODUCT_ARTIFACT"
     ],
     "output" : "$INTERMEDIATES\/wasm-imports.json",
     "wants" : [
-      "$OUTPUT",
-      "$INTERMEDIATES",
-      "$OUTPUT\/main.wasm"
+      "$INTERMEDIATES"
     ]
   },
   {
@@ -48,11 +46,11 @@
       "$INTERMEDIATES\/wasm-imports.json"
     ],
     "output" : "$OUTPUT\/index.d.ts",
-    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=",
+    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19",
     "wants" : [
       "$OUTPUT",
-      "$OUTPUT\/platforms",
-      "$INTERMEDIATES\/wasm-imports.json"
+      "$INTERMEDIATES\/wasm-imports.json",
+      "$OUTPUT\/platforms"
     ]
   },
   {
@@ -65,11 +63,11 @@
       "$INTERMEDIATES\/wasm-imports.json"
     ],
     "output" : "$OUTPUT\/index.js",
-    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=",
+    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19",
     "wants" : [
       "$OUTPUT",
-      "$OUTPUT\/platforms",
-      "$INTERMEDIATES\/wasm-imports.json"
+      "$INTERMEDIATES\/wasm-imports.json",
+      "$OUTPUT\/platforms"
     ]
   },
   {
@@ -82,11 +80,11 @@
       "$INTERMEDIATES\/wasm-imports.json"
     ],
     "output" : "$OUTPUT\/instantiate.d.ts",
-    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=",
+    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19",
     "wants" : [
       "$OUTPUT",
-      "$OUTPUT\/platforms",
-      "$INTERMEDIATES\/wasm-imports.json"
+      "$INTERMEDIATES\/wasm-imports.json",
+      "$OUTPUT\/platforms"
     ]
   },
   {
@@ -99,11 +97,11 @@
       "$INTERMEDIATES\/wasm-imports.json"
     ],
     "output" : "$OUTPUT\/instantiate.js",
-    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=",
+    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19",
     "wants" : [
       "$OUTPUT",
-      "$OUTPUT\/platforms",
-      "$INTERMEDIATES\/wasm-imports.json"
+      "$INTERMEDIATES\/wasm-imports.json",
+      "$OUTPUT\/platforms"
     ]
   },
   {
@@ -125,12 +123,14 @@
     ],
     "inputs" : [
       "$PLANNER_SOURCE_PATH",
-      "$SELF_PACKAGE\/Plugins\/PackageToJS\/Templates\/package.json"
+      "$SELF_PACKAGE\/Plugins\/PackageToJS\/Templates\/package.json",
+      "$INTERMEDIATES\/wasm-imports.json"
     ],
     "output" : "$OUTPUT\/package.json",
-    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=",
+    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19",
     "wants" : [
-      "$OUTPUT"
+      "$OUTPUT",
+      "$INTERMEDIATES\/wasm-imports.json"
     ]
   },
   {
@@ -155,11 +155,11 @@
       "$INTERMEDIATES\/wasm-imports.json"
     ],
     "output" : "$OUTPUT\/platforms\/browser.d.ts",
-    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=",
+    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19",
     "wants" : [
       "$OUTPUT",
-      "$OUTPUT\/platforms",
-      "$INTERMEDIATES\/wasm-imports.json"
+      "$INTERMEDIATES\/wasm-imports.json",
+      "$OUTPUT\/platforms"
     ]
   },
   {
@@ -172,11 +172,11 @@
       "$INTERMEDIATES\/wasm-imports.json"
     ],
     "output" : "$OUTPUT\/platforms\/browser.js",
-    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=",
+    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19",
     "wants" : [
       "$OUTPUT",
-      "$OUTPUT\/platforms",
-      "$INTERMEDIATES\/wasm-imports.json"
+      "$INTERMEDIATES\/wasm-imports.json",
+      "$OUTPUT\/platforms"
     ]
   },
   {
@@ -189,11 +189,11 @@
       "$INTERMEDIATES\/wasm-imports.json"
     ],
     "output" : "$OUTPUT\/platforms\/browser.worker.js",
-    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=",
+    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19",
     "wants" : [
       "$OUTPUT",
-      "$OUTPUT\/platforms",
-      "$INTERMEDIATES\/wasm-imports.json"
+      "$INTERMEDIATES\/wasm-imports.json",
+      "$OUTPUT\/platforms"
     ]
   },
   {
@@ -206,11 +206,11 @@
       "$INTERMEDIATES\/wasm-imports.json"
     ],
     "output" : "$OUTPUT\/platforms\/node.d.ts",
-    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=",
+    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19",
     "wants" : [
       "$OUTPUT",
-      "$OUTPUT\/platforms",
-      "$INTERMEDIATES\/wasm-imports.json"
+      "$INTERMEDIATES\/wasm-imports.json",
+      "$OUTPUT\/platforms"
     ]
   },
   {
@@ -223,11 +223,11 @@
       "$INTERMEDIATES\/wasm-imports.json"
     ],
     "output" : "$OUTPUT\/platforms\/node.js",
-    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=",
+    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19",
     "wants" : [
       "$OUTPUT",
-      "$OUTPUT\/platforms",
-      "$INTERMEDIATES\/wasm-imports.json"
+      "$INTERMEDIATES\/wasm-imports.json",
+      "$OUTPUT\/platforms"
     ]
   },
   {
@@ -240,11 +240,11 @@
       "$INTERMEDIATES\/wasm-imports.json"
     ],
     "output" : "$OUTPUT\/runtime.d.ts",
-    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=",
+    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19",
     "wants" : [
       "$OUTPUT",
-      "$OUTPUT\/platforms",
-      "$INTERMEDIATES\/wasm-imports.json"
+      "$INTERMEDIATES\/wasm-imports.json",
+      "$OUTPUT\/platforms"
     ]
   },
   {
@@ -257,11 +257,11 @@
       "$INTERMEDIATES\/wasm-imports.json"
     ],
     "output" : "$OUTPUT\/runtime.js",
-    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=",
+    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19",
     "wants" : [
       "$OUTPUT",
-      "$OUTPUT\/platforms",
-      "$INTERMEDIATES\/wasm-imports.json"
+      "$INTERMEDIATES\/wasm-imports.json",
+      "$OUTPUT\/platforms"
     ]
   },
   {
diff --git a/Plugins/PackageToJS/Tests/__Snapshots__/PackagingPlannerTests/planTestBuild.json b/Plugins/PackageToJS/Tests/__Snapshots__/PackagingPlannerTests/planTestBuild.json
index 5f16f6e8e..b6b382ae3 100644
--- a/Plugins/PackageToJS/Tests/__Snapshots__/PackagingPlannerTests/planTestBuild.json
+++ b/Plugins/PackageToJS/Tests/__Snapshots__/PackagingPlannerTests/planTestBuild.json
@@ -31,13 +31,11 @@
     ],
     "inputs" : [
       "$PLANNER_SOURCE_PATH",
-      "$OUTPUT\/main.wasm"
+      "$WASM_PRODUCT_ARTIFACT"
     ],
     "output" : "$INTERMEDIATES\/wasm-imports.json",
     "wants" : [
-      "$OUTPUT",
-      "$INTERMEDIATES",
-      "$OUTPUT\/main.wasm"
+      "$INTERMEDIATES"
     ]
   },
   {
@@ -70,12 +68,14 @@
     ],
     "inputs" : [
       "$PLANNER_SOURCE_PATH",
-      "$SELF_PACKAGE\/Plugins\/PackageToJS\/Templates\/bin\/test.js"
+      "$SELF_PACKAGE\/Plugins\/PackageToJS\/Templates\/bin\/test.js",
+      "$INTERMEDIATES\/wasm-imports.json"
     ],
     "output" : "$OUTPUT\/bin\/test.js",
-    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=",
+    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19",
     "wants" : [
       "$OUTPUT",
+      "$INTERMEDIATES\/wasm-imports.json",
       "$OUTPUT\/bin"
     ]
   },
@@ -89,11 +89,11 @@
       "$INTERMEDIATES\/wasm-imports.json"
     ],
     "output" : "$OUTPUT\/index.d.ts",
-    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=",
+    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19",
     "wants" : [
       "$OUTPUT",
-      "$OUTPUT\/platforms",
-      "$INTERMEDIATES\/wasm-imports.json"
+      "$INTERMEDIATES\/wasm-imports.json",
+      "$OUTPUT\/platforms"
     ]
   },
   {
@@ -106,11 +106,11 @@
       "$INTERMEDIATES\/wasm-imports.json"
     ],
     "output" : "$OUTPUT\/index.js",
-    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=",
+    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19",
     "wants" : [
       "$OUTPUT",
-      "$OUTPUT\/platforms",
-      "$INTERMEDIATES\/wasm-imports.json"
+      "$INTERMEDIATES\/wasm-imports.json",
+      "$OUTPUT\/platforms"
     ]
   },
   {
@@ -123,11 +123,11 @@
       "$INTERMEDIATES\/wasm-imports.json"
     ],
     "output" : "$OUTPUT\/instantiate.d.ts",
-    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=",
+    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19",
     "wants" : [
       "$OUTPUT",
-      "$OUTPUT\/platforms",
-      "$INTERMEDIATES\/wasm-imports.json"
+      "$INTERMEDIATES\/wasm-imports.json",
+      "$OUTPUT\/platforms"
     ]
   },
   {
@@ -140,11 +140,11 @@
       "$INTERMEDIATES\/wasm-imports.json"
     ],
     "output" : "$OUTPUT\/instantiate.js",
-    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=",
+    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19",
     "wants" : [
       "$OUTPUT",
-      "$OUTPUT\/platforms",
-      "$INTERMEDIATES\/wasm-imports.json"
+      "$INTERMEDIATES\/wasm-imports.json",
+      "$OUTPUT\/platforms"
     ]
   },
   {
@@ -166,12 +166,14 @@
     ],
     "inputs" : [
       "$PLANNER_SOURCE_PATH",
-      "$SELF_PACKAGE\/Plugins\/PackageToJS\/Templates\/package.json"
+      "$SELF_PACKAGE\/Plugins\/PackageToJS\/Templates\/package.json",
+      "$INTERMEDIATES\/wasm-imports.json"
     ],
     "output" : "$OUTPUT\/package.json",
-    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=",
+    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19",
     "wants" : [
-      "$OUTPUT"
+      "$OUTPUT",
+      "$INTERMEDIATES\/wasm-imports.json"
     ]
   },
   {
@@ -196,11 +198,11 @@
       "$INTERMEDIATES\/wasm-imports.json"
     ],
     "output" : "$OUTPUT\/platforms\/browser.d.ts",
-    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=",
+    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19",
     "wants" : [
       "$OUTPUT",
-      "$OUTPUT\/platforms",
-      "$INTERMEDIATES\/wasm-imports.json"
+      "$INTERMEDIATES\/wasm-imports.json",
+      "$OUTPUT\/platforms"
     ]
   },
   {
@@ -213,11 +215,11 @@
       "$INTERMEDIATES\/wasm-imports.json"
     ],
     "output" : "$OUTPUT\/platforms\/browser.js",
-    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=",
+    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19",
     "wants" : [
       "$OUTPUT",
-      "$OUTPUT\/platforms",
-      "$INTERMEDIATES\/wasm-imports.json"
+      "$INTERMEDIATES\/wasm-imports.json",
+      "$OUTPUT\/platforms"
     ]
   },
   {
@@ -230,11 +232,11 @@
       "$INTERMEDIATES\/wasm-imports.json"
     ],
     "output" : "$OUTPUT\/platforms\/browser.worker.js",
-    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=",
+    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19",
     "wants" : [
       "$OUTPUT",
-      "$OUTPUT\/platforms",
-      "$INTERMEDIATES\/wasm-imports.json"
+      "$INTERMEDIATES\/wasm-imports.json",
+      "$OUTPUT\/platforms"
     ]
   },
   {
@@ -247,11 +249,11 @@
       "$INTERMEDIATES\/wasm-imports.json"
     ],
     "output" : "$OUTPUT\/platforms\/node.d.ts",
-    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=",
+    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19",
     "wants" : [
       "$OUTPUT",
-      "$OUTPUT\/platforms",
-      "$INTERMEDIATES\/wasm-imports.json"
+      "$INTERMEDIATES\/wasm-imports.json",
+      "$OUTPUT\/platforms"
     ]
   },
   {
@@ -264,11 +266,11 @@
       "$INTERMEDIATES\/wasm-imports.json"
     ],
     "output" : "$OUTPUT\/platforms\/node.js",
-    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=",
+    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19",
     "wants" : [
       "$OUTPUT",
-      "$OUTPUT\/platforms",
-      "$INTERMEDIATES\/wasm-imports.json"
+      "$INTERMEDIATES\/wasm-imports.json",
+      "$OUTPUT\/platforms"
     ]
   },
   {
@@ -281,11 +283,11 @@
       "$INTERMEDIATES\/wasm-imports.json"
     ],
     "output" : "$OUTPUT\/runtime.d.ts",
-    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=",
+    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19",
     "wants" : [
       "$OUTPUT",
-      "$OUTPUT\/platforms",
-      "$INTERMEDIATES\/wasm-imports.json"
+      "$INTERMEDIATES\/wasm-imports.json",
+      "$OUTPUT\/platforms"
     ]
   },
   {
@@ -298,11 +300,11 @@
       "$INTERMEDIATES\/wasm-imports.json"
     ],
     "output" : "$OUTPUT\/runtime.js",
-    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=",
+    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19",
     "wants" : [
       "$OUTPUT",
-      "$OUTPUT\/platforms",
-      "$INTERMEDIATES\/wasm-imports.json"
+      "$INTERMEDIATES\/wasm-imports.json",
+      "$OUTPUT\/platforms"
     ]
   },
   {
@@ -311,12 +313,14 @@
     ],
     "inputs" : [
       "$PLANNER_SOURCE_PATH",
-      "$SELF_PACKAGE\/Plugins\/PackageToJS\/Templates\/test.browser.html"
+      "$SELF_PACKAGE\/Plugins\/PackageToJS\/Templates\/test.browser.html",
+      "$INTERMEDIATES\/wasm-imports.json"
     ],
     "output" : "$OUTPUT\/test.browser.html",
-    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=",
+    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19",
     "wants" : [
       "$OUTPUT",
+      "$INTERMEDIATES\/wasm-imports.json",
       "$OUTPUT\/bin"
     ]
   },
@@ -326,12 +330,14 @@
     ],
     "inputs" : [
       "$PLANNER_SOURCE_PATH",
-      "$SELF_PACKAGE\/Plugins\/PackageToJS\/Templates\/test.d.ts"
+      "$SELF_PACKAGE\/Plugins\/PackageToJS\/Templates\/test.d.ts",
+      "$INTERMEDIATES\/wasm-imports.json"
     ],
     "output" : "$OUTPUT\/test.d.ts",
-    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=",
+    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19",
     "wants" : [
       "$OUTPUT",
+      "$INTERMEDIATES\/wasm-imports.json",
       "$OUTPUT\/bin"
     ]
   },
@@ -341,12 +347,14 @@
     ],
     "inputs" : [
       "$PLANNER_SOURCE_PATH",
-      "$SELF_PACKAGE\/Plugins\/PackageToJS\/Templates\/test.js"
+      "$SELF_PACKAGE\/Plugins\/PackageToJS\/Templates\/test.js",
+      "$INTERMEDIATES\/wasm-imports.json"
     ],
     "output" : "$OUTPUT\/test.js",
-    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=",
+    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19",
     "wants" : [
       "$OUTPUT",
+      "$INTERMEDIATES\/wasm-imports.json",
       "$OUTPUT\/bin"
     ]
   },
diff --git a/README.md b/README.md
index 03129c3e2..88c1332a2 100644
--- a/README.md
+++ b/README.md
@@ -120,6 +120,10 @@ Use the [BridgeJS Playground](https://swiftwasm.org/JavaScriptKit/PlayBridgeJS/)
 
 Check out the [examples](https://github.com/swiftwasm/JavaScriptKit/tree/main/Examples) for more detailed usage patterns.
 
+## Minimum Supported Swift Version (MSSV)
+
+The minimum supported Swift version is 6.3.
+
 ## Contributing
 
 Contributions are welcome! See [CONTRIBUTING.md](CONTRIBUTING.md) for details on how to contribute to the project.
diff --git a/Runtime/src/index.ts b/Runtime/src/index.ts
index 7d75a6801..879774a7d 100644
--- a/Runtime/src/index.ts
+++ b/Runtime/src/index.ts
@@ -450,31 +450,39 @@ export class SwiftRuntime {
                 const memory = this.memory;
                 const bytes = this.textEncoder.encode(memory.getObject(ref));
                 const bytes_ptr = memory.retain(bytes);
-                this.getDataView().setUint32(bytes_ptr_result, bytes_ptr, true);
+                this.getDataView().setUint32(
+                    bytes_ptr_result >>> 0,
+                    bytes_ptr,
+                    true,
+                );
                 return bytes.length;
             },
             swjs_decode_string:
                 // NOTE: TextDecoder can't decode typed arrays backed by SharedArrayBuffer
                 this.options.sharedMemory == true
                     ? (bytes_ptr: pointer, length: number) => {
+                          const bytesOffset = bytes_ptr >>> 0;
+                          const byteLength = length >>> 0;
                           const bytes = this.getUint8Array().slice(
-                              bytes_ptr,
-                              bytes_ptr + length,
+                              bytesOffset,
+                              bytesOffset + byteLength,
                           );
                           const string = this.textDecoder.decode(bytes);
                           return this.memory.retain(string);
                       }
                     : (bytes_ptr: pointer, length: number) => {
+                          const bytesOffset = bytes_ptr >>> 0;
+                          const byteLength = length >>> 0;
                           const bytes = this.getUint8Array().subarray(
-                              bytes_ptr,
-                              bytes_ptr + length,
+                              bytesOffset,
+                              bytesOffset + byteLength,
                           );
                           const string = this.textDecoder.decode(bytes);
                           return this.memory.retain(string);
                       },
             swjs_load_string: (ref: ref, buffer: pointer) => {
                 const bytes = this.memory.getObject(ref);
-                this.getUint8Array().set(bytes, buffer);
+                this.getUint8Array().set(bytes, buffer >>> 0);
             },
 
             swjs_call_function: (
@@ -741,8 +749,8 @@ export class SwiftRuntime {
                 }
                 const array = new ArrayType(
                     this.wasmMemory!.buffer,
-                    elementsPtr,
-                    length,
+                    elementsPtr >>> 0,
+                    length >>> 0,
                 );
                 // Call `.slice()` to copy the memory
                 return this.memory.retain(array.slice());
@@ -756,7 +764,7 @@ export class SwiftRuntime {
                 const memory = this.memory;
                 const typedArray = memory.getObject(ref);
                 const bytes = new Uint8Array(typedArray.buffer);
-                this.getUint8Array().set(bytes, buffer);
+                this.getUint8Array().set(bytes, buffer >>> 0);
             },
 
             swjs_release: (ref: ref) => {
diff --git a/Runtime/src/js-value.ts b/Runtime/src/js-value.ts
index b044e5cbe..407625bb4 100644
--- a/Runtime/src/js-value.ts
+++ b/Runtime/src/js-value.ts
@@ -60,14 +60,16 @@ export const decodeArray = (
     memory: DataView,
     objectSpace: JSObjectSpace,
 ) => {
+    const basePtr = ptr >>> 0;
+    const count = length >>> 0;
     // fast path for empty array
-    if (length === 0) {
+    if (count === 0) {
         return [];
     }
 
     let result = [];
-    for (let index = 0; index < length; index++) {
-        const base = ptr + 16 * index;
+    for (let index = 0; index < count; index++) {
+        const base = basePtr + 16 * index;
         const kind = memory.getUint32(base, true);
         const payload1 = memory.getUint32(base + 4, true);
         const payload2 = memory.getFloat64(base + 8, true);
@@ -97,7 +99,7 @@ export const write = (
         memory,
         objectSpace,
     );
-    memory.setUint32(kind_ptr, kind, true);
+    memory.setUint32(kind_ptr >>> 0, kind, true);
 };
 
 export const writeAndReturnKindBits = (
@@ -109,23 +111,25 @@ export const writeAndReturnKindBits = (
     objectSpace: JSObjectSpace,
 ): JavaScriptValueKindAndFlags => {
     const exceptionBit = (is_exception ? 1 : 0) << 31;
+    const payload1Offset = payload1_ptr >>> 0;
+    const payload2Offset = payload2_ptr >>> 0;
     if (value === null) {
         return exceptionBit | Kind.Null;
     }
 
     const writeRef = (kind: Kind) => {
-        memory.setUint32(payload1_ptr, objectSpace.retain(value), true);
+        memory.setUint32(payload1Offset, objectSpace.retain(value), true);
         return exceptionBit | kind;
     };
 
     const type = typeof value;
     switch (type) {
         case "boolean": {
-            memory.setUint32(payload1_ptr, value ? 1 : 0, true);
+            memory.setUint32(payload1Offset, value ? 1 : 0, true);
             return exceptionBit | Kind.Boolean;
         }
         case "number": {
-            memory.setFloat64(payload2_ptr, value, true);
+            memory.setFloat64(payload2Offset, value, true);
             return exceptionBit | Kind.Number;
         }
         case "string": {
@@ -157,9 +161,11 @@ export function decodeObjectRefs(
     length: number,
     memory: DataView,
 ): ref[] {
-    const result: ref[] = new Array(length);
-    for (let i = 0; i < length; i++) {
-        result[i] = memory.getUint32(ptr + 4 * i, true);
+    const basePtr = ptr >>> 0;
+    const count = length >>> 0;
+    const result: ref[] = new Array(count);
+    for (let i = 0; i < count; i++) {
+        result[i] = memory.getUint32(basePtr + 4 * i, true);
     }
     return result;
 }
diff --git a/Runtime/test/pointer-normalization.test.ts b/Runtime/test/pointer-normalization.test.ts
new file mode 100644
index 000000000..003bbdeb4
--- /dev/null
+++ b/Runtime/test/pointer-normalization.test.ts
@@ -0,0 +1,114 @@
+import { describe, expect, test } from "vitest";
+import { SwiftRuntime } from "../src/index.js";
+import { decodeArray, decodeObjectRefs, Kind, write } from "../src/js-value.js";
+
+// A Wasm pointer is an `i32`. Once the linear memory grows past 2 GiB, valid
+// addresses set the high bit and the guest passes them to JavaScript as *negative*
+// numbers, which must be normalized with `>>> 0` before being used as memory
+// offsets. These tests use a real >2 GiB `WebAssembly.Memory` and a real
+// `SwiftRuntime`, exercising the actual code paths at such an address; without the
+// normalization each one throws a `RangeError` on the negative offset.
+const PAGE_SIZE = 64 * 1024;
+const HIGH_OFFSET = 0x8000_0000; // 2 GiB, the first address with the high bit set
+const SIGNED_POINTER = HIGH_OFFSET | 0; // how the guest passes that pointer: -2_147_483_648
+const MEMORY_PAGES = HIGH_OFFSET / PAGE_SIZE + 4; // a few pages past the offset
+
+function makeRuntime(): { runtime: SwiftRuntime; memory: WebAssembly.Memory } {
+    const memory = new WebAssembly.Memory({ initial: MEMORY_PAGES });
+    const runtime = new SwiftRuntime();
+    runtime.setInstance({
+        exports: {
+            memory,
+            swjs_library_version: () => 708,
+        },
+    } as unknown as WebAssembly.Instance);
+    return { runtime, memory };
+}
+
+describe("pointer normalization at >2 GiB addresses", () => {
+    test("swjs_decode_string reads from a high-bit pointer", () => {
+        const { runtime, memory } = makeRuntime();
+        const bytes = new TextEncoder().encode("hello, 🌍");
+        new Uint8Array(memory.buffer).set(bytes, HIGH_OFFSET);
+
+        const imports = runtime.wasmImports as any;
+        const ref = imports.swjs_decode_string(SIGNED_POINTER, bytes.length);
+
+        expect((runtime as any).memory.getObject(ref)).toBe("hello, 🌍");
+    });
+
+    test("swjs_load_string writes to a high-bit pointer", () => {
+        const { runtime, memory } = makeRuntime();
+        const bytes = new TextEncoder().encode("world");
+        const ref = (runtime as any).memory.retain(bytes);
+
+        const imports = runtime.wasmImports as any;
+        imports.swjs_load_string(ref, SIGNED_POINTER);
+
+        const written = new Uint8Array(memory.buffer).slice(
+            HIGH_OFFSET,
+            HIGH_OFFSET + bytes.length,
+        );
+        expect(new TextDecoder().decode(written)).toBe("world");
+    });
+
+    test("swjs_create_typed_array copies from a high-bit pointer", () => {
+        const { runtime, memory } = makeRuntime();
+        new Uint8Array(memory.buffer).set([1, 2, 3, 4], HIGH_OFFSET);
+
+        const space = (runtime as any).memory;
+        const constructorRef = space.retain(Uint8Array);
+        const imports = runtime.wasmImports as any;
+        const ref = imports.swjs_create_typed_array(
+            constructorRef,
+            SIGNED_POINTER,
+            4,
+        );
+
+        expect(Array.from(space.getObject(ref))).toEqual([1, 2, 3, 4]);
+    });
+
+    test("decodeArray reads JSValue elements from a high-bit pointer", () => {
+        const { runtime, memory } = makeRuntime();
+        const dataView = new DataView(memory.buffer);
+        dataView.setUint32(HIGH_OFFSET, Kind.Number, true);
+        dataView.setUint32(HIGH_OFFSET + 4, 0, true);
+        dataView.setFloat64(HIGH_OFFSET + 8, 42.5, true);
+
+        const values = decodeArray(
+            SIGNED_POINTER,
+            1,
+            dataView,
+            (runtime as any).memory,
+        );
+
+        expect(values).toEqual([42.5]);
+    });
+
+    test("decodeObjectRefs reads refs from a high-bit pointer", () => {
+        const { memory } = makeRuntime();
+        const dataView = new DataView(memory.buffer);
+        dataView.setUint32(HIGH_OFFSET, 11, true);
+        dataView.setUint32(HIGH_OFFSET + 4, 22, true);
+
+        expect(decodeObjectRefs(SIGNED_POINTER, 2, dataView)).toEqual([11, 22]);
+    });
+
+    test("write stores a JSValue at high-bit pointers", () => {
+        const { runtime, memory } = makeRuntime();
+        const dataView = new DataView(memory.buffer);
+
+        write(
+            42.5,
+            SIGNED_POINTER,
+            SIGNED_POINTER + 4,
+            SIGNED_POINTER + 8,
+            false,
+            dataView,
+            (runtime as any).memory,
+        );
+
+        expect(dataView.getUint32(HIGH_OFFSET, true)).toBe(Kind.Number);
+        expect(dataView.getFloat64(HIGH_OFFSET + 8, true)).toBe(42.5);
+    });
+});
diff --git a/Sources/JavaScriptEventLoop/JSRemote.swift b/Sources/JavaScriptEventLoop/JSRemote.swift
index 4f488d7b8..b85b4991c 100644
--- a/Sources/JavaScriptEventLoop/JSRemote.swift
+++ b/Sources/JavaScriptEventLoop/JSRemote.swift
@@ -62,7 +62,7 @@ extension JSRemote where T == JSObject {
     ///
     /// - Parameter object: The JavaScript object to reference remotely.
     public init(_ object: JSObject) {
-        #if compiler(>=6.1) && _runtime(_multithreaded)
+        #if _runtime(_multithreaded)
         self.init(sourceObject: object, sourceTid: object.ownerTid)
         #else
         self.init(sourceObject: object, sourceTid: -1)
@@ -92,7 +92,7 @@ extension JSRemote where T == JSObject {
     public func withJSObject<R: Sendable, E: Error>(
         _ body: @Sendable @escaping (JSObject) throws(E) -> R
     ) async throws(E) -> sending R {
-        #if compiler(>=6.1) && _runtime(_multithreaded)
+        #if _runtime(_multithreaded)
         if storage.sourceTid == swjs_get_worker_thread_id_cached() {
             return try body(storage.sourceObject)
         }
@@ -137,13 +137,11 @@ private final class _JSRemoteContext: @unchecked Sendable {
     }
 }
 
-#if compiler(>=6.1)
 @_expose(wasm, "swjs_invoke_remote_jsobject_body")
 @_cdecl("swjs_invoke_remote_jsobject_body")
-#endif
 @available(macOS 10.15, iOS 13.0, watchOS 6.0, tvOS 13.0, *)
 func _swjs_invoke_remote_jsobject_body(_ contextPtr: UnsafeRawPointer?) -> Bool {
-    #if compiler(>=6.1) && _runtime(_multithreaded)
+    #if _runtime(_multithreaded)
     guard let contextPtr else { return true }
     let context = Unmanaged<_JSRemoteContext>.fromOpaque(contextPtr).takeRetainedValue()
 
diff --git a/Sources/JavaScriptEventLoop/JSSending.swift b/Sources/JavaScriptEventLoop/JSSending.swift
index fb2fb1ddf..613abdd8a 100644
--- a/Sources/JavaScriptEventLoop/JSSending.swift
+++ b/Sources/JavaScriptEventLoop/JSSending.swift
@@ -105,7 +105,7 @@ extension JSSending where T == JSObject {
             construct: { $0 },
             deconstruct: { $0 },
             getSourceTid: {
-                #if compiler(>=6.1) && _runtime(_multithreaded)
+                #if _runtime(_multithreaded)
                 return $0.ownerTid
                 #else
                 _ = $0
@@ -258,7 +258,7 @@ extension JSSending {
         file: StaticString = #file,
         line: UInt = #line
     ) async throws -> T {
-        #if compiler(>=6.1) && _runtime(_multithreaded)
+        #if _runtime(_multithreaded)
         let idInDestination = try await withCheckedThrowingContinuation { continuation in
             let context = _JSSendingContext(continuation: continuation)
             let idInSource = self.storage.idInSource
@@ -278,8 +278,6 @@ extension JSSending {
     }
     #endif
 
-    // 6.0 and below can't compile the following without a compiler crash.
-    #if compiler(>=6.1)
     /// Receives multiple `JSSending` instances from a thread in a single operation.
     ///
     /// This method is more efficient than receiving multiple objects individually, as it
@@ -317,7 +315,7 @@ extension JSSending {
         file: StaticString = #file,
         line: UInt = #line
     ) async throws -> (repeat each U) where T == (repeat each U) {
-        #if compiler(>=6.1) && _runtime(_multithreaded)
+        #if _runtime(_multithreaded)
         var sendingObjects: [JavaScriptObjectRef] = []
         var transferringObjects: [JavaScriptObjectRef] = []
         var sourceTid: Int32?
@@ -363,7 +361,6 @@ extension JSSending {
         return try await (repeat (each sendings).receive())
         #endif
     }
-    #endif  // compiler(>=6.1)
 }
 
 @available(macOS 10.15, iOS 13.0, watchOS 6.0, tvOS 13.0, *)
@@ -404,13 +401,11 @@ public struct JSSendingError: Error, CustomStringConvertible {
 ///   - object: The `JSObject` to be received.
 ///   - contextPtr: A pointer to the `_JSSendingContext` instance.
 // swift-format-ignore
-#if compiler(>=6.1)  // @_expose and @_extern are only available in Swift 6.1+
 @_expose(wasm, "swjs_receive_response")
 @_cdecl("swjs_receive_response")
-#endif
 @available(macOS 10.15, iOS 13.0, watchOS 6.0, tvOS 13.0, *)
 func _swjs_receive_response(_ object: JavaScriptObjectRef, _ contextPtr: UnsafeRawPointer?) {
-    #if compiler(>=6.1) && _runtime(_multithreaded)
+    #if _runtime(_multithreaded)
     guard let contextPtr = contextPtr else { return }
     let context = Unmanaged<_JSSendingContext>.fromOpaque(contextPtr).takeRetainedValue()
     context.continuation.resume(returning: object)
@@ -424,13 +419,11 @@ func _swjs_receive_response(_ object: JavaScriptObjectRef, _ contextPtr: UnsafeR
 ///   - error: The error to be received.
 ///   - contextPtr: A pointer to the `_JSSendingContext` instance.
 // swift-format-ignore
-#if compiler(>=6.1)  // @_expose and @_extern are only available in Swift 6.1+
 @_expose(wasm, "swjs_receive_error")
 @_cdecl("swjs_receive_error")
-#endif
 @available(macOS 10.15, iOS 13.0, watchOS 6.0, tvOS 13.0, *)
 func _swjs_receive_error(_ error: JavaScriptObjectRef, _ contextPtr: UnsafeRawPointer?) {
-    #if compiler(>=6.1) && _runtime(_multithreaded)
+    #if _runtime(_multithreaded)
     guard let contextPtr = contextPtr else { return }
     let context = Unmanaged<_JSSendingContext>.fromOpaque(contextPtr).takeRetainedValue()
     context.continuation.resume(throwing: JSException(JSObject(id: error).jsValue))
diff --git a/Sources/JavaScriptEventLoop/JavaScriptEventLoop+ExecutorFactory.swift b/Sources/JavaScriptEventLoop/JavaScriptEventLoop+ExecutorFactory.swift
index 0d2010016..d00672059 100644
--- a/Sources/JavaScriptEventLoop/JavaScriptEventLoop+ExecutorFactory.swift
+++ b/Sources/JavaScriptEventLoop/JavaScriptEventLoop+ExecutorFactory.swift
@@ -40,49 +40,27 @@ extension JavaScriptEventLoop: SchedulingExecutor {
         tolerance: C.Duration?,
         clock: C
     ) {
-        #if hasFeature(Embedded)
-        #if compiler(>=6.4)
-        // In Embedded Swift, ContinuousClock and SuspendingClock are unavailable.
-        // Hand-off the scheduling work to the Clock implementation for custom clocks.
-        clock.enqueue(
-            job,
-            on: self,
-            at: clock.now.advanced(by: delay),
-            tolerance: tolerance
-        )
+        #if $Embedded
+        // ContinuousClock and SuspendingClock are unavailable in Embedded Swift,
+        // but Swift.Duration is, and every standard clock uses it.
+        guard let duration = delay as? Duration else {
+            fatalError("Unsupported clock type; only Duration-based clocks are supported in Embedded Swift")
+        }
         #else
-        fatalError(
-            "Delayed enqueue requires Swift 6.4+ in Embedded mode"
-        )
-        #endif  // #if compiler(>=6.4) (Embedded)
-        #else  // #if hasFeature(Embedded)
         let duration: Duration
-        // Handle clocks we know
         if let _ = clock as? ContinuousClock {
             duration = delay as! ContinuousClock.Duration
         } else if let _ = clock as? SuspendingClock {
             duration = delay as! SuspendingClock.Duration
         } else {
-            #if compiler(>=6.4)
-            // Hand-off the scheduling work to Clock implementation for unknown clocks.
-            // Clock.enqueue is only available in the development branch (6.4+).
-            clock.enqueue(
-                job,
-                on: self,
-                at: clock.now.advanced(by: delay),
-                tolerance: tolerance
-            )
-            return
-            #else
             fatalError("Unsupported clock type; only ContinuousClock and SuspendingClock are supported")
-            #endif  // #if compiler(>=6.4) (non-Embedded)
         }
+        #endif
         let milliseconds = Self.delayInMilliseconds(from: duration)
         self.enqueue(
             UnownedJob(job),
             withDelay: milliseconds
         )
-        #endif  // #if hasFeature(Embedded)
     }
 
     private static func delayInMilliseconds(from swiftDuration: Duration) -> Double {
diff --git a/Sources/JavaScriptEventLoop/JavaScriptEventLoop.swift b/Sources/JavaScriptEventLoop/JavaScriptEventLoop.swift
index 5fc267ddc..ead6157bf 100644
--- a/Sources/JavaScriptEventLoop/JavaScriptEventLoop.swift
+++ b/Sources/JavaScriptEventLoop/JavaScriptEventLoop.swift
@@ -65,7 +65,7 @@ public final class JavaScriptEventLoop: SerialExecutor, @unchecked Sendable {
         return _shared
     }
 
-    #if compiler(>=6.1) && _runtime(_multithreaded)
+    #if _runtime(_multithreaded)
     // In multi-threaded environment, we have an event loop executor per
     // thread (per Web Worker). A job enqueued in one thread should be
     // executed in the same thread under this global executor.
@@ -129,7 +129,7 @@ public final class JavaScriptEventLoop: SerialExecutor, @unchecked Sendable {
             _Concurrency._createExecutors(factory: JavaScriptEventLoop.self)
         }
         #else
-        // For Swift 6.1 and below, or Embedded Swift, we need to install
+        // For Embedded Swift, we need to install
         // the global executor by hook API. The ExecutorFactory mechanism
         // does not work in Embedded Swift because ExecutorImpl.swift is
         // excluded from the embedded Concurrency library.
@@ -151,7 +151,7 @@ public final class JavaScriptEventLoop: SerialExecutor, @unchecked Sendable {
     }
 
     internal func unsafeEnqueue(_ job: UnownedJob) {
-        #if canImport(wasi_pthread) && compiler(>=6.1) && _runtime(_multithreaded)
+        #if canImport(wasi_pthread) && _runtime(_multithreaded)
         guard swjs_get_worker_thread_id_cached() == SWJS_MAIN_THREAD_ID else {
             // Notify the main thread to execute the job when a job is
             // enqueued from a Web Worker thread but without an executor preference.
diff --git a/Sources/JavaScriptEventLoop/WebWorkerTaskExecutor.swift b/Sources/JavaScriptEventLoop/WebWorkerTaskExecutor.swift
index b827ad980..b6bfb9c5f 100644
--- a/Sources/JavaScriptEventLoop/WebWorkerTaskExecutor.swift
+++ b/Sources/JavaScriptEventLoop/WebWorkerTaskExecutor.swift
@@ -385,7 +385,7 @@ public final class WebWorkerTaskExecutor: TaskExecutor {
         }
 
         func start(timeout: Duration, checkInterval: Duration) async throws {
-            #if canImport(wasi_pthread) && compiler(>=6.1) && _runtime(_multithreaded)
+            #if canImport(wasi_pthread) && _runtime(_multithreaded)
             class Context: @unchecked Sendable {
                 let executor: WebWorkerTaskExecutor.Executor
                 let worker: Worker
@@ -610,9 +610,7 @@ public final class WebWorkerTaskExecutor: TaskExecutor {
 /// Enqueue a job scheduled from a Web Worker thread to the main thread.
 /// This function is called when a job is enqueued from a Web Worker thread.
 @available(macOS 15.0, iOS 18.0, watchOS 11.0, tvOS 18.0, visionOS 2.0, *)
-#if compiler(>=6.1)  // @_expose and @_extern are only available in Swift 6.1+
 @_expose(wasm, "swjs_enqueue_main_job_from_worker")
-#endif
 func _swjs_enqueue_main_job_from_worker(_ job: UnownedJob) {
     WebWorkerTaskExecutor.traceStatsIncrement(\.receiveJobFromWorkerThread)
     JavaScriptEventLoop.shared.enqueue(ExecutorJob(job))
@@ -621,9 +619,7 @@ func _swjs_enqueue_main_job_from_worker(_ job: UnownedJob) {
 /// Wake up the worker thread.
 /// This function is called when a job is enqueued from the main thread to a worker thread.
 @available(macOS 15.0, iOS 18.0, watchOS 11.0, tvOS 18.0, visionOS 2.0, *)
-#if compiler(>=6.1)  // @_expose and @_extern are only available in Swift 6.1+
 @_expose(wasm, "swjs_wake_worker_thread")
-#endif
 func _swjs_wake_worker_thread() {
     WebWorkerTaskExecutor.Worker.currentThread!.wakeUpFromOtherThread()
 }
diff --git a/Sources/JavaScriptFoundationCompat/Data+JSValue.swift b/Sources/JavaScriptFoundationCompat/Data+JSValue.swift
index 6e74ba266..c4408d8cf 100644
--- a/Sources/JavaScriptFoundationCompat/Data+JSValue.swift
+++ b/Sources/JavaScriptFoundationCompat/Data+JSValue.swift
@@ -22,7 +22,7 @@ extension Data: ConvertibleToJSValue, ConstructibleFromJSValue {
     public var jsValue: JSValue { jsTypedArray.jsValue }
 
     /// Construct a Data from a JSTypedArray<UInt8>.
-    public static func construct(from uint8Array: JSTypedArray<UInt8>) -> Data? {
+    public static func construct(from uint8Array: JSTypedArray<UInt8>) -> Data {
         // First, allocate the data storage
         var data = Data(count: uint8Array.lengthInBytes)
         // Then, copy the byte contents into the Data buffer
diff --git a/Sources/JavaScriptKit/BridgeJSIntrinsics.swift b/Sources/JavaScriptKit/BridgeJSIntrinsics.swift
index ff586b45b..ab0a9f4f0 100644
--- a/Sources/JavaScriptKit/BridgeJSIntrinsics.swift
+++ b/Sources/JavaScriptKit/BridgeJSIntrinsics.swift
@@ -204,6 +204,45 @@ extension _BridgedSwiftStackType {
     }
 }
 
+/// A type usable as a generic argument of an imported `@JSFunction`.
+public protocol BridgedSwiftGenericBridgeable: _BridgedSwiftStackType
+where StackLiftResult == Self {
+    @_spi(BridgeJS) static var bridgeJSTypeHandle: BridgeJSTypeHandle { get }
+}
+
+extension BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static var bridgeJSTypeID: Int32 { bridgeJSTypeHandle.typeID }
+
+    @_spi(BridgeJS) public static func bridgeJSMakeTypeHandle() -> BridgeJSTypeHandle {
+        #if hasFeature(Embedded)
+        return BridgeJSTypeHandle()
+        #else
+        return BridgeJSTypeHandle(Self.self)
+        #endif
+    }
+}
+
+/// A per-type identity token for generic bridging.
+public final class BridgeJSTypeHandle: Sendable {
+    #if hasFeature(Embedded)
+    public init() {}
+    #else
+    public nonisolated(unsafe) let type: any BridgedSwiftGenericBridgeable.Type
+
+    public init(_ type: any BridgedSwiftGenericBridgeable.Type) {
+        self.type = type
+    }
+    #endif
+
+    @_spi(BridgeJS) public var typeID: Int32 {
+        #if arch(wasm32)
+        return Int32(bitPattern: UInt32(UInt(bitPattern: Unmanaged.passUnretained(self).toOpaque())))
+        #else
+        _onlyAvailableOnWasm()
+        #endif
+    }
+}
+
 /// Types that bridge with the same (isSome, value) ABI as Optional.
 /// Used by JSUndefinedOr so all bridge methods delegate to Optional<Wrapped>.
 public protocol _BridgedAsOptional {
@@ -217,6 +256,294 @@ extension Optional: _BridgedAsOptional {
     public init(optional: Wrapped?) { self = optional }
 }
 
+// MARK: - _BridgedSwiftAlias
+
+/// Types that are bridged using a separate JavaScript representation (`@JS(as:)`).
+public protocol _BridgedSwiftAlias {
+    associatedtype JSRepresentation
+    consuming func bridgeToJS() -> JSRepresentation
+    static func bridgeFromJS(_ value: consuming JSRepresentation) -> Self
+}
+
+extension _BridgedSwiftAlias where JSRepresentation: _BridgedSwiftHeapObject {
+    // MARK: ImportTS
+    @_spi(BridgeJS) public consuming func bridgeJSLowerParameter() -> UnsafeMutableRawPointer {
+        bridgeToJS().bridgeJSLowerParameter()
+    }
+    @_spi(BridgeJS) public static func bridgeJSLiftReturn(_ pointer: UnsafeMutableRawPointer) -> Self {
+        bridgeFromJS(JSRepresentation.bridgeJSLiftReturn(pointer))
+    }
+    // MARK: ExportSwift
+    @_spi(BridgeJS) public static func bridgeJSLiftParameter(_ pointer: UnsafeMutableRawPointer) -> Self {
+        bridgeFromJS(JSRepresentation.bridgeJSLiftParameter(pointer))
+    }
+    @_spi(BridgeJS) public consuming func bridgeJSLowerReturn() -> UnsafeMutableRawPointer {
+        bridgeToJS().bridgeJSLowerReturn()
+    }
+    // MARK: Stack ABI
+    @_spi(BridgeJS) public static func bridgeJSStackPop() -> Self {
+        bridgeFromJS(JSRepresentation.bridgeJSStackPop())
+    }
+    @_spi(BridgeJS) public consuming func bridgeJSStackPush() {
+        bridgeToJS().bridgeJSStackPush()
+    }
+}
+
+extension _BridgedAsOptional where Wrapped: _BridgedSwiftAlias, Wrapped.JSRepresentation: _BridgedSwiftHeapObject {
+    @_spi(BridgeJS) public consuming func bridgeJSLowerParameter() -> (
+        isSome: Int32, pointer: UnsafeMutableRawPointer
+    ) {
+        asOptional.map { $0.bridgeToJS() }.bridgeJSLowerParameter()
+    }
+
+    @_spi(BridgeJS) public static func bridgeJSLiftReturn(_ pointer: UnsafeMutableRawPointer) -> Self {
+        Self(optional: Optional<Wrapped.JSRepresentation>.bridgeJSLiftReturn(pointer).map { Wrapped.bridgeFromJS($0) })
+    }
+
+    @_spi(BridgeJS) public static func bridgeJSLiftParameter(
+        _ isSome: Int32,
+        _ pointer: UnsafeMutableRawPointer
+    ) -> Self {
+        Self(
+            optional: Optional<Wrapped.JSRepresentation>.bridgeJSLiftParameter(isSome, pointer)
+                .map { Wrapped.bridgeFromJS($0) }
+        )
+    }
+
+    @_spi(BridgeJS) public static func bridgeJSLiftReturnFromSideChannel() -> Self {
+        Self(
+            optional: Optional<Wrapped.JSRepresentation>.bridgeJSLiftReturnFromSideChannel()
+                .map { Wrapped.bridgeFromJS($0) }
+        )
+    }
+
+    @_spi(BridgeJS) public consuming func bridgeJSLowerReturn() -> Void {
+        asOptional.map { $0.bridgeToJS() }.bridgeJSLowerReturn()
+    }
+}
+
+extension _BridgedSwiftAlias where JSRepresentation: _JSBridgedClass {
+    // MARK: ImportTS
+    @_spi(BridgeJS) public consuming func bridgeJSLowerParameter() -> Int32 {
+        bridgeToJS().bridgeJSLowerParameter()
+    }
+    @_spi(BridgeJS) public static func bridgeJSLiftReturn(_ id: Int32) -> Self {
+        bridgeFromJS(JSRepresentation.bridgeJSLiftReturn(id))
+    }
+    // MARK: ExportSwift
+    @_spi(BridgeJS) public static func bridgeJSLiftParameter(_ id: Int32) -> Self {
+        bridgeFromJS(JSRepresentation.bridgeJSLiftParameter(id))
+    }
+    @_spi(BridgeJS) public consuming func bridgeJSLowerReturn() -> Int32 {
+        bridgeToJS().bridgeJSLowerReturn()
+    }
+    // MARK: Stack ABI
+    @_spi(BridgeJS) public static func bridgeJSStackPop() -> Self {
+        bridgeFromJS(JSRepresentation.bridgeJSStackPop())
+    }
+    @_spi(BridgeJS) public consuming func bridgeJSStackPush() {
+        bridgeToJS().bridgeJSStackPush()
+    }
+}
+
+extension _BridgedSwiftAlias where JSRepresentation: _BridgedSwiftTypeLoweredIntoSingleWasmCoreType {
+    // MARK: ImportTS
+    @_spi(BridgeJS) public consuming func bridgeJSLowerParameter() -> JSRepresentation.WasmCoreType {
+        bridgeToJS().bridgeJSLowerParameter()
+    }
+    @_spi(BridgeJS) public static func bridgeJSLiftReturn(_ value: JSRepresentation.WasmCoreType) -> Self {
+        bridgeFromJS(JSRepresentation.bridgeJSLiftReturn(value))
+    }
+    // MARK: ExportSwift
+    @_spi(BridgeJS) public static func bridgeJSLiftParameter(_ value: JSRepresentation.WasmCoreType) -> Self {
+        bridgeFromJS(JSRepresentation.bridgeJSLiftParameter(value))
+    }
+    @_spi(BridgeJS) public consuming func bridgeJSLowerReturn() -> JSRepresentation.WasmCoreType {
+        bridgeToJS().bridgeJSLowerReturn()
+    }
+}
+
+extension _BridgedSwiftAlias
+where
+    JSRepresentation: _BridgedSwiftTypeLoweredIntoSingleWasmCoreType, JSRepresentation: _BridgedSwiftStackType,
+    JSRepresentation.StackLiftResult == JSRepresentation
+{
+    @_spi(BridgeJS) public static func bridgeJSStackPop() -> Self {
+        bridgeFromJS(JSRepresentation.bridgeJSStackPop())
+    }
+    @_spi(BridgeJS) public consuming func bridgeJSStackPush() {
+        bridgeToJS().bridgeJSStackPush()
+    }
+}
+
+extension _BridgedAsOptional
+where Wrapped: _BridgedSwiftAlias, Wrapped.JSRepresentation: _BridgedSwiftOptionalScalarBridge {
+    @_spi(BridgeJS) public consuming func bridgeJSLowerParameter() -> (
+        isSome: Int32, value: Wrapped.JSRepresentation.WasmCoreType
+    ) {
+        asOptional.map { $0.bridgeToJS() }.bridgeJSLowerParameter()
+    }
+    @_spi(BridgeJS) public static func bridgeJSLiftParameter(
+        _ isSome: Int32,
+        _ value: Wrapped.JSRepresentation.WasmCoreType
+    ) -> Self {
+        Self(
+            optional: Optional<Wrapped.JSRepresentation>.bridgeJSLiftParameter(isSome, value)
+                .map { Wrapped.bridgeFromJS($0) }
+        )
+    }
+    @_spi(BridgeJS) public consuming func bridgeJSLowerReturn() -> Void {
+        asOptional.map { $0.bridgeToJS() }.bridgeJSLowerReturn()
+    }
+}
+
+extension _BridgedAsOptional
+where Wrapped: _BridgedSwiftAlias, Wrapped.JSRepresentation: _BridgedSwiftOptionalScalarSideChannelBridge {
+    @_spi(BridgeJS) public static func bridgeJSLiftReturnFromSideChannel() -> Self {
+        Self(
+            optional: Optional<Wrapped.JSRepresentation>.bridgeJSLiftReturnFromSideChannel()
+                .map { Wrapped.bridgeFromJS($0) }
+        )
+    }
+}
+
+extension _BridgedSwiftAlias where JSRepresentation: _BridgedSwiftStruct {
+    // MARK: ExportSwift
+    @_spi(BridgeJS) public static func bridgeJSStackPop() -> Self {
+        bridgeFromJS(JSRepresentation.bridgeJSStackPop())
+    }
+    @_spi(BridgeJS) public consuming func bridgeJSStackPush() {
+        bridgeToJS().bridgeJSStackPush()
+    }
+
+    public init(unsafelyCopying jsObject: JSObject) {
+        self = Self.bridgeFromJS(JSRepresentation(unsafelyCopying: jsObject))
+    }
+    public func toJSObject() -> JSObject {
+        return self.bridgeToJS().toJSObject()
+    }
+}
+
+extension _BridgedSwiftAlias where JSRepresentation: _BridgedSwiftCaseEnum {
+    // MARK: ImportTS
+    @_spi(BridgeJS) public consuming func bridgeJSLowerParameter() -> Int32 {
+        bridgeToJS().bridgeJSLowerParameter()
+    }
+    @_spi(BridgeJS) public static func bridgeJSLiftReturn(_ value: Int32) -> Self {
+        bridgeFromJS(JSRepresentation.bridgeJSLiftReturn(value))
+    }
+    // MARK: ExportSwift
+    @_spi(BridgeJS) public static func bridgeJSLiftParameter(_ value: Int32) -> Self {
+        bridgeFromJS(JSRepresentation.bridgeJSLiftParameter(value))
+    }
+    @_spi(BridgeJS) public consuming func bridgeJSLowerReturn() -> Int32 {
+        bridgeToJS().bridgeJSLowerReturn()
+    }
+}
+
+extension _BridgedSwiftAlias where JSRepresentation: _BridgedSwiftAssociatedValueEnum {
+    @_spi(BridgeJS) public static func bridgeJSStackPopPayload(_ caseId: Int32) -> Self {
+        bridgeFromJS(JSRepresentation.bridgeJSStackPopPayload(caseId))
+    }
+    @_spi(BridgeJS) public consuming func bridgeJSStackPushPayload() -> Int32 {
+        bridgeToJS().bridgeJSStackPushPayload()
+    }
+}
+
+extension _BridgedSwiftAlias where JSRepresentation == String {
+    // MARK: ImportTS
+    @_spi(BridgeJS) public consuming func bridgeJSWithLoweredParameter<T>(_ body: (Int32, Int32) -> T) -> T {
+        bridgeToJS().bridgeJSWithLoweredParameter(body)
+    }
+    @_spi(BridgeJS) public static func bridgeJSLiftReturn(_ bytesCount: Int32) -> Self {
+        bridgeFromJS(String.bridgeJSLiftReturn(bytesCount))
+    }
+    // MARK: ExportSwift
+    @_spi(BridgeJS) public static func bridgeJSLiftParameter(_ bytes: Int32, _ count: Int32) -> Self {
+        bridgeFromJS(String.bridgeJSLiftParameter(bytes, count))
+    }
+    @_spi(BridgeJS) public consuming func bridgeJSLowerReturn() -> Void {
+        bridgeToJS().bridgeJSLowerReturn()
+    }
+    // MARK: Stack ABI
+    @_spi(BridgeJS) public static func bridgeJSStackPop() -> Self {
+        bridgeFromJS(String.bridgeJSStackPop())
+    }
+    @_spi(BridgeJS) public consuming func bridgeJSStackPush() {
+        bridgeToJS().bridgeJSStackPush()
+    }
+}
+
+extension _BridgedAsOptional where Wrapped: _BridgedSwiftAlias, Wrapped.JSRepresentation == String {
+    @_spi(BridgeJS) public consuming func bridgeJSWithLoweredParameter<T>(
+        _ body: (Int32, Int32, Int32) -> T
+    ) -> T {
+        asOptional.map { $0.bridgeToJS() }.bridgeJSWithLoweredParameter(body)
+    }
+    @_spi(BridgeJS) public static func bridgeJSLiftParameter(
+        _ isSome: Int32,
+        _ bytes: Int32,
+        _ count: Int32
+    ) -> Self {
+        Self(optional: Optional<String>.bridgeJSLiftParameter(isSome, bytes, count).map { Wrapped.bridgeFromJS($0) })
+    }
+    @_spi(BridgeJS) public static func bridgeJSLiftReturnFromSideChannel() -> Self {
+        Self(optional: Optional<String>.bridgeJSLiftReturnFromSideChannel().map { Wrapped.bridgeFromJS($0) })
+    }
+    @_spi(BridgeJS) public consuming func bridgeJSLowerReturn() -> Void {
+        asOptional.map { $0.bridgeToJS() }.bridgeJSLowerReturn()
+    }
+}
+
+extension _BridgedSwiftAlias where JSRepresentation == JSValue {
+    // MARK: ImportTS
+    @_spi(BridgeJS) public consuming func bridgeJSLowerParameter() -> (kind: Int32, payload1: Int32, payload2: Double) {
+        bridgeToJS().bridgeJSLowerParameter()
+    }
+    @_spi(BridgeJS) public static func bridgeJSLiftReturn() -> Self {
+        bridgeFromJS(JSValue.bridgeJSLiftReturn())
+    }
+    // MARK: ExportSwift
+    @_spi(BridgeJS) public static func bridgeJSLiftParameter(
+        _ kind: Int32,
+        _ payload1: Int32,
+        _ payload2: Double
+    ) -> Self {
+        bridgeFromJS(JSValue.bridgeJSLiftParameter(kind, payload1, payload2))
+    }
+    @_spi(BridgeJS) public consuming func bridgeJSLowerReturn() -> Void {
+        bridgeToJS().bridgeJSLowerReturn()
+    }
+    @_spi(BridgeJS) public static func bridgeJSStackPop() -> Self {
+        bridgeFromJS(JSValue.bridgeJSStackPop())
+    }
+    @_spi(BridgeJS) public consuming func bridgeJSStackPush() {
+        bridgeToJS().bridgeJSStackPush()
+    }
+}
+
+extension _BridgedAsOptional where Wrapped: _BridgedSwiftAlias, Wrapped.JSRepresentation == JSValue {
+    @_spi(BridgeJS) public consuming func bridgeJSLowerParameter() -> (
+        isSome: Int32, kind: Int32, payload1: Int32, payload2: Double
+    ) {
+        asOptional.map { $0.bridgeToJS() }.bridgeJSLowerParameter()
+    }
+    @_spi(BridgeJS) public static func bridgeJSLiftParameter(
+        _ isSome: Int32,
+        _ kind: Int32,
+        _ payload1: Int32,
+        _ payload2: Double
+    ) -> Self {
+        Self(
+            optional: Optional<JSValue>.bridgeJSLiftParameter(isSome, kind, payload1, payload2)
+                .map { Wrapped.bridgeFromJS($0) }
+        )
+    }
+    @_spi(BridgeJS) public consuming func bridgeJSLowerReturn() -> Void {
+        asOptional.map { $0.bridgeToJS() }.bridgeJSLowerReturn()
+    }
+}
+
 extension Bool: _BridgedSwiftTypeLoweredIntoSingleWasmCoreType, _BridgedSwiftStackType {
     // MARK: ImportTS
     @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameter() -> Int32 {
@@ -520,6 +847,49 @@ extension String: _BridgedSwiftStackType {
     }
 }
 
+extension Bool: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = Bool.bridgeJSMakeTypeHandle()
+}
+extension Int: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = Int.bridgeJSMakeTypeHandle()
+}
+extension Float: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = Float.bridgeJSMakeTypeHandle()
+}
+extension Double: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = Double.bridgeJSMakeTypeHandle()
+}
+extension String: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = String.bridgeJSMakeTypeHandle()
+}
+extension UInt: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = UInt.bridgeJSMakeTypeHandle()
+}
+extension Int8: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = Int8.bridgeJSMakeTypeHandle()
+}
+extension UInt8: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = UInt8.bridgeJSMakeTypeHandle()
+}
+extension Int16: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = Int16.bridgeJSMakeTypeHandle()
+}
+extension UInt16: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = UInt16.bridgeJSMakeTypeHandle()
+}
+extension Int32: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = Int32.bridgeJSMakeTypeHandle()
+}
+extension UInt32: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = UInt32.bridgeJSMakeTypeHandle()
+}
+extension Int64: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = Int64.bridgeJSMakeTypeHandle()
+}
+extension UInt64: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = UInt64.bridgeJSMakeTypeHandle()
+}
+
 extension JSObject: _BridgedSwiftStackType {
     // JSObject is a non-final class, so we must explicitly specify the associated type
     // rather than relying on the default `Self` (which Swift requires for covariant returns).
@@ -626,6 +996,42 @@ extension JSValue: _BridgedSwiftStackType {
     }
 }
 
+extension JSValue: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = JSValue.bridgeJSMakeTypeHandle()
+}
+
+// Keep this order in sync with BridgeType.genericBridgeablePrimitives.
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "bjs_core_register_type_handles")
+private func _bjs_core_register_type_handles_extern(_ base: UnsafePointer<Int32>?, _ count: Int32)
+
+@_expose(wasm, "bjs_core_register_type_handles")
+public func _bjs_core_register_type_handles() {
+    // BEGIN bjs_core_type_handles
+    let typeIds: [Int32] = [
+        Bool.bridgeJSTypeID,
+        Int.bridgeJSTypeID,
+        Int8.bridgeJSTypeID,
+        UInt8.bridgeJSTypeID,
+        Int16.bridgeJSTypeID,
+        UInt16.bridgeJSTypeID,
+        Int32.bridgeJSTypeID,
+        UInt32.bridgeJSTypeID,
+        UInt.bridgeJSTypeID,
+        Int64.bridgeJSTypeID,
+        UInt64.bridgeJSTypeID,
+        Float.bridgeJSTypeID,
+        Double.bridgeJSTypeID,
+        String.bridgeJSTypeID,
+        JSValue.bridgeJSTypeID,
+    ]
+    // END bjs_core_type_handles
+    typeIds.withUnsafeBufferPointer { buffer in
+        _bjs_core_register_type_handles_extern(buffer.baseAddress, Int32(buffer.count))
+    }
+}
+#endif
+
 /// A protocol that Swift heap objects exposed to JavaScript via `@JS class` must conform to.
 ///
 /// The conformance is automatically synthesized by the BridgeJS code generator.
@@ -812,23 +1218,6 @@ extension _BridgedSwiftAssociatedValueEnum {
         _swift_js_push_i32(bridgeJSStackPushPayload())
     }
 
-    public static func bridgeJSStackPopAsOptional() -> Self? {
-        let discriminator = _swift_js_pop_i32()
-        if discriminator == -1 {
-            return nil
-        }
-        return bridgeJSStackPopPayload(discriminator)
-    }
-
-    public static func bridgeJSStackPushAsOptional(_ value: consuming Self?) {
-        switch consume value {
-        case .none:
-            _swift_js_push_i32(-1)
-        case .some(let value):
-            _swift_js_push_i32(value.bridgeJSStackPushPayload())
-        }
-    }
-
     @_spi(BridgeJS) public static func bridgeJSLiftParameter(_ caseId: Int32) -> Self {
         return bridgeJSStackPopPayload(caseId)
     }
@@ -862,13 +1251,12 @@ where StackLiftResult == Self {
 }
 
 extension _BridgedSwiftStruct {
-    @_spi(BridgeJS) public consuming func bridgeJSLowerParameter() -> Int32 {
-        return toJSObject().bridgeJSLowerReturn()
-    }
-
-    @_spi(BridgeJS) public static func bridgeJSLiftReturn(_ objectId: Int32) -> Self {
-        let jsObject = JSObject.bridgeJSLiftReturn(objectId)
-        return Self(unsafelyCopying: jsObject)
+    /// Lower a struct parameter onto the shared stacks for the peer to `lift()`.
+    ///
+    /// Same convention as arrays/dictionaries. Use ``toJSObject()`` when a real JS object
+    /// representation is needed (e.g. `init(unsafelyCopying:)` round-trips).
+    @_spi(BridgeJS) public consuming func bridgeJSLowerParameter() {
+        bridgeJSStackPush()
     }
 
     @_spi(BridgeJS) public static func bridgeJSLiftReturn() -> Self {
@@ -1675,14 +2063,8 @@ extension _BridgedAsOptional where Wrapped: _BridgedSwiftStackType, Wrapped.Stac
 extension _BridgedAsOptional
 where Wrapped: _BridgedSwiftStackType, Wrapped.StackLiftResult == Wrapped, Wrapped: _BridgedSwiftTypeLoweredIntoVoidType
 {
-    @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameter() -> Int32 {
-        switch asOptional {
-        case .none:
-            return 0
-        case .some(let array):
-            array.bridgeJSLowerReturn()
-            return 1
-        }
+    @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameter() {
+        Wrapped.bridgeJSStackPushAsOptional(asOptional)
     }
 
     @_spi(BridgeJS) public consuming func bridgeJSLowerReturn() -> Void {
@@ -1826,6 +2208,29 @@ extension _BridgedAsOptional where Wrapped == JSObject {
     }
 }
 
+extension _BridgedAsOptional where Wrapped: _JSBridgedClass {
+    // `@JSClass` wrappers (`_JSBridgedClass`) bridge an underlying `JSObject`, so an
+    // optional wrapper mirrors `Optional<JSObject>`: parameters use the direct
+    // (`isSome`, object id) ABI while returns travel through the bridge stack.
+    //
+    // Stack push/pop is provided by the generic `Wrapped: _BridgedSwiftStackType`
+    // extension; only the direct parameter lift and the export return lowering need
+    // dedicated implementations here.
+    @_spi(BridgeJS) public static func bridgeJSLiftParameter(_ isSome: Int32, _ objectId: Int32) -> Self {
+        Self(
+            optional: Optional<Wrapped>._bridgeJSLiftParameter(
+                isSome,
+                objectId,
+                liftWrapped: Wrapped.bridgeJSLiftParameter
+            )
+        )
+    }
+
+    @_spi(BridgeJS) public consuming func bridgeJSLowerReturn() -> Void {
+        Wrapped.bridgeJSStackPushAsOptional(asOptional)
+    }
+}
+
 extension _BridgedAsOptional where Wrapped: _BridgedSwiftProtocolWrapper {
     @_spi(BridgeJS) public static func bridgeJSLiftParameter(_ isSome: Int32, _ objectId: Int32) -> Self {
         Self(
@@ -2067,26 +2472,13 @@ extension _BridgedAsOptional where Wrapped: _BridgedSwiftAssociatedValueEnum {
     }
 
     @_spi(BridgeJS) public consuming func bridgeJSLowerReturn() {
-        Wrapped.bridgeJSStackPushAsOptional(asOptional)
-    }
-}
-
-extension _BridgedAsOptional where Wrapped: _BridgedSwiftStruct {
-    @_spi(BridgeJS) public static func bridgeJSLiftParameter(_ isSome: Int32) -> Self {
-        if isSome == 0 {
-            return Self(optional: nil)
-        } else {
-            return Self(optional: Wrapped.bridgeJSStackPop())
+        switch asOptional {
+        case .none:
+            _swift_js_push_i32(-1)
+        case .some(let value):
+            _swift_js_push_i32(value.bridgeJSStackPushPayload())
         }
     }
-
-    @_spi(BridgeJS) public consuming func bridgeJSLowerReturn() -> Void {
-        Wrapped.bridgeJSStackPushAsOptional(asOptional)
-    }
-
-    @_spi(BridgeJS) public static func bridgeJSLiftParameter() -> Self {
-        Self.bridgeJSStackPop()
-    }
 }
 
 // MARK: - Array Support
@@ -2164,41 +2556,6 @@ where Key == String, Value: _BridgedSwiftStackType, Value.StackLiftResult == Val
     }
 }
 
-extension _BridgedAsOptional {
-    @_spi(BridgeJS) public consuming func bridgeJSLowerParameter<Value>() -> Int32
-    where Wrapped == Dictionary<String, Value>, Value: _BridgedSwiftStackType, Value.StackLiftResult == Value {
-        switch asOptional {
-        case .none:
-            return 0
-        case .some(let dict):
-            dict.bridgeJSStackPush()
-            return 1
-        }
-    }
-
-    @_spi(BridgeJS) public static func bridgeJSLiftParameter<Value>(_ isSome: Int32) -> Self
-    where Wrapped == Dictionary<String, Value>, Value: _BridgedSwiftStackType, Value.StackLiftResult == Value {
-        if isSome == 0 {
-            return Self(optional: nil)
-        }
-        return Self(optional: Dictionary<String, Value>.bridgeJSStackPop())
-    }
-
-    @_spi(BridgeJS) public static func bridgeJSLiftReturn<Value>() -> Self
-    where Wrapped == Dictionary<String, Value>, Value: _BridgedSwiftStackType, Value.StackLiftResult == Value {
-        let isSome = _swift_js_pop_i32()
-        if isSome == 0 {
-            return Self(optional: nil)
-        }
-        return Self(optional: Dictionary<String, Value>.bridgeJSStackPop())
-    }
-
-    @_spi(BridgeJS) public consuming func bridgeJSLowerReturn<Value>() -> Void
-    where Wrapped == Dictionary<String, Value>, Value: _BridgedSwiftStackType, Value.StackLiftResult == Value {
-        Wrapped.bridgeJSStackPushAsOptional(asOptional)
-    }
-}
-
 // MARK: Async Promise Awaiting
 
 /// Protocol for type-erasing `JSTypedClosure` in `_bjs_awaitPromise`.
@@ -2286,3 +2643,67 @@ extension _BridgedAsOptional {
         throw error
     }
 }
+
+// MARK: Async Promise Creation
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "swift_js_make_promise")
+private func _swift_js_make_promise_extern() -> Int32
+#else
+private func _swift_js_make_promise_extern() -> Int32 { _onlyAvailableOnWasm() }
+#endif
+
+// `@unchecked Sendable` is safe because the Wasm runtime is single-threaded.
+private struct _BridgeJSMakePromiseContext<T>: @unchecked Sendable {
+    let promise: JSObject
+    let resolve: (JSObject, T) throws(JSException) -> Void
+    let reject: (JSObject, JSValue) throws(JSException) -> Void
+    let body: () async throws(JSException) -> T
+}
+
+/// Returns a `Promise` synchronously and settles it from a `Task` via the generated
+/// `resolve` / `reject` thunks, which this library cannot name directly.
+@_spi(BridgeJS) public func _bjs_makePromise<T>(
+    resolve: @escaping (JSObject, T) throws(JSException) -> Void,
+    reject: @escaping (JSObject, JSValue) throws(JSException) -> Void,
+    _ body: @escaping () async throws(JSException) -> T
+) -> Int32 {
+    let promise = JSObject(id: JavaScriptObjectRef(bitPattern: _swift_js_make_promise_extern()))
+    let context = _BridgeJSMakePromiseContext(promise: promise, resolve: resolve, reject: reject, body: body)
+    Task {
+        do throws(JSException) {
+            let value = try await context.body()
+            try context.resolve(context.promise, value)
+        } catch {
+            try? context.reject(context.promise, error.thrownValue)
+        }
+    }
+    return promise.bridgeJSLowerReturn()
+}
+
+private struct _BridgeJSMakeVoidPromiseContext: @unchecked Sendable {
+    let promise: JSObject
+    let resolve: (JSObject) throws(JSException) -> Void
+    let reject: (JSObject, JSValue) throws(JSException) -> Void
+    let body: () async throws(JSException) -> Void
+}
+
+/// `Void`-returning overload: a `Void` value can't cross the bridge as a parameter, so the
+/// generated `resolve` thunk takes only the promise and settles it with `undefined`.
+@_spi(BridgeJS) public func _bjs_makePromise(
+    resolve: @escaping (JSObject) throws(JSException) -> Void,
+    reject: @escaping (JSObject, JSValue) throws(JSException) -> Void,
+    _ body: @escaping () async throws(JSException) -> Void
+) -> Int32 {
+    let promise = JSObject(id: JavaScriptObjectRef(bitPattern: _swift_js_make_promise_extern()))
+    let context = _BridgeJSMakeVoidPromiseContext(promise: promise, resolve: resolve, reject: reject, body: body)
+    Task {
+        do throws(JSException) {
+            try await context.body()
+            try context.resolve(context.promise)
+        } catch {
+            try? context.reject(context.promise, error.thrownValue)
+        }
+    }
+    return promise.bridgeJSLowerReturn()
+}
diff --git a/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Bringing-Swift-Closures-to-JavaScript.md b/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Bringing-Swift-Closures-to-JavaScript.md
index ce1d9d555..7b95feb50 100644
--- a/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Bringing-Swift-Closures-to-JavaScript.md
+++ b/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Bringing-Swift-Closures-to-JavaScript.md
@@ -38,6 +38,47 @@ let log = JSTypedClosure<(String) -> Void> { print($0) }
 defer { log.release() }
 ```
 
+## Throwing typed closures
+
+A ``JSTypedClosure`` signature can be `throws(JSException)`. Exceptions propagate across the boundary: a Swift closure that throws surfaces as a thrown JS error (caught with `try/catch` in JavaScript), and a throwing JS callback surfaces back into Swift as a `JSException`.
+
+```swift
+import JavaScriptKit
+
+let parse = JSTypedClosure<(String) throws(JSException) -> Int> { text in
+    guard let value = Int(text) else {
+        throw JSException(JSError(message: "Not a number: \(text)").jsValue)
+    }
+    return value
+}
+defer { parse.release() }
+```
+
+Only `throws(JSException)` is supported. Plain `throws` is rejected at build time with a diagnostic, consistent with the rest of BridgeJS (see <doc:Exporting-Swift-Function>).
+
+## Async typed closures
+
+A ``JSTypedClosure`` signature can be `async`. JavaScript receives a function that returns a `Promise`, so the TypeScript shape is `(args) => Promise<R>`. Supported return types mirror `async` functions: `ConvertibleToJSValue` types, `@JS struct`, raw-value / case-only enums, `Void`, and their `Optional` / `Array` / `Dictionary` compositions. Unsupported async return types (associated-value enums, protocols, namespace enums) are diagnosed at build time.
+
+```swift
+import JavaScriptKit
+
+let fetchCount = JSTypedClosure<(String) async -> Int> { endpoint in
+    try? await Task.sleep(nanoseconds: 10_000_000)
+    return endpoint.count
+}
+defer { fetchCount.release() }
+```
+
+```javascript
+const count = await fetchCount("/items"); // Promise<number>
+```
+
+> Important: Async closures require the JavaScript event loop executor, exactly like `async` functions. Call `JavaScriptEventLoop.installGlobalExecutor()` once during startup before invoking them. There is no special handling for closures.
+
+**Cancellation is a non-goal.** There is no propagation between a Swift `Task` and a JavaScript `Promise` in either direction.
+
+
 ## Lifetime and release()
 
 A ``JSTypedClosure`` keeps the Swift closure alive and exposes a JavaScript function that calls into it. To avoid leaks and use-after-free:
diff --git a/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift-to-JavaScript.md b/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift-to-JavaScript.md
index b14d2eebe..38a47ffdc 100644
--- a/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift-to-JavaScript.md
+++ b/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift-to-JavaScript.md
@@ -22,6 +22,7 @@ Configure your package and build for JavaScript as described in <doc:Setting-up-
 - <doc:Exporting-Swift-Closure>
 - <doc:Exporting-Swift-Protocols>
 - <doc:Exporting-Swift-Optional>
+- <doc:Exporting-Swift-Custom-Representation>
 - <doc:Exporting-Swift-Default-Parameters>
 - <doc:Exporting-Swift-Static-Functions>
 - <doc:Exporting-Swift-Static-Properties>
diff --git a/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift/Exporting-Swift-Closure.md b/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift/Exporting-Swift-Closure.md
index adb9ab33b..9b9f4ab97 100644
--- a/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift/Exporting-Swift-Closure.md
+++ b/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift/Exporting-Swift-Closure.md
@@ -103,6 +103,144 @@ This differs from structs and arrays, which use copy semantics and transfer data
 
 When you **return** a closure to JavaScript, we recommend using ``JSTypedClosure`` and calling `release()` when the closure is no longer needed, instead of returning a plain closure type. See <doc:Bringing-Swift-Closures-to-JavaScript>.
 
+## Throwing closures
+
+Closures can throw JavaScript errors across the boundary using `throws(JSException)`, in both directions. Exceptions propagate just like they do for throwing functions (see <doc:Exporting-Swift-Function>).
+
+A Swift closure handed to JavaScript that throws surfaces as a thrown JS error, so JavaScript catches it with `try/catch`:
+
+```swift
+import JavaScriptKit
+
+@JS func makeParser() -> (String) throws(JSException) -> Int {
+    return { text in
+        guard let value = Int(text) else {
+            throw JSException(JSError(message: "Not a number: \(text)").jsValue)
+        }
+        return value
+    }
+}
+```
+
+```javascript
+const parse = exports.makeParser();
+try {
+    console.log(parse("42")); // 42
+    parse("oops");            // throws
+} catch (e) {
+    console.error("parse failed:", e);
+}
+```
+
+A throwing JavaScript callback passed into Swift surfaces back into Swift as a `JSException`, which the Swift call site rethrows:
+
+```swift
+import JavaScriptKit
+
+@JS func runValidator(_ input: String, validate: (String) throws(JSException) -> Bool) throws(JSException) -> Bool {
+    return try validate(input)
+}
+```
+
+```javascript
+exports.runValidator("ok", (value) => {
+    if (value.length === 0) {
+        throw new Error("empty input");
+    }
+    return true;
+});
+```
+
+Notes:
+- Only `throws(JSException)` is supported. Plain `throws` is rejected at build time with a diagnostic.
+- Thrown values are surfaced to JS as normal JS exceptions, and JS exceptions thrown by callbacks are surfaced into Swift as a `JSException`.
+
+## Async closures
+
+Closures can be `async` in both directions, just like `async` functions (see <doc:Exporting-Swift-Function>). An async closure is exposed to JavaScript as a function that returns a `Promise`, so its TypeScript shape is `(args) => Promise<R>`.
+
+> Important: Async closures require the JavaScript event loop executor to be installed, exactly like `async` functions. Call `JavaScriptEventLoop.installGlobalExecutor()` once during startup before invoking async closures.
+
+### Direction A - Swift awaits a JavaScript async callback
+
+A Swift `@JS func` can take a JavaScript async callback typed as `(A) async throws(JSException) -> R`. Swift `await`s the `Promise` the callback returns. Both resolution and rejection work: a rejected `Promise` surfaces into Swift as a `JSException`.
+
+```swift
+import JavaScriptKit
+
+@JS func loadAll(_ keys: [String], fetch: (String) async throws(JSException) -> String) async throws(JSException) -> [String] {
+    var results: [String] = []
+    for key in keys {
+        results.append(try await fetch(key))
+    }
+    return results
+}
+```
+
+```javascript
+const values = await exports.loadAll(["a", "b"], async (key) => {
+    const response = await fetch(`/items/${key}`);
+    if (!response.ok) throw new Error(`failed: ${key}`); // rejects → JSException in Swift
+    return response.text();
+});
+```
+
+### Direction B - a Swift async closure handed to JavaScript
+
+A Swift async closure returned to JavaScript (as a plain async closure type or a ``JSTypedClosure``) becomes a function JavaScript `await`s. Supported return types mirror async functions: `ConvertibleToJSValue` types, `@JS struct`, raw-value / case-only enums, `Void`, and their `Optional` / `Array` / `Dictionary` compositions. Unsupported async return types (associated-value enums, protocols, namespace enums) are diagnosed at build time.
+
+```swift
+import JavaScriptKit
+
+@JS struct Point {
+    let x: Double
+    let y: Double
+}
+
+// Async closure returning a @JS struct
+@JS func makePointLoader() -> JSTypedClosure<(Double, Double) async -> Point> {
+    let loader = JSTypedClosure<(Double, Double) async -> Point> { x, y in
+        try? await Task.sleep(nanoseconds: 10_000_000)
+        return Point(x: x, y: y)
+    }
+    return loader
+}
+
+// Async closure returning Void
+@JS func makeLogger() -> JSTypedClosure<(String) async -> Void> {
+    return JSTypedClosure<(String) async -> Void> { message in
+        try? await Task.sleep(nanoseconds: 10_000_000)
+        print(message)
+    }
+}
+```
+
+```javascript
+const loadPoint = exports.makePointLoader();
+const point = await loadPoint(1, 2); // Promise<Point>
+console.log(point.x, point.y);       // 1 2
+loadPoint.release();
+
+const log = exports.makeLogger();
+await log("hello"); // Promise<void>
+log.release();
+```
+
+The generated TypeScript declarations:
+
+```typescript
+export type Exports = {
+    makePointLoader(): (arg0: number, arg1: number) => Promise<Point>;
+    makeLogger(): (arg0: string) => Promise<void>;
+}
+```
+
+Notes:
+- The same `JavaScriptEventLoop.installGlobalExecutor()` requirement applies as for async functions; there is no special handling for closures.
+- **Cancellation is a non-goal.** There is no propagation between a Swift `Task` and a JavaScript `Promise` in either direction; cancelling one side does not cancel the other.
+
+
+
 ## Supported Features
 
 | Swift Feature | Status |
@@ -112,8 +250,9 @@ When you **return** a closure to JavaScript, we recommend using ``JSTypedClosure
 | `@escaping` closures | ✅ |
 | Optional types in closures |  ✅ |
 | Closure-typed `@JS` properties | ❌ |
-| Async closures | ❌ |
-| Throwing closures | ❌ |
+| Async closures `(A) async -> B` | ✅ |
+| Async throwing closures `(A) async throws(JSException) -> B` | ✅ |
+| Throwing closures `(A) throws(JSException) -> B` | ✅ |
 
 ## See Also
 
diff --git a/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift/Exporting-Swift-Custom-Representation.md b/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift/Exporting-Swift-Custom-Representation.md
new file mode 100644
index 000000000..7d3826e01
--- /dev/null
+++ b/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift/Exporting-Swift-Custom-Representation.md
@@ -0,0 +1,114 @@
+# Exporting a Type With a Custom JS Representation
+
+Learn how to give a Swift type a different representation on the JavaScript side using `@JS(as:)`.
+
+## Overview
+
+> Tip: You can quickly preview what interfaces will be exposed on the Swift/JavaScript/TypeScript sides using the [BridgeJS Playground](https://swiftwasm.org/JavaScriptKit/PlayBridgeJS/).
+
+BridgeJS picks a sensible default representation for each exported type - structs cross by copy, classes by reference, and so on. Sometimes that default is a poor fit:
+
+- A struct copied at the boundary is expensive when it holds a large payload (for example a polygon with thousands of vertices).
+- A type uses a feature BridgeJS does not export directly (for example a dictionary with integer keys).
+
+`@JS(as:)` is the escape hatch. It lets a Swift type keep its idiomatic shape while being bridged to JavaScript through a different `@JS` type that you control, without duplicating the surrounding API.
+
+Mark the type with `@JS(as: OtherType.self)` and provide two conversions:
+
+```swift
+import JavaScriptKit
+
+@JS(as: JSPolygon.self) struct Polygon {
+    var vertices: [Point]
+
+    consuming func bridgeToJS() -> JSPolygon {
+        JSPolygon(underlying: self)
+    }
+
+    static func bridgeFromJS(_ value: consuming JSPolygon) -> Polygon {
+        value.underlying
+    }
+}
+
+@JS final class JSPolygon {
+    var underlying: Polygon
+
+    @JS init(underlying: Polygon) {
+        self.underlying = underlying
+    }
+
+    @JS var vertexCount: Int { underlying.vertices.count }
+}
+
+@JS func merge(_ a: Polygon, _ b: Polygon) -> Polygon
+```
+
+Existing Swift code keeps using the idiomatic `Polygon`. Anywhere `Polygon` crosses the boundary - parameters, return values, optionals, arrays - BridgeJS substitutes `JSPolygon`, so JavaScript sees the reference type and avoids copying.
+
+The generated TypeScript declarations refer to the representation type:
+
+```typescript
+export interface JSPolygon extends SwiftHeapObject {
+    readonly vertexCount: number;
+}
+
+export type Exports = {
+    JSPolygon: {
+        new(underlying: JSPolygon): JSPolygon;
+    }
+    merge(a: JSPolygon, b: JSPolygon): JSPolygon;
+}
+```
+
+## The Bridging Contract
+
+A type marked `@JS(as: R.self)` must provide both halves of the conversion to and from its representation `R`:
+
+```swift
+consuming func bridgeToJS() -> R
+static func bridgeFromJS(_ value: consuming R) -> Self
+```
+
+BridgeJS inserts a call to `bridgeToJS()` at the first opportunity when a value leaves Swift, and `bridgeFromJS(_:)` at the last opportunity when one enters. The rest of the generated glue just uses `R`'s ABI, so the conversions are the only code you write.
+
+## Wrapping a Primitive
+
+The representation does not have to be a class. A small wrapper over a primitive is a common case - for example exposing a strongly-typed identifier as a plain string:
+
+```swift
+@JS(as: String.self) struct UUID {
+    var rawValue: String
+
+    consuming func bridgeToJS() -> String { rawValue }
+    static func bridgeFromJS(_ value: consuming String) -> UUID { UUID(rawValue: value) }
+}
+
+@JS func currentUser() -> UUID
+```
+
+JavaScript sees a `string`, while Swift keeps the distinct `UUID` type.
+
+## Supported Representations
+
+The representation type (the `as:` target) must itself be a type BridgeJS can export by value or reference:
+
+| Representation | Status |
+|:---------------|:-------|
+| `@JS class` | ✅ |
+| `@JSClass` (imported) | ✅ |
+| `@JS struct` | ✅ |
+| Primitives (`Int`, `Double`, `Float`, `Bool`, `String`) | ✅ |
+| `JSValue` | ✅ |
+| Case enums and associated-value enums | ✅ |
+| Raw-value enums | ❌ |
+| `@JS protocol` | ❌ |
+| Another `@JS(as:)` type (chained aliases) | ❌ |
+| Closures, arrays, dictionaries, optionals as the direct target | ❌ |
+
+`@JS(as:)` cannot be combined with `namespace:` - an aliased type adopts its representation's placement.
+
+## See Also
+
+- <doc:Exporting-Swift-Struct>
+- <doc:Exporting-Swift-Class>
+- <doc:Supported-Types>
diff --git a/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift/Exporting-Swift-Function.md b/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift/Exporting-Swift-Function.md
index c26841041..098a931af 100644
--- a/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift/Exporting-Swift-Function.md
+++ b/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift/Exporting-Swift-Function.md
@@ -37,6 +37,27 @@ export type Exports = {
 }
 ```
 
+### Renaming functions in JavaScript
+
+If a different name is more appropriate in JavaScript or to export multiple overloaded Swift functions with distinct JavaScript names, you can pass a JavaScript identifier as the first argument to `@JS`.
+
+```swift
+import JavaScriptKit
+
+@JS("greetName") public func greet(_ name: String) -> String {
+    return "Hello, \(name)!"
+}
+
+@JS("greetPerson") public func greet(_ person: Person) -> String {
+    return "Hello, \(person.name)!"
+}
+```
+
+```javascript
+exports.greetName("World");
+exports.greetPerson({ name: "World" });
+```
+
 ### Throwing functions
 
 Swift functions can throw JavaScript errors using `throws(JSException)`.
diff --git a/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Generating-from-TypeScript.md b/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Generating-from-TypeScript.md
index 9c0a80dc1..5a47746d6 100644
--- a/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Generating-from-TypeScript.md
+++ b/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Generating-from-TypeScript.md
@@ -416,4 +416,4 @@ When a TypeScript name is not a valid Swift identifier (e.g. contains dashes, sp
 ## Limitations
 
 - No first-class support for async/Promise-returning functions;.
-- No generic type parameter can appear on a bridged function signature.
\ No newline at end of file
+- No generic type parameter can appear on a bridged function signature generated from TypeScript; a type parameter is lowered to `JSObject`. Generic imports are available only through `@JSFunction` declarations written in Swift — see <doc:Importing-JS-Function>.
\ No newline at end of file
diff --git a/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Importing-JavaScript-into-Swift.md b/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Importing-JavaScript-into-Swift.md
index 14fccbfc1..c6818b923 100644
--- a/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Importing-JavaScript-into-Swift.md
+++ b/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Importing-JavaScript-into-Swift.md
@@ -8,7 +8,7 @@ Learn how to make JavaScript APIs callable from your Swift code using macro-anno
 
 > Tip: You can quickly preview what interfaces will be exposed on the Swift/JavaScript/TypeScript sides using the [BridgeJS Playground](https://swiftwasm.org/JavaScriptKit/PlayBridgeJS/).
 
-You can import JavaScript APIs into Swift in two ways:
+You can define JavaScript bindings for Swift in two ways:
 
 1. **Annotate Swift with macros** - Use `@JSFunction`, `@JSClass`, `@JSGetter`, and `@JSSetter` to declare bindings directly in Swift. No TypeScript required. Prefer this to get started.
 2. **Generate bindings from TypeScript** - Use a `bridge-js.d.ts` file; the BridgeJS plugin generates the same macro-annotated Swift. See <doc:Generating-from-TypeScript> when you have existing `.d.ts` definitions or many APIs to bind.
@@ -25,10 +25,13 @@ Add the BridgeJS plugin and enable the Extern feature as described in <doc:Setti
 
 Create Swift declarations that mirror the JavaScript API you want to call.
 
-You can bring JavaScript into Swift in two ways:
+You can bring JavaScript into Swift in three ways:
 
 - **Inject at initialization**: Declare in Swift and supply the implementation in `getImports()` (e.g. a `today()` function).
 - **Import from `globalThis`**: For APIs on the JavaScript global object (e.g. `console`, `document`), use `@JSGetter(from: .global)` so they are read from `globalThis` and you don't pass them in `getImports()`.
+- **Ship an ECMAScript module**: Use `from: .snippet("/path/from/target/root.js")` on a top-level function/getter or `@JSClass`. The leading `/` denotes the Swift target root; it is not a filesystem-absolute path. BridgeJS copies the referenced file into the generated package, so it is not supplied through `getImports()`.
+
+Exclude the directory containing `.js` or `.mjs` modules from the Swift target to avoid SwiftPM's unhandled-file warning. See <doc:Importing-JS-Function> for an example.
 
 ```swift
 import JavaScriptKit
@@ -95,4 +98,4 @@ exports.run();
 
 - <doc:Importing-JS-Function>
 - <doc:Importing-JS-Class>
-- <doc:Importing-JS-Variable>
\ No newline at end of file
+- <doc:Importing-JS-Variable>
diff --git a/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Importing-JavaScript/Importing-JS-Class.md b/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Importing-JavaScript/Importing-JS-Class.md
index 4302e0e49..7c6ae5a03 100644
--- a/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Importing-JavaScript/Importing-JS-Class.md
+++ b/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Importing-JavaScript/Importing-JS-Class.md
@@ -24,6 +24,40 @@ import JavaScriptKit
 
 If the class is on `globalThis`, add `from: .global` to `@JSClass` and omit the type from `getImports()` in the next step.
 
+For a class shipped as an ECMAScript module, put the origin on `@JSClass`:
+
+```javascript
+// JavaScript/greeter.js
+export class Greeter {
+    constructor(name) { this.name = name; }
+    static named(name) { return new Greeter(name); }
+    greet() { return `Hello, ${this.name}!`; }
+}
+```
+
+```swift
+@JSClass(from: .snippet("/JavaScript/greeter.js"))
+struct Greeter {
+    @JSFunction init(_ name: String) throws(JSException)
+    @JSFunction static func named(_ name: String) throws(JSException) -> Greeter
+    @JSFunction func greet() throws(JSException) -> String
+}
+```
+
+To wrap a class exported by an installed npm package, use `from: .module(...)`. Pass `jsName: .default` when the class is the module's default export:
+
+```swift
+@JSClass(jsName: "File", from: .module("@bjorn3/browser_wasi_shim"))
+struct WasiFile {
+    @JSFunction init(_ data: JSObject) throws(JSException)
+    @JSGetter var size: Int64
+}
+```
+
+Nothing is copied for these, and you are responsible for making them resolvable at load time; see <doc:Unsupported-Features>.
+
+The path's leading `/` denotes the Swift target root, not the filesystem root. The module's named class export is the root for construction and static methods. Instance methods, getters, and setters operate on the wrapped object and must not specify their own `from:` argument. Use `jsName` on `@JSClass` to select a differently named class export. JavaScript inheritance may be implemented normally in the module; the Swift declaration describes the API visible on the exported class and its instances.
+
 ### 2. Wire the JavaScript side
 
 **If you chose injection:** Implement the class in JavaScript and pass it in `getImports()`.
@@ -47,7 +81,7 @@ const { exports } = await init({
 });
 ```
 
-**If you chose global:** Do not pass the class in `getImports()`; the runtime will resolve it from `globalThis`.
+**If you chose global or module-backed lookup:** Do not pass the class in `getImports()`; the runtime resolves it from `globalThis` or the copied module.
 
 ## Macro options
 
diff --git a/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Importing-JavaScript/Importing-JS-Function.md b/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Importing-JavaScript/Importing-JS-Function.md
index 64475acfa..ebc9ac857 100644
--- a/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Importing-JavaScript/Importing-JS-Function.md
+++ b/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Importing-JavaScript/Importing-JS-Function.md
@@ -17,6 +17,42 @@ import JavaScriptKit
 
 To bind a function that lives on the JavaScript global object (e.g. `parseInt`, `setTimeout`), add `from: .global`. Use `jsName` when the Swift name differs from the JavaScript name - see the ``JSFunction(jsName:from:)`` API reference for options.
 
+To ship the function with the Swift target, put it in a `.js` or `.mjs` ECMAScript module and use a target-rooted path:
+
+```javascript
+// JavaScript/math.js
+export function add(a, b) { return a + b; }
+```
+
+```swift
+@JSFunction(from: .snippet("/JavaScript/math.js"))
+func add(_ a: Double, _ b: Double) throws(JSException) -> Double
+```
+
+The leading `/` denotes the Swift target root, not the filesystem root. BridgeJS copies explicitly referenced modules into the generated PackageToJS package. Multiple declarations may reference the same file; it is copied and imported only once. `jsName` selects a differently named export, otherwise BridgeJS uses the normalized Swift name.
+
+To call a Node builtin or an installed npm package instead, use `from: .module(...)`. The specifier is passed to the JavaScript module resolver verbatim:
+
+```swift
+@JSFunction(jsName: "basename", from: .module("node:path"))
+func basename(_ path: String) throws(JSException) -> String
+
+@JSFunction(jsName: "chunk", from: .module("lodash/fp"))
+func chunk(_ input: JSObject, _ size: Int) throws(JSException) -> JSObject
+```
+
+Nothing is copied for these, and you are responsible for making them resolvable at load time; see <doc:Unsupported-Features> for what that entails. To call the module's default export instead of a named one, pass `jsName: .default`.
+
+SwiftPM does not know what to do with `.js`/`.mjs` files inside a target, so exclude the directory holding them to avoid an "unhandled files" warning:
+
+```swift
+.target(
+    name: "MyApp",
+    exclude: ["JavaScript"],
+    plugins: [.plugin(name: "BridgeJS", package: "JavaScriptKit")]
+)
+```
+
 ### 2. Provide the implementation at initialization
 
 Return the corresponding function(s) in the object passed to `getImports()` when initializing the WebAssembly module.
@@ -35,17 +71,29 @@ const { exports } = await init({
 });
 ```
 
-If you used `from: .global`, do not pass the function in `getImports()`; the runtime resolves it from `globalThis`.
+If you used `from: .global` or `.module`, do not pass the function in `getImports()`. Module-only bindings do not require `getImports()` at all.
 
 ### 3. Handle errors
 
 Bound functions are `throws(JSException)`. Call them with `try` or `try?`; they throw when the JavaScript implementation throws.
 
+## Generic functions
+
+A `@JSFunction` can be generic over a type parameter constrained to `BridgedSwiftGenericBridgeable`, so one declaration serves every bridged type:
+
+```swift
+@JSFunction func parse<T: BridgedSwiftGenericBridgeable>(_ json: String) throws(JSException) -> T
+
+let user: User = try parse(jsonString)   // T inferred from the call site
+```
+
+`T` can be any supported primitive, `String`, `JSValue`, or a `@JS` struct, `@JS` enum, or `final @JS class` (see <doc:Supported-Types>), used bare or wrapped as `[T]`, `T?`, or `[String: T]`. A function may declare multiple type parameters, and a return-only generic (`func make<T>() -> T`) works too. Generic initializers, methods, and static methods on `@JSClass` types are supported the same way. `async` generic functions and `where` clauses are not supported.
+
 ## Supported features
 
 | Feature | Status |
 |:--|:--|
 | Primitive parameter/result types (e.g. `Double`, `Bool`) | ✅ |
 | `String` parameter/result type | ✅ |
+| Generic parameter/result types (constrained to `BridgedSwiftGenericBridgeable`) | ✅ |
 | Async function | ❌ |
-| Generics | ❌ |
diff --git a/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Importing-JavaScript/Importing-JS-Variable.md b/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Importing-JavaScript/Importing-JS-Variable.md
index 044ebbe52..3a92a690e 100644
--- a/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Importing-JavaScript/Importing-JS-Variable.md
+++ b/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Importing-JavaScript/Importing-JS-Variable.md
@@ -17,6 +17,32 @@ import JavaScriptKit
 
 To bind a variable that is not on `globalThis`, omit `from: .global` and supply the value in `getImports()` in the next step. Use `jsName` when the Swift name differs from the JavaScript property name - see the ``JSGetter(jsName:from:)`` API reference.
 
+A top-level getter can also read a named export from a target-rooted module:
+
+```javascript
+// JavaScript/config.js
+export const environment = "production";
+```
+
+```swift
+@JSGetter(jsName: "environment", from: .snippet("/JavaScript/config.js"))
+var currentEnvironment: String
+```
+
+The path's leading `/` denotes the Swift target root, not the filesystem root. Module exports are read-only through this API. Top-level `@JSSetter` remains unsupported.
+
+A getter can also read from an external module with `from: .module(...)`, covering Node builtins and installed npm packages. Pass `jsName: .default` to read the module's default export, which is how many npm packages expose their main value:
+
+```swift
+@JSGetter(jsName: "version", from: .module("some-package"))
+var packageVersion: String
+
+@JSGetter(jsName: .default, from: .module("some-package"))
+var packageDefault: JSObject
+```
+
+Nothing is copied for these, and you are responsible for making them resolvable at load time; see <doc:Unsupported-Features>.
+
 ### 2. Add a setter for writable variables (optional)
 
 If the JavaScript property is writable and you need to set it from Swift, add a corresponding `@JSSetter` function. Property setters are exposed as functions (e.g. `setMyConfig(_:)`) because Swift property setters cannot `throw`.
@@ -28,7 +54,7 @@ If the JavaScript property is writable and you need to set it from Swift, add a
 
 ### 3. Provide the value at initialization (injected only)
 
-If you did **not** use `from: .global`, pass the value in the object returned by `getImports()` when initializing the WebAssembly module.
+If you omitted `from`, pass the value in the object returned by `getImports()` when initializing the WebAssembly module.
 
 ```javascript
 // index.js
@@ -43,13 +69,14 @@ const { exports } = await init({
 });
 ```
 
-If you used `from: .global`, do not pass the variable in `getImports()`; the runtime reads it from `globalThis`.
+If you used `from: .global` or `.module`, do not pass the variable in `getImports()`; the runtime resolves it from `globalThis` or the copied module.
 
 ## Supported features
 
 | Feature | Status |
 |:--|:--|
 | Read-only global (e.g. `document`, `console`) | ✅ |
+| Read-only module export | ✅ |
 | Writable global | ✅ (`@JSSetter`) |
 | Injected variable (via `getImports()`) | ✅ |
 
diff --git a/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Supported-Types.md b/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Supported-Types.md
index 5c609ab72..539f7ce15 100644
--- a/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Supported-Types.md
+++ b/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Supported-Types.md
@@ -31,6 +31,10 @@ When using `JSTypedArray<T>` (or convenience typealiases) in `@JS` signatures, t
 
 See <doc:Exporting-Swift-Array> for usage details.
 
+## Generic type parameters
+
+An imported `@JSFunction` can be generic over a type parameter constrained to `BridgedSwiftGenericBridgeable` (see <doc:Importing-JS-Function>); exported `@JS` functions cannot yet. The constraint is satisfied by all supported primitives, `String`, `JSValue`, and any `@JS` struct, `@JS` enum, or `final @JS class`, including ones from another linked module. Do not write the conformance by hand; marking the type `@JS` is what provides it, together with the JavaScript side of the bridge.
+
 ## See Also
 
 - <doc:Generating-from-TypeScript>
diff --git a/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Unsupported-Features.md b/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Unsupported-Features.md
index 83213aca1..74588b06b 100644
--- a/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Unsupported-Features.md
+++ b/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Unsupported-Features.md
@@ -6,6 +6,27 @@ Limitations and unsupported patterns when using BridgeJS.
 
 BridgeJS generates glue code per Swift target (module). Some patterns that are valid in Swift or TypeScript are not supported across the bridge today. This article summarizes the main limitations so you can design your APIs accordingly.
 
+## JavaScript modules
+
+Two origins read from an ECMAScript module, and which one you use depends on who owns the JavaScript.
+
+`JSImportFrom.snippet` names a JavaScript file you ship inside the Swift target, such as `.snippet("/Modules/utils.mjs")`. The path must begin with `/` and end in `.js` or `.mjs`. That leading slash denotes the Swift target root, not the filesystem root, and the file must remain within that Swift target. Only explicitly referenced files are copied into the generated package. BridgeJS does not discover or rewrite a snippet's dependency graph, so snippets should currently be self-contained.
+
+`JSImportFrom.module` names an external module resolved by the JavaScript host — for example `.module("node:path")`, `.module("lodash/fp")`, or `.module("@scope/package")`. Because resolution is host-defined, BridgeJS deliberately performs no build-time validation of these specifiers beyond rejecting the empty string, relative specifiers (`./x`, `../x`), and rooted paths (which are snippets). This has several consequences you are responsible for:
+
+- Importing a `node:`-prefixed builtin makes the generated package Node-only. It will fail to load in a browser.
+- An npm package must be resolvable at load time — either from the generated output directory (Node walks up to the nearest `node_modules`), or through your bundler's aliasing or an import map.
+- BridgeJS does not add anything to the generated `package.json`. Installing the dependency is up to you, and no version is inferred.
+- A specifier is not verified to exist until the JavaScript host loads the generated module, so a typo surfaces as a resolution error from your JavaScript toolchain rather than a Swift compile error.
+
+Generated packages use static ECMAScript module imports. This works with the existing PackageToJS browser and Node ESM entry points. CommonJS and classic non-module script output are not generated or translated. Note that named exports of a CommonJS package are only importable when Node can statically detect them; when in doubt, use `jsName: .default` and reach members through the default export.
+
+A module export is called through a named import, so `this` is `undefined` inside the called function rather than the module namespace object. A function that reaches sibling exports through `this` — which happens in CommonJS packages consumed through Node's ESM interop — will fail. Import the default export and call the member through it when a package needs that receiver.
+
+Both origins apply to top-level `@JSFunction`, top-level `@JSGetter`, and an entire `@JSClass`. Per-member origins, top-level setters, inline JavaScript source, package-root-relative paths, and per-member overrides are not supported. `jsName: .default` is likewise only valid on those three declaration forms and only together with `from: .module(...)` or `from: .snippet(...)`; it cannot be used on `@JSSetter`, because ECMAScript module bindings are read-only.
+
+The TypeScript-definition workflow (`bridge-js.d.ts`) always imports from `globalThis` and cannot yet target a snippet or module origin. To import from either, declare the API with the macros instead.
+
 ## Type usage crossing module boundary
 
 ### Exporting Swift: extending types from another Swift module
diff --git a/Sources/JavaScriptKit/FundamentalObjects/JSObject.swift b/Sources/JavaScriptKit/FundamentalObjects/JSObject.swift
index 1b6facada..7bc799c64 100644
--- a/Sources/JavaScriptKit/FundamentalObjects/JSObject.swift
+++ b/Sources/JavaScriptKit/FundamentalObjects/JSObject.swift
@@ -22,7 +22,7 @@ public class JSObject: Equatable, ExpressibleByDictionaryLiteral {
     @usableFromInline
     internal var _id: JavaScriptObjectRef
 
-    #if compiler(>=6.1) && _runtime(_multithreaded)
+    #if _runtime(_multithreaded)
     package let ownerTid: Int32
     #endif
 
@@ -35,7 +35,7 @@ public class JSObject: Equatable, ExpressibleByDictionaryLiteral {
     @_spi(BridgeJS)
     public init(id: JavaScriptObjectRef) {
         self._id = id
-        #if compiler(>=6.1) && _runtime(_multithreaded)
+        #if _runtime(_multithreaded)
         self.ownerTid = swjs_get_worker_thread_id_cached()
         #endif
     }
@@ -61,7 +61,7 @@ public class JSObject: Equatable, ExpressibleByDictionaryLiteral {
     /// is a programmer error and will result in a runtime assertion failure because JavaScript
     /// object spaces are not shared across threads backed by Web Workers.
     private func assertOnOwnerThread(hint: @autoclosure () -> String) {
-        #if compiler(>=6.1) && _runtime(_multithreaded)
+        #if _runtime(_multithreaded)
         precondition(
             ownerTid == swjs_get_worker_thread_id_cached(),
             "JSObject is being accessed from a thread other than the owner thread: \(hint())"
@@ -71,7 +71,7 @@ public class JSObject: Equatable, ExpressibleByDictionaryLiteral {
 
     /// Asserts that the two objects being compared are owned by the same thread.
     private static func assertSameOwnerThread(lhs: JSObject, rhs: JSObject, hint: @autoclosure () -> String) {
-        #if compiler(>=6.1) && _runtime(_multithreaded)
+        #if _runtime(_multithreaded)
         precondition(
             lhs.ownerTid == rhs.ownerTid,
             "JSObject is being accessed from a thread other than the owner thread: \(hint())"
@@ -282,7 +282,7 @@ public class JSObject: Equatable, ExpressibleByDictionaryLiteral {
     })
 
     deinit {
-        #if compiler(>=6.1) && _runtime(_multithreaded)
+        #if _runtime(_multithreaded)
         if ownerTid != swjs_get_worker_thread_id_cached() {
             // If the object is not owned by the current thread
             swjs_release_remote(ownerTid, id)
diff --git a/Sources/JavaScriptKit/JSException.swift b/Sources/JavaScriptKit/JSException.swift
index 4d95e207d..84232163c 100644
--- a/Sources/JavaScriptKit/JSException.swift
+++ b/Sources/JavaScriptKit/JSException.swift
@@ -13,38 +13,66 @@
 /// }
 /// ```
 public struct JSException: Error, Equatable, CustomStringConvertible {
-    /// The value thrown from JavaScript.
-    /// This can be any JavaScript value (error object, string, number, etc.).
-    public var thrownValue: JSValue {
-        return _thrownValue
+    /// Boxes the exception payload in a class so `JSException` stays within the direct
+    /// typed-error convention on wasm32.
+    private final class Storage {
+        /// The actual JavaScript value that was thrown.
+        let thrownValue: JSValue
+
+        /// A description of the exception.
+        let description: String
+
+        /// The stack trace of the exception.
+        let stack: String?
+
+        init(thrownValue: JSValue, description: String, stack: String?) {
+            self.thrownValue = thrownValue
+            self.description = description
+            self.stack = stack
+        }
     }
 
-    /// The actual JavaScript value that was thrown.
+    /// The boxed payload of the exception.
     ///
     /// Marked as `nonisolated(unsafe)` to satisfy `Sendable` requirement
     /// from `Error` protocol.
-    private nonisolated(unsafe) let _thrownValue: JSValue
+    private nonisolated(unsafe) let storage: Storage
+
+    /// The value thrown from JavaScript.
+    /// This can be any JavaScript value (error object, string, number, etc.).
+    public var thrownValue: JSValue {
+        return storage.thrownValue
+    }
 
     /// A description of the exception.
-    public let description: String
+    public var description: String {
+        return storage.description
+    }
 
     /// The stack trace of the exception.
-    public let stack: String?
+    public var stack: String? {
+        return storage.stack
+    }
 
     /// Initializes a new JSException instance with a value thrown from JavaScript.
     ///
     /// Only available within the package. This must be called on the thread where the exception object created.
+    /// The stringified representation is captured on the object owner thread to bring useful info
+    /// to the catching thread even if they are different threads.
     @usableFromInline
     package init(_ thrownValue: JSValue) {
-        self._thrownValue = thrownValue
-        // Capture the stringified representation on the object owner thread
-        // to bring useful info to the catching thread even if they are different threads.
         if let errorObject = thrownValue.object, let stack = errorObject.stack.string {
-            self.description = "JSException(\(stack))"
-            self.stack = stack
+            self.storage = Storage(
+                thrownValue: thrownValue,
+                description: "JSException(\(stack))",
+                stack: stack
+            )
         } else {
-            self.description = "JSException(\(thrownValue))"
-            self.stack = nil
+            self.storage = Storage(
+                thrownValue: thrownValue,
+                description: "JSException(\(thrownValue))",
+                stack: nil
+            )
         }
     }
 
@@ -55,4 +83,10 @@ public struct JSException: Error, Equatable, CustomStringConvertible {
     public init(message: String) {
         self.init(JSError(message: message).jsValue)
     }
+
+    public static func == (lhs: JSException, rhs: JSException) -> Bool {
+        return lhs.storage.thrownValue == rhs.storage.thrownValue
+            && lhs.storage.description == rhs.storage.description
+            && lhs.storage.stack == rhs.storage.stack
+    }
 }
diff --git a/Sources/JavaScriptKit/Macros.swift b/Sources/JavaScriptKit/Macros.swift
index 3189cdeab..a1cdc0c44 100644
--- a/Sources/JavaScriptKit/Macros.swift
+++ b/Sources/JavaScriptKit/Macros.swift
@@ -9,8 +9,45 @@ public enum JSEnumStyle: String {
 /// Controls where BridgeJS reads imported JS values from.
 ///
 /// - `global`: Read from `globalThis`.
-public enum JSImportFrom: String {
+/// - `snippet`: Read from a JavaScript file shipped inside the Swift target.
+/// - `module`: Read from an external ECMAScript module.
+public enum JSImportFrom {
     case global
+    /// Read from a JavaScript file that ships with the Swift target.
+    ///
+    /// The path is rooted at the Swift target directory and must begin with `/`
+    /// and end in `.js` or `.mjs`, e.g. `.snippet("/Modules/utils.mjs")`. The
+    /// leading `/` denotes the target root, not the filesystem root, and the file
+    /// must exist inside that target. BridgeJS copies referenced files into the
+    /// generated package.
+    case snippet(String)
+    /// Read from an external ECMAScript module, resolved by the JavaScript host.
+    ///
+    /// The value is passed to the module resolver verbatim, which covers Node
+    /// built-in modules and installed packages, e.g. `.module("node:path")`,
+    /// `.module("lodash/fp")`, or `.module("@scope/package")`. Nothing is copied
+    /// for these, and making them resolvable at load time is up to you.
+    ///
+    /// To reference a file in your own target, use ``JSImportFrom/snippet(_:)``.
+    case module(String)
+}
+
+/// Names the JavaScript member that an imported declaration refers to.
+///
+/// A string literal is accepted directly, so `jsName: "basename"` means
+/// ``JSName/name(_:)`` with that value.
+public enum JSName: ExpressibleByStringLiteral {
+    /// A member looked up by name.
+    case name(String)
+    /// The default export of an ECMAScript module.
+    ///
+    /// Only valid on a top-level `@JSFunction`, `@JSGetter`, or `@JSClass`
+    /// that also specifies `from: .module(...)` or `from: .snippet(...)`.
+    case `default`
+
+    public init(stringLiteral value: String) {
+        self = .name(value)
+    }
 }
 
 /// A macro that exposes Swift functions, classes, and methods to JavaScript.
@@ -103,6 +140,7 @@ public enum JSImportFrom: String {
 ///
 /// For detailed usage information, see the article <doc:Exporting-Swift-to-JavaScript>.
 ///
+/// - Parameter name: A different name to use in the exported JavaScript.
 /// - Parameter namespace: A dot-separated string that defines the namespace hierarchy in JavaScript.
 ///                        Each segment becomes a nested object in the resulting JavaScript structure.
 /// - Parameter enumStyle: Controls how enums are emitted to TypeScript for this declaration:
@@ -113,8 +151,13 @@ public enum JSImportFrom: String {
 ///
 /// - Important: This feature is still experimental. No API stability is guaranteed, and the API may change in future releases.
 @attached(peer)
-public macro JS(namespace: String? = nil, enumStyle: JSEnumStyle = .const, identityMode: Bool = false) =
-    Builtin.ExternalMacro
+public macro JS(
+    _ name: String? = nil,
+    as aliasOf: Any.Type? = nil,
+    namespace: String? = nil,
+    enumStyle: JSEnumStyle = .const,
+    identityMode: Bool = false
+) = Builtin.ExternalMacro
 
 /// A macro that generates a Swift getter that reads a value from JavaScript.
 ///
@@ -137,8 +180,11 @@ public macro JS(namespace: String? = nil, enumStyle: JSEnumStyle = .const, ident
 ///
 /// - Parameter from: Selects where the property is read from.
 ///   Use `.global` to read from `globalThis` (e.g. `console`, `document`).
+///   Use `.snippet("/path/to/module.js")` to read a named export from a file rooted at the Swift target,
+///   or `.module("node:os")` to read a named export from an external module.
+///   Pass `jsName: .default` to read the module's default export.
 @attached(accessor)
-public macro JSGetter(jsName: String? = nil, from: JSImportFrom? = nil) =
+public macro JSGetter(jsName: JSName? = nil, from: JSImportFrom? = nil) =
     #externalMacro(module: "BridgeJSMacros", type: "JSGetterMacro")
 
 /// A macro that generates a Swift function body that writes a value to JavaScript.
@@ -156,7 +202,7 @@ public macro JSGetter(jsName: String? = nil, from: JSImportFrom? = nil) =
 /// @JSSetter func setName(_ value: String) throws (JSException)
 /// ```
 @attached(body)
-public macro JSSetter(jsName: String? = nil, from: JSImportFrom? = nil) =
+public macro JSSetter(jsName: JSName? = nil, from: JSImportFrom? = nil) =
     #externalMacro(module: "BridgeJSMacros", type: "JSSetterMacro")
 
 /// A macro that generates a Swift function body that calls a JavaScript function.
@@ -176,8 +222,11 @@ public macro JSSetter(jsName: String? = nil, from: JSImportFrom? = nil) =
 ///   If not provided, the Swift function name is used.
 /// - Parameter from: Selects where the function is looked up from.
 ///   Use `.global` to call a function on `globalThis` (e.g. `setTimeout`).
+///   Use `.snippet("/path/to/module.js")` to call a named export from a file rooted at the Swift target,
+///   or `.module("node:path")` to call a named export from an external module.
+///   Pass `jsName: .default` to call the module's default export.
 @attached(body)
-public macro JSFunction(jsName: String? = nil, from: JSImportFrom? = nil) =
+public macro JSFunction(jsName: JSName? = nil, from: JSImportFrom? = nil) =
     #externalMacro(module: "BridgeJSMacros", type: "JSFunctionMacro")
 
 /// A macro that adds bridging members for a Swift type that represents a JavaScript class.
@@ -200,7 +249,10 @@ public macro JSFunction(jsName: String? = nil, from: JSImportFrom? = nil) =
 ///
 /// - Parameter from: Selects where the constructor is looked up from.
 ///   Use `.global` to construct globals like `WebSocket` via `globalThis`.
+///   Use `.snippet("/path/to/module.js")` to construct a named class export from a file rooted at the Swift target,
+///   or `.module("@scope/package")` to construct a named class export from an external module.
+///   Pass `jsName: .default` to construct the module's default export.
 @attached(member, names: named(jsObject), named(init(unsafelyWrapping:)))
 @attached(extension, conformances: _JSBridgedClass)
-public macro JSClass(jsName: String? = nil, from: JSImportFrom? = nil) =
+public macro JSClass(jsName: JSName? = nil, from: JSImportFrom? = nil) =
     #externalMacro(module: "BridgeJSMacros", type: "JSClassMacro")
diff --git a/Sources/JavaScriptKit/ThreadLocal.swift b/Sources/JavaScriptKit/ThreadLocal.swift
index 12bf78773..4c8bac75f 100644
--- a/Sources/JavaScriptKit/ThreadLocal.swift
+++ b/Sources/JavaScriptKit/ThreadLocal.swift
@@ -17,7 +17,7 @@ import Glibc
 /// The value is stored in a thread-local variable, which is a separate copy for each thread.
 @propertyWrapper
 final class ThreadLocal<Value>: Sendable {
-    #if compiler(>=6.1) && _runtime(_multithreaded)
+    #if _runtime(_multithreaded)
     /// The wrapped value stored in the thread-local storage.
     /// The initial value is `nil` for each thread.
     var wrappedValue: Value? {
diff --git a/Tests/BridgeJSGlobalTests/Generated/BridgeJS.swift b/Tests/BridgeJSGlobalTests/Generated/BridgeJS.swift
index 4e35a1c9f..91638a428 100644
--- a/Tests/BridgeJSGlobalTests/Generated/BridgeJS.swift
+++ b/Tests/BridgeJSGlobalTests/Generated/BridgeJS.swift
@@ -353,4 +353,38 @@ fileprivate func _bjs_GlobalUtils_PublicConverter_wrap_extern(_ pointer: UnsafeM
 #endif
 @inline(never) fileprivate func _bjs_GlobalUtils_PublicConverter_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 {
     return _bjs_GlobalUtils_PublicConverter_wrap_extern(pointer)
-}
\ No newline at end of file
+}
+
+extension GlobalNetworking.API.CallMethod: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = GlobalNetworking.API.CallMethod.bridgeJSMakeTypeHandle()
+}
+
+extension GlobalConfiguration.PublicLogLevel: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = GlobalConfiguration.PublicLogLevel.bridgeJSMakeTypeHandle()
+}
+
+extension GlobalConfiguration.AvailablePort: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = GlobalConfiguration.AvailablePort.bridgeJSMakeTypeHandle()
+}
+
+extension Internal.SupportedServerMethod: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = Internal.SupportedServerMethod.bridgeJSMakeTypeHandle()
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "bjs_BridgeJSGlobalTests_register_type_handles")
+fileprivate func _bjs_BridgeJSGlobalTests_register_type_handles_extern(_ base: UnsafePointer<Int32>?, _ count: Int32)
+
+@_expose(wasm, "bjs_BridgeJSGlobalTests_register_type_handles")
+public func _bjs_BridgeJSGlobalTests_register_type_handles() {
+    let typeIds: [Int32] = [
+        GlobalNetworking.API.CallMethod.bridgeJSTypeID,
+        GlobalConfiguration.PublicLogLevel.bridgeJSTypeID,
+        GlobalConfiguration.AvailablePort.bridgeJSTypeID,
+        Internal.SupportedServerMethod.bridgeJSTypeID,
+    ]
+    typeIds.withUnsafeBufferPointer { buffer in
+        _bjs_BridgeJSGlobalTests_register_type_handles_extern(buffer.baseAddress, Int32(buffer.count))
+    }
+}
+#endif
\ No newline at end of file
diff --git a/Tests/BridgeJSGlobalTests/Generated/JavaScript/BridgeJS.json b/Tests/BridgeJSGlobalTests/Generated/JavaScript/BridgeJS.json
index 5e9626840..48c0904bf 100644
--- a/Tests/BridgeJSGlobalTests/Generated/JavaScript/BridgeJS.json
+++ b/Tests/BridgeJSGlobalTests/Generated/JavaScript/BridgeJS.json
@@ -1,5 +1,8 @@
 {
   "exported" : {
+    "aliases" : [
+
+    ],
     "classes" : [
       {
         "constructor" : {
diff --git a/Tests/BridgeJSIdentityTests/Generated/JavaScript/BridgeJS.json b/Tests/BridgeJSIdentityTests/Generated/JavaScript/BridgeJS.json
index 56db0a3ed..53d837ece 100644
--- a/Tests/BridgeJSIdentityTests/Generated/JavaScript/BridgeJS.json
+++ b/Tests/BridgeJSIdentityTests/Generated/JavaScript/BridgeJS.json
@@ -1,5 +1,8 @@
 {
   "exported" : {
+    "aliases" : [
+
+    ],
     "classes" : [
       {
         "constructor" : {
diff --git a/Tests/BridgeJSIdentityTests/IdentityModeTests.swift b/Tests/BridgeJSIdentityTests/IdentityModeTests.swift
index 0aa036163..dacf85800 100644
--- a/Tests/BridgeJSIdentityTests/IdentityModeTests.swift
+++ b/Tests/BridgeJSIdentityTests/IdentityModeTests.swift
@@ -38,7 +38,9 @@ final class IdentityModeTests: XCTestCase {
         // let FinalizationRegistry fire and call deinit.
         for _ in 0..<100 {
             try gc()
-            try await Task.sleep(for: .milliseconds(0))
+            // Give the JS runtime an actual turn so FinalizationRegistry callbacks
+            // can run before we check the Swift weak reference.
+            try await Task.sleep(for: .milliseconds(1))
             if weakSubject == nil {
                 break
             }
diff --git a/Tests/BridgeJSRuntimeTests/AliasAPIs.swift b/Tests/BridgeJSRuntimeTests/AliasAPIs.swift
new file mode 100644
index 000000000..b6d637966
--- /dev/null
+++ b/Tests/BridgeJSRuntimeTests/AliasAPIs.swift
@@ -0,0 +1,379 @@
+import JavaScriptKit
+
+@JS(as: PolygonReference.self) struct Polygon {
+    var vertices: [Double]
+    var label: String
+
+    consuming func bridgeToJS() -> PolygonReference {
+        return PolygonReference(underlying: self)
+    }
+
+    static func bridgeFromJS(_ value: consuming PolygonReference) -> Polygon {
+        return value.underlying
+    }
+}
+
+@JS final class PolygonReference {
+    var underlying: Polygon
+
+    @JS init(verticesData: [Double], label: String) {
+        self.underlying = Polygon(vertices: verticesData, label: label)
+    }
+
+    init(underlying: Polygon) {
+        self.underlying = underlying
+    }
+
+    @JS func vertexCount() -> Int {
+        return underlying.vertices.count
+    }
+
+    @JS func summary() -> String {
+        return "\(underlying.label)(\(underlying.vertices.count))"
+    }
+
+    @JS func snapshot() -> Polygon {
+        return underlying
+    }
+
+    @JS func merge(_ other: Polygon) -> Polygon {
+        var combined = underlying
+        combined.vertices.append(contentsOf: other.vertices)
+        return combined
+    }
+
+    @JS static func origin(label: String) -> Polygon {
+        return Polygon(vertices: [], label: label)
+    }
+}
+
+@JS(as: TagReference.self) struct Tag {
+    var name: String
+
+    consuming func bridgeToJS() -> TagReference {
+        return TagReference(underlying: self)
+    }
+
+    static func bridgeFromJS(_ value: consuming TagReference) -> Tag {
+        return value.underlying
+    }
+}
+
+@JS final class TagReference {
+    var underlying: Tag
+
+    init(underlying: Tag) {
+        self.underlying = underlying
+    }
+
+    @JS func describe() -> String {
+        return "tag:\(underlying.name)"
+    }
+}
+
+@JS func makeTag(_ name: String) -> Tag {
+    return Tag(name: name)
+}
+
+@JS func roundTripPolygon(_ polygon: Polygon) -> Polygon {
+    return polygon
+}
+
+@JS func appendVertex(_ polygon: Polygon, _ value: Double) -> Polygon {
+    var copy = polygon
+    copy.vertices.append(value)
+    return copy
+}
+
+@JS func optionalRoundTripPolygon(_ polygon: Polygon?) -> Polygon? {
+    return polygon
+}
+
+@JS func polygonVertexCount(_ polygon: Polygon) -> Int {
+    return polygon.vertices.count
+}
+
+@JS func roundTripPolygonArray(_ polygons: [Polygon]) -> [Polygon] {
+    return polygons
+}
+
+@JS func concatPolygons(_ polygons: [Polygon]) -> Polygon {
+    var combined = Polygon(vertices: [], label: "concat")
+    for p in polygons {
+        combined.vertices.append(contentsOf: p.vertices)
+    }
+    return combined
+}
+
+@JS func validatePolygon(_ polygon: Polygon) throws(JSException) -> Polygon {
+    if polygon.vertices.isEmpty {
+        throw JSException(JSError(message: "empty polygon").jsValue)
+    }
+    return polygon
+}
+
+@JS func splitPolygon(_ polygon: Polygon) -> [Polygon] {
+    return polygon.vertices.map { Polygon(vertices: [$0], label: polygon.label) }
+}
+
+@JS func makePolygonInspector() -> (Polygon) -> Int {
+    return { polygon in polygon.vertices.count }
+}
+
+@JS func roundTripOptionalPolygonArray(_ polygons: [Polygon?]) -> [Polygon?] {
+    return polygons
+}
+
+@JS(as: TagHolderReference.self) struct TagHolder {
+    var tag: Tag
+    var version: Int
+
+    consuming func bridgeToJS() -> TagHolderReference {
+        return TagHolderReference(tag: tag, version: version)
+    }
+
+    static func bridgeFromJS(_ value: consuming TagHolderReference) -> TagHolder {
+        return TagHolder(tag: value.tag, version: value.version)
+    }
+}
+
+@JS final class TagHolderReference {
+    @JS var tag: Tag
+    @JS var version: Int
+
+    @JS init(tag: Tag, version: Int) {
+        self.tag = tag
+        self.version = version
+    }
+
+    @JS func describe() -> String {
+        return "holder(\(tag.name), v\(version))"
+    }
+}
+
+@JS func makeTagHolder(_ name: String, _ version: Int) -> TagHolder {
+    return TagHolder(tag: Tag(name: name), version: version)
+}
+
+@JS(as: JSCoordinate.self) struct Coordinate {
+    var latitude: Double
+    var longitude: Double
+
+    var hemisphere: String {
+        latitude >= 0 ? "northern" : "southern"
+    }
+
+    consuming func bridgeToJS() -> JSCoordinate {
+        return JSCoordinate(latitude: latitude, longitude: longitude)
+    }
+
+    static func bridgeFromJS(_ value: consuming JSCoordinate) -> Coordinate {
+        return Coordinate(latitude: value.latitude, longitude: value.longitude)
+    }
+}
+
+@JS struct JSCoordinate {
+    var latitude: Double
+    var longitude: Double
+
+    @JS init(latitude: Double, longitude: Double) {
+        self.latitude = latitude
+        self.longitude = longitude
+    }
+}
+
+@JS func roundTripCoordinate(_ coordinate: Coordinate) -> Coordinate {
+    return coordinate
+}
+
+@JS(as: PriorityReference.self) enum Priority {
+    case low, medium, high
+
+    consuming func bridgeToJS() -> PriorityReference {
+        return PriorityReference(underlying: self)
+    }
+
+    static func bridgeFromJS(_ value: consuming PriorityReference) -> Priority {
+        return value.underlying
+    }
+}
+
+@JS final class PriorityReference {
+    let underlying: Priority
+
+    init(underlying: Priority) {
+        self.underlying = underlying
+    }
+
+    @JS func describe() -> String {
+        switch underlying {
+        case .low: return "low"
+        case .medium: return "medium"
+        case .high: return "high"
+        }
+    }
+
+    @JS func weight() -> Int {
+        switch underlying {
+        case .low: return 1
+        case .medium: return 5
+        case .high: return 10
+        }
+    }
+
+    @JS static func low() -> Priority { return .low }
+    @JS static func medium() -> Priority { return .medium }
+    @JS static func high() -> Priority { return .high }
+}
+
+@JS func roundTripPriority(_ priority: Priority) -> Priority {
+    return priority
+}
+
+@JS(as: Severity.self) struct Alert {
+    let level: Severity
+
+    var requiresImmediateAction: Bool {
+        level == .error
+    }
+
+    consuming func bridgeToJS() -> Severity {
+        return level
+    }
+
+    static func bridgeFromJS(_ value: consuming Severity) -> Alert {
+        return Alert(level: value)
+    }
+}
+
+@JS enum Severity {
+    case notice, warning, error
+}
+
+@JS func roundTripAlert(_ alert: Alert) -> Alert {
+    return alert
+}
+
+@JS func makeAlert(_ level: Severity) -> Alert {
+    return Alert(level: level)
+}
+
+@JS enum Shape {
+    case polygon(Polygon)
+    case empty
+}
+
+@JS func roundTripShape(_ s: Shape) -> Shape {
+    return s
+}
+
+@JS func makeShapePolygon(_ polygon: Polygon) -> Shape {
+    return .polygon(polygon)
+}
+
+@JS func makeShapeEmpty() -> Shape {
+    return .empty
+}
+
+@JS(as: Int.self) struct UserId {
+    var rawValue: Int
+
+    consuming func bridgeToJS() -> Int {
+        return rawValue
+    }
+
+    static func bridgeFromJS(_ value: consuming Int) -> UserId {
+        return UserId(rawValue: value)
+    }
+}
+
+@JS func roundTripUserId(_ id: UserId) -> UserId {
+    return id
+}
+
+@JS func roundTripOptionalUserId(_ id: UserId?) -> UserId? {
+    return id
+}
+
+@JS func roundTripUserIdArray(_ ids: [UserId]) -> [UserId] {
+    return ids
+}
+
+// MARK: - Imports
+
+@JS(as: String.self) struct Tagged {
+    var raw: String
+
+    consuming func bridgeToJS() -> String {
+        return raw
+    }
+
+    static func bridgeFromJS(_ value: consuming String) -> Tagged {
+        return Tagged(raw: value)
+    }
+}
+
+@JSClass struct Surface {
+    @JSFunction init(_ label: String) throws(JSException)
+    @JSGetter var label: String
+}
+
+@JS(as: Surface.self) struct Canvas {
+    var label: String
+
+    consuming func bridgeToJS() -> Surface {
+        return try! Surface(label)
+    }
+
+    static func bridgeFromJS(_ value: consuming Surface) -> Canvas {
+        return Canvas(label: (try? value.label) ?? "")
+    }
+}
+
+@JS enum InnerTag {
+    case payload(Int)
+    case empty
+}
+
+@JS(as: InnerTag.self) struct AliasedTag {
+    var underlying: InnerTag
+
+    consuming func bridgeToJS() -> InnerTag {
+        return underlying
+    }
+
+    static func bridgeFromJS(_ value: consuming InnerTag) -> AliasedTag {
+        return AliasedTag(underlying: value)
+    }
+}
+
+@JS(as: JSValue.self) struct Boxed {
+    var value: JSValue
+
+    consuming func bridgeToJS() -> JSValue {
+        return value
+    }
+
+    static func bridgeFromJS(_ value: consuming JSValue) -> Boxed {
+        return Boxed(value: value)
+    }
+}
+
+@JS func roundTripBoxed(_ boxed: Boxed) -> Boxed {
+    return boxed
+}
+
+@JS func roundTripOptionalBoxed(_ boxed: Boxed?) -> Boxed? {
+    return boxed
+}
+
+@JSClass struct AliasImports {
+    @JSFunction static func jsRoundTripTagged(_ value: Tagged) throws(JSException) -> Tagged
+    @JSFunction static func jsRoundTripOptionalTagged(_ value: Tagged?) throws(JSException) -> Tagged?
+    @JSFunction static func jsProduceOptionalCanvas(_ label: String?) throws(JSException) -> Canvas?
+    @JSFunction static func jsRoundTripAliasedTags(_ values: [AliasedTag?]) throws(JSException) -> [AliasedTag?]
+    @JSFunction static func jsRoundTripPolygon(_ value: Polygon) throws(JSException) -> Polygon
+    @JSFunction static func jsRoundTripCoordinate(_ value: Coordinate) throws(JSException) -> Coordinate
+    @JSFunction static func jsRoundTripUserId(_ value: UserId) throws(JSException) -> UserId
+    @JSFunction static func jsRoundTripOptionalUserId(_ value: UserId?) throws(JSException) -> UserId?
+}
diff --git a/Tests/BridgeJSRuntimeTests/AliasTests.swift b/Tests/BridgeJSRuntimeTests/AliasTests.swift
new file mode 100644
index 000000000..d1f0b40a8
--- /dev/null
+++ b/Tests/BridgeJSRuntimeTests/AliasTests.swift
@@ -0,0 +1,79 @@
+import XCTest
+import JavaScriptKit
+
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "runAliasWorks")
+@_extern(c)
+func runAliasWorks() -> Void
+
+final class AliasTests: XCTestCase {
+    func testAliasEndToEnd() {
+        runAliasWorks()
+    }
+
+    // MARK: - Imports
+
+    func testRoundTripTagged() throws {
+        let result = try AliasImports.jsRoundTripTagged(Tagged(raw: "hello"))
+        XCTAssertEqual(result.raw, "hello")
+    }
+
+    func testRoundTripOptionalTagged() throws {
+        XCTAssertNil(try AliasImports.jsRoundTripOptionalTagged(nil))
+        let echoed = try AliasImports.jsRoundTripOptionalTagged(Tagged(raw: "present"))
+        XCTAssertEqual(echoed?.raw, "present")
+    }
+
+    func testProduceOptionalCanvas() throws {
+        XCTAssertNil(try AliasImports.jsProduceOptionalCanvas(nil))
+        let canvas = try AliasImports.jsProduceOptionalCanvas("hello")
+        XCTAssertEqual(canvas?.label, "hello")
+    }
+
+    func testRoundTripAliasedTagArray() throws {
+        let inputs: [AliasedTag?] = [
+            AliasedTag(underlying: .payload(7)),
+            nil,
+            AliasedTag(underlying: .empty),
+            nil,
+        ]
+        let echoed = try AliasImports.jsRoundTripAliasedTags(inputs)
+        XCTAssertEqual(echoed.count, 4)
+        if case .payload(let n) = echoed[0]?.underlying {
+            XCTAssertEqual(n, 7)
+        } else {
+            XCTFail("expected .payload(7) at index 0")
+        }
+        XCTAssertNil(echoed[1])
+        if case .empty = echoed[2]?.underlying {
+            // ok
+        } else {
+            XCTFail("expected .empty at index 2")
+        }
+        XCTAssertNil(echoed[3])
+    }
+
+    func testRoundTripPolygonImport() throws {
+        let polygon = Polygon(vertices: [1, 2, 3], label: "import")
+        let echoed = try AliasImports.jsRoundTripPolygon(polygon)
+        XCTAssertEqual(echoed.label, "import")
+        XCTAssertEqual(echoed.vertices, [1, 2, 3])
+    }
+
+    func testRoundTripCoordinateImport() throws {
+        let coordinate = Coordinate(latitude: 12.5, longitude: -34.25)
+        let echoed = try AliasImports.jsRoundTripCoordinate(coordinate)
+        XCTAssertEqual(echoed.latitude, 12.5)
+        XCTAssertEqual(echoed.longitude, -34.25)
+    }
+
+    func testRoundTripUserIdImport() throws {
+        let echoed = try AliasImports.jsRoundTripUserId(UserId(rawValue: 42))
+        XCTAssertEqual(echoed.rawValue, 42)
+    }
+
+    func testRoundTripOptionalUserIdImport() throws {
+        XCTAssertNil(try AliasImports.jsRoundTripOptionalUserId(nil))
+        XCTAssertEqual(try AliasImports.jsRoundTripOptionalUserId(UserId(rawValue: 0))?.rawValue, 0)
+        XCTAssertEqual(try AliasImports.jsRoundTripOptionalUserId(UserId(rawValue: 7))?.rawValue, 7)
+    }
+}
diff --git a/Tests/BridgeJSRuntimeTests/AsyncImportTests.swift b/Tests/BridgeJSRuntimeTests/AsyncImportTests.swift
index 041f251f4..a092d111c 100644
--- a/Tests/BridgeJSRuntimeTests/AsyncImportTests.swift
+++ b/Tests/BridgeJSRuntimeTests/AsyncImportTests.swift
@@ -1,6 +1,12 @@
 import Testing
 import JavaScriptKit
 
+@JS enum AsyncImportedPayloadResult: Equatable {
+    case success(String)
+    case failure(Int)
+    case idle
+}
+
 @JSClass struct AsyncImportImports {
     @JSFunction static func jsAsyncRoundTripVoid() async throws(JSException)
     @JSFunction static func jsAsyncRoundTripNumber(_ v: Double) async throws(JSException) -> Double
@@ -12,6 +18,12 @@ import JavaScriptKit
     @JSFunction static func jsAsyncRoundTripIntArray(_ values: [Double]) async throws(JSException) -> [Double]
     @JSFunction static func jsAsyncRoundTripStringArray(_ values: [String]) async throws(JSException) -> [String]
     @JSFunction static func jsAsyncRoundTripFeatureFlag(_ v: FeatureFlag) async throws(JSException) -> FeatureFlag
+    @JSFunction static func jsAsyncRoundTripAssociatedValueEnum(
+        _ v: AsyncImportedPayloadResult
+    ) async throws(JSException) -> AsyncImportedPayloadResult
+    @JSFunction static func jsAsyncRoundTripOptionalAssociatedValueEnum(
+        _ v: AsyncImportedPayloadResult?
+    ) async throws(JSException) -> AsyncImportedPayloadResult?
 }
 
 @Suite struct AsyncImportTests {
@@ -69,6 +81,29 @@ import JavaScriptKit
         try #expect(await AsyncImportImports.jsAsyncRoundTripFeatureFlag(v) == v)
     }
 
+    @Test func asyncRoundTripAssociatedValueEnum() async throws {
+        let values: [AsyncImportedPayloadResult] = [
+            .success("ok"),
+            .failure(7),
+            .idle,
+        ]
+        for value in values {
+            try #expect(await AsyncImportImports.jsAsyncRoundTripAssociatedValueEnum(value) == value)
+        }
+    }
+
+    @Test func asyncRoundTripOptionalAssociatedValueEnum() async throws {
+        let values: [AsyncImportedPayloadResult?] = [
+            .some(.success("ok")),
+            .some(.failure(7)),
+            .some(.idle),
+            nil,
+        ]
+        for value in values {
+            try #expect(await AsyncImportImports.jsAsyncRoundTripOptionalAssociatedValueEnum(value) == value)
+        }
+    }
+
     // MARK: - Structured return type
 
     @Test func fetchWeatherData() async throws {
diff --git a/Tests/BridgeJSRuntimeTests/ClosureAsyncAPIs.swift b/Tests/BridgeJSRuntimeTests/ClosureAsyncAPIs.swift
new file mode 100644
index 000000000..678981ede
--- /dev/null
+++ b/Tests/BridgeJSRuntimeTests/ClosureAsyncAPIs.swift
@@ -0,0 +1,89 @@
+import XCTest
+import JavaScriptKit
+import JavaScriptEventLoop
+
+// MARK: - Direction A: Swift awaits a JS async callback
+
+@JS func awaitAsyncCallback(_ fetch: (String) async throws(JSException) -> String) async throws(JSException) -> String {
+    let resolved = try await fetch("request")
+    return "swift-saw:\(resolved)"
+}
+
+// MARK: - Direction B: a Swift async closure handed to JS
+
+@JS func makeAsyncParser() -> JSTypedClosure<(String) async throws(JSException) -> String> {
+    return JSTypedClosure { (text: String) async throws(JSException) -> String in
+        await Task.yield()
+        guard let value = Int(text) else {
+            throw JSException(JSError(message: "AsyncParseError: \(text)").jsValue)
+        }
+        return "parsed:\(value)"
+    }
+}
+
+@JS func makeAsyncEcho() -> JSTypedClosure<(String) async -> String> {
+    return JSTypedClosure { (text: String) async -> String in
+        await Task.yield()
+        return "echo:\(text)"
+    }
+}
+
+@JS func makeAsyncRecorder() -> JSTypedClosure<(String) async throws(JSException) -> Void> {
+    return JSTypedClosure { (text: String) async throws(JSException) -> Void in
+        await Task.yield()
+        if text == "boom" {
+            throw JSException(JSError(message: "AsyncRecorderError").jsValue)
+        }
+        AsyncRecorderState.lastRecorded = text
+    }
+}
+
+@JS func lastRecordedValue() -> String {
+    return AsyncRecorderState.lastRecorded
+}
+
+@JS func makeAsyncPayloadLoader() -> JSTypedClosure<(Bool) async throws(JSException) -> AsyncPayloadResult> {
+    return JSTypedClosure { (succeed: Bool) async throws(JSException) -> AsyncPayloadResult in
+        await Task.yield()
+        return succeed ? .success("loaded") : .failure(42)
+    }
+}
+
+@JS func awaitPayloadCallback(
+    _ load: (Bool) async throws(JSException) -> AsyncPayloadResult
+) async throws(JSException) -> String {
+    let first = try await load(true)
+    let second = try await load(false)
+    return "\(payloadSummary(first))|\(payloadSummary(second))"
+}
+
+private func payloadSummary(_ result: AsyncPayloadResult) -> String {
+    switch result {
+    case .success(let value): return "success:\(value)"
+    case .failure(let code): return "failure:\(code)"
+    case .idle: return "idle"
+    }
+}
+
+@JS func makeAsyncPointMaker() -> JSTypedClosure<(Double) async -> DataPoint> {
+    return JSTypedClosure { (seed: Double) async -> DataPoint in
+        await Task.yield()
+        return DataPoint(x: seed, y: seed * 2, label: "async:\(seed)", optCount: nil, optFlag: nil)
+    }
+}
+
+enum AsyncRecorderState {
+    nonisolated(unsafe) static var lastRecorded: String = ""
+}
+
+// MARK: - XCTest entry point
+
+final class ClosureAsyncTests: XCTestCase {
+    func testRunJsClosureAsyncTests() async throws {
+        try await ClosureAsyncImports.runJsClosureAsyncTests()
+    }
+}
+
+@JSClass struct ClosureAsyncImports {
+    @JSFunction static func runJsClosureAsyncTests() async throws(JSException)
+}
diff --git a/Tests/BridgeJSRuntimeTests/ClosureThrowsAPIs.swift b/Tests/BridgeJSRuntimeTests/ClosureThrowsAPIs.swift
new file mode 100644
index 000000000..472d57ad6
--- /dev/null
+++ b/Tests/BridgeJSRuntimeTests/ClosureThrowsAPIs.swift
@@ -0,0 +1,31 @@
+import XCTest
+import JavaScriptKit
+
+// MARK: - Direction B: Swift closure (throws) called from JS
+
+@JS func makeThrowingParser() -> JSTypedClosure<(String) throws(JSException) -> Int> {
+    return JSTypedClosure { (text: String) throws(JSException) -> Int in
+        guard let value = Int(text) else {
+            throw JSException(JSError(message: "ParseError: \(text)").jsValue)
+        }
+        return value
+    }
+}
+
+// MARK: - Direction A: JS callback (throws) called from Swift
+
+@JS func runValidator(_ validate: (String) throws(JSException) -> Bool) throws(JSException) -> Bool {
+    return try validate("input")
+}
+
+// MARK: - XCTest entry point
+
+final class ClosureThrowsTests: XCTestCase {
+    func testRunJsClosureThrowsTests() throws {
+        try ClosureThrowsImports.runJsClosureThrowsTests()
+    }
+}
+
+@JSClass struct ClosureThrowsImports {
+    @JSFunction static func runJsClosureThrowsTests() throws(JSException)
+}
diff --git a/Tests/BridgeJSRuntimeTests/CrossFileNestedTypeClassAPIs.swift b/Tests/BridgeJSRuntimeTests/CrossFileNestedTypeClassAPIs.swift
new file mode 100644
index 000000000..8663f1fe5
--- /dev/null
+++ b/Tests/BridgeJSRuntimeTests/CrossFileNestedTypeClassAPIs.swift
@@ -0,0 +1,13 @@
+import JavaScriptKit
+
+@JS class Workspace {
+    let name: String
+
+    @JS init(name: String) {
+        self.name = name
+    }
+
+    @JS func describe() -> String {
+        name
+    }
+}
diff --git a/Tests/BridgeJSRuntimeTests/CrossFileNestedTypeExtensionAPIs.swift b/Tests/BridgeJSRuntimeTests/CrossFileNestedTypeExtensionAPIs.swift
new file mode 100644
index 000000000..c50446ee2
--- /dev/null
+++ b/Tests/BridgeJSRuntimeTests/CrossFileNestedTypeExtensionAPIs.swift
@@ -0,0 +1,8 @@
+import JavaScriptKit
+
+extension Workspace {
+    @JS enum Kind: String {
+        case personal
+        case shared
+    }
+}
diff --git a/Tests/BridgeJSRuntimeTests/ExportAPITests.swift b/Tests/BridgeJSRuntimeTests/ExportAPITests.swift
index c6e216203..8778c2c8e 100644
--- a/Tests/BridgeJSRuntimeTests/ExportAPITests.swift
+++ b/Tests/BridgeJSRuntimeTests/ExportAPITests.swift
@@ -75,6 +75,10 @@ func runJsWorks() -> Void
     return try Foo(value)
 }
 
+@JS func roundTripOptionalImportedClass(v: Foo?) -> Foo? {
+    return v
+}
+
 struct TestError: Error {
     let message: String
 }
@@ -92,6 +96,10 @@ struct TestError: Error {
 @JS func throwsWithSwiftHeapObjectResult() throws(JSException) -> Greeter { return Greeter(name: "Test") }
 @JS func throwsWithJSObjectResult() throws(JSException) -> JSObject { return JSObject() }
 
+@JS func zeroArgAsyncThrows() async throws(JSException) -> String {
+    throw JSException(JSError(message: "ZeroArgAsyncThrowsError").jsValue)
+}
+
 @JS func asyncRoundTripVoid() async -> Void { return }
 @JS func asyncRoundTripInt(v: Int) async -> Int { return v }
 @JS func asyncRoundTripFloat(v: Float) async -> Float { return v }
@@ -174,6 +182,10 @@ extension Greeter {
         return a + b
     }
 
+    @JS func asyncMakePoint(x: Int, y: Int) async -> PublicPoint {
+        return PublicPoint(x: x, y: y)
+    }
+
     deinit {
         Self.onDeinit()
     }
@@ -302,6 +314,36 @@ extension StaticCalculator {
     return .light
 }
 
+@JS func asyncRoundTripTheme(_ v: Theme) async -> Theme { v }
+
+@JS func asyncRoundTripDirection(_ v: Direction) async -> Direction { v }
+
+@JS func asyncRoundTripOptionalTheme(_ v: Theme?) async -> Theme? { v }
+
+@JS func asyncRoundTripOptionalDirection(_ v: Direction?) async -> Direction? { v }
+
+@JS func asyncRoundTripDirectionArray(_ v: [Direction]) async -> [Direction] { v }
+
+@JS func asyncRoundTripDirectionDict(_ v: [String: Direction]) async -> [String: Direction] { v }
+
+@JS func asyncRoundTripThemeArray(_ v: [Theme]) async -> [Theme] { v }
+
+@JS func asyncRoundTripThemeDict(_ v: [String: Theme]) async -> [String: Theme] { v }
+
+@JS func asyncRoundTripFileSize(_ v: FileSize) async -> FileSize { v }
+
+@JS func asyncRoundTripOptionalFileSize(_ v: FileSize?) async -> FileSize? { v }
+
+@JS enum AsyncPayloadResult: Equatable {
+    case success(String)
+    case failure(Int)
+    case idle
+}
+
+@JS func asyncRoundTripAssociatedValueEnum(_ v: AsyncPayloadResult) async -> AsyncPayloadResult { v }
+
+@JS func asyncRoundTripOptionalAssociatedValueEnum(_ v: AsyncPayloadResult?) async -> AsyncPayloadResult? { v }
+
 @JS func setHttpStatus(_ status: HttpStatus) -> HttpStatus {
     return status
 }
@@ -1297,6 +1339,15 @@ enum GraphOperations {
         let noneStr = none.map { "(\($0.dx),\($0.dy))" } ?? "nil"
         return "\(someStr) | \(noneStr)"
     }
+
+    /// Swift→JS callback with a struct parameter (ExportSwift stack ABI).
+    @JS func observeVector(_ callback: (Vector2D) -> Void) {
+        callback(Vector2D(dx: 1.5, dy: 2.5))
+    }
+
+    @JS func mapVector(_ vector: Vector2D, _ callback: (Vector2D) -> Vector2D) -> Vector2D {
+        return callback(vector)
+    }
 }
 
 @JS enum NestedStructGroupA {
@@ -1317,6 +1368,33 @@ enum GraphOperations {
     @JS static func roundtripMetadata(_ m: Metadata) -> Metadata { m }
 }
 
+@JS class NestedTypeHost {
+    @JS enum Variant: String {
+        case primary
+        case secondary
+    }
+
+    @JS struct Label {
+        var text: String
+
+        @JS init(text: String) {
+            self.text = text
+        }
+
+        @JS static var maxLength: Int { 64 }
+
+        @JS static func untitled() -> Label {
+            Label(text: "untitled")
+        }
+    }
+
+    @JS init() {}
+
+    @JS func describe() -> String {
+        "host"
+    }
+}
+
 class ExportAPITests: XCTestCase {
     func testAll() {
         var hasDeinitGreeter = false
diff --git a/Tests/BridgeJSRuntimeTests/ExtensionNestedTypesAPIs.swift b/Tests/BridgeJSRuntimeTests/ExtensionNestedTypesAPIs.swift
new file mode 100644
index 000000000..b09807ac7
--- /dev/null
+++ b/Tests/BridgeJSRuntimeTests/ExtensionNestedTypesAPIs.swift
@@ -0,0 +1,70 @@
+import JavaScriptKit
+
+@JS class Library {
+    @JS var name: String
+
+    @JS init(name: String) {
+        self.name = name
+    }
+
+    @JS func describe() -> String {
+        name
+    }
+}
+
+extension Library {
+    typealias Title = String
+
+    @JS enum Genre: String {
+        case fiction
+        case reference
+    }
+
+    @JS struct Shelf {
+        var label: String
+
+        @JS init(label: String) {
+            self.label = label
+        }
+
+        @JS static var capacity: Int { 32 }
+    }
+
+    @JS func rename(_ title: Title) -> Title {
+        title
+    }
+
+    @JS func shelf(label: String) -> Shelf {
+        Shelf(label: label)
+    }
+}
+
+extension Library.Shelf {
+    @JS struct Divider {
+        var slot: Int
+
+        @JS init(slot: Int) {
+            self.slot = slot
+        }
+    }
+
+    @JS func describeShelf() -> String {
+        "Shelf: " + label
+    }
+}
+
+@JS enum Message {
+    case update(Update)
+    case delete
+}
+
+extension Message {
+    @JS enum Update {
+        case flip
+        case rotate
+    }
+}
+
+@JS func roundTripMessage(_ message: Message) -> Message {
+    message
+}
diff --git a/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift b/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift
index 3fa4eb9d5..f16bce9f2 100644
--- a/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift
+++ b/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift
@@ -37,8 +37,8 @@ private enum _BJS_Closure_20BridgeJSRuntimeTests10HttpStatusO_Si {
         let callback = JSObject.bridgeJSLiftParameter(callbackId)
         return { [callback] param0 in
             #if arch(wasm32)
-            let callbackValue = callback.bridgeJSLowerParameter()
             let param0Value = param0.bridgeJSLowerParameter()
+            let callbackValue = callback.bridgeJSLowerParameter()
             let ret = invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTests10HttpStatusO_Si(callbackValue, param0Value)
             return Int.bridgeJSLiftReturn(ret)
             #else
@@ -100,8 +100,8 @@ private enum _BJS_Closure_20BridgeJSRuntimeTests13DataProcessorP_13DataProcessor
         let callback = JSObject.bridgeJSLiftParameter(callbackId)
         return { [callback] param0 in
             #if arch(wasm32)
-            let callbackValue = callback.bridgeJSLowerParameter()
             let param0ObjectId = (param0 as! _BridgedSwiftProtocolExportable).bridgeJSLowerAsProtocolReturn()
+            let callbackValue = callback.bridgeJSLowerParameter()
             let ret = invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTests13DataProcessorP_13DataProcessorP(callbackValue, param0ObjectId)
             return AnyDataProcessor.bridgeJSLiftReturn(ret)
             #else
@@ -163,8 +163,8 @@ private enum _BJS_Closure_20BridgeJSRuntimeTests13DataProcessorP_SS {
         let callback = JSObject.bridgeJSLiftParameter(callbackId)
         return { [callback] param0 in
             #if arch(wasm32)
-            let callbackValue = callback.bridgeJSLowerParameter()
             let param0ObjectId = (param0 as! _BridgedSwiftProtocolExportable).bridgeJSLowerAsProtocolReturn()
+            let callbackValue = callback.bridgeJSLowerParameter()
             let ret = invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTests13DataProcessorP_SS(callbackValue, param0ObjectId)
             return String.bridgeJSLiftReturn(ret)
             #else
@@ -226,8 +226,8 @@ private enum _BJS_Closure_20BridgeJSRuntimeTests5ThemeO_SS {
         let callback = JSObject.bridgeJSLiftParameter(callbackId)
         return { [callback] param0 in
             #if arch(wasm32)
-            let callbackValue = callback.bridgeJSLowerParameter()
             let ret0 = param0.bridgeJSWithLoweredParameter { (param0Bytes, param0Length) in
+                let callbackValue = callback.bridgeJSLowerParameter()
                 let ret = invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTests5ThemeO_SS(callbackValue, param0Bytes, param0Length)
                 return ret
             }
@@ -292,8 +292,8 @@ private enum _BJS_Closure_20BridgeJSRuntimeTests5ThemeO_Sb {
         let callback = JSObject.bridgeJSLiftParameter(callbackId)
         return { [callback] param0 in
             #if arch(wasm32)
-            let callbackValue = callback.bridgeJSLowerParameter()
             let ret0 = param0.bridgeJSWithLoweredParameter { (param0Bytes, param0Length) in
+                let callbackValue = callback.bridgeJSLowerParameter()
                 let ret = invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTests5ThemeO_Sb(callbackValue, param0Bytes, param0Length)
                 return ret
             }
@@ -358,8 +358,8 @@ private enum _BJS_Closure_20BridgeJSRuntimeTests7GreeterC_SS {
         let callback = JSObject.bridgeJSLiftParameter(callbackId)
         return { [callback] param0 in
             #if arch(wasm32)
-            let callbackValue = callback.bridgeJSLowerParameter()
             let param0Pointer = param0.bridgeJSLowerParameter()
+            let callbackValue = callback.bridgeJSLowerParameter()
             let ret = invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTests7GreeterC_SS(callbackValue, param0Pointer)
             return String.bridgeJSLiftReturn(ret)
             #else
@@ -421,8 +421,8 @@ private enum _BJS_Closure_20BridgeJSRuntimeTests8JSObjectC_8JSObjectC {
         let callback = JSObject.bridgeJSLiftParameter(callbackId)
         return { [callback] param0 in
             #if arch(wasm32)
-            let callbackValue = callback.bridgeJSLowerParameter()
             let param0Value = param0.bridgeJSLowerParameter()
+            let callbackValue = callback.bridgeJSLowerParameter()
             let ret = invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTests8JSObjectC_8JSObjectC(callbackValue, param0Value)
             return JSObject.bridgeJSLiftReturn(ret)
             #else
@@ -455,6 +455,130 @@ public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests8JS
     #endif
 }
 
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTests8Vector2DV_8Vector2DV")
+fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTests8Vector2DV_8Vector2DV_extern(_ callback: Int32) -> Void
+#else
+fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTests8Vector2DV_8Vector2DV_extern(_ callback: Int32) -> Void {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTests8Vector2DV_8Vector2DV(_ callback: Int32) -> Void {
+    return invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTests8Vector2DV_8Vector2DV_extern(callback)
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests8Vector2DV_8Vector2DV")
+fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests8Vector2DV_8Vector2DV_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer<UInt8>, _ line: UInt32) -> Int32
+#else
+fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests8Vector2DV_8Vector2DV_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer<UInt8>, _ line: UInt32) -> Int32 {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests8Vector2DV_8Vector2DV(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer<UInt8>, _ line: UInt32) -> Int32 {
+    return make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests8Vector2DV_8Vector2DV_extern(boxPtr, file, line)
+}
+
+private enum _BJS_Closure_20BridgeJSRuntimeTests8Vector2DV_8Vector2DV {
+    static func bridgeJSLift(_ callbackId: Int32) -> (Vector2D) -> Vector2D {
+        let callback = JSObject.bridgeJSLiftParameter(callbackId)
+        return { [callback] param0 in
+            #if arch(wasm32)
+            let _ = param0.bridgeJSLowerParameter()
+            let callbackValue = callback.bridgeJSLowerParameter()
+            invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTests8Vector2DV_8Vector2DV(callbackValue)
+            return Vector2D.bridgeJSLiftReturn()
+            #else
+            fatalError("Only available on WebAssembly")
+            #endif
+        }
+    }
+}
+
+extension JSTypedClosure where Signature == (Vector2D) -> Vector2D {
+    init(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping (Vector2D) -> Vector2D) {
+        self.init(
+            makeClosure: make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests8Vector2DV_8Vector2DV,
+            body: body,
+            fileID: fileID,
+            line: line
+        )
+    }
+}
+
+@_expose(wasm, "invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests8Vector2DV_8Vector2DV")
+@_cdecl("invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests8Vector2DV_8Vector2DV")
+public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests8Vector2DV_8Vector2DV(_ boxPtr: UnsafeMutableRawPointer) -> Void {
+    #if arch(wasm32)
+    let closure = Unmanaged<_BridgeJSTypedClosureBox<(Vector2D) -> Vector2D>>.fromOpaque(boxPtr).takeUnretainedValue().closure
+    let result = closure(Vector2D.bridgeJSLiftParameter())
+    return result.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTests8Vector2DV_y")
+fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTests8Vector2DV_y_extern(_ callback: Int32) -> Void
+#else
+fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTests8Vector2DV_y_extern(_ callback: Int32) -> Void {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTests8Vector2DV_y(_ callback: Int32) -> Void {
+    return invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTests8Vector2DV_y_extern(callback)
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests8Vector2DV_y")
+fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests8Vector2DV_y_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer<UInt8>, _ line: UInt32) -> Int32
+#else
+fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests8Vector2DV_y_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer<UInt8>, _ line: UInt32) -> Int32 {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests8Vector2DV_y(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer<UInt8>, _ line: UInt32) -> Int32 {
+    return make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests8Vector2DV_y_extern(boxPtr, file, line)
+}
+
+private enum _BJS_Closure_20BridgeJSRuntimeTests8Vector2DV_y {
+    static func bridgeJSLift(_ callbackId: Int32) -> (Vector2D) -> Void {
+        let callback = JSObject.bridgeJSLiftParameter(callbackId)
+        return { [callback] param0 in
+            #if arch(wasm32)
+            let _ = param0.bridgeJSLowerParameter()
+            let callbackValue = callback.bridgeJSLowerParameter()
+            invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTests8Vector2DV_y(callbackValue)
+            #else
+            fatalError("Only available on WebAssembly")
+            #endif
+        }
+    }
+}
+
+extension JSTypedClosure where Signature == (Vector2D) -> Void {
+    init(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping (Vector2D) -> Void) {
+        self.init(
+            makeClosure: make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests8Vector2DV_y,
+            body: body,
+            fileID: fileID,
+            line: line
+        )
+    }
+}
+
+@_expose(wasm, "invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests8Vector2DV_y")
+@_cdecl("invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests8Vector2DV_y")
+public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests8Vector2DV_y(_ boxPtr: UnsafeMutableRawPointer) -> Void {
+    #if arch(wasm32)
+    let closure = Unmanaged<_BridgeJSTypedClosureBox<(Vector2D) -> Void>>.fromOpaque(boxPtr).takeUnretainedValue().closure
+    closure(Vector2D.bridgeJSLiftParameter())
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
 #if arch(wasm32)
 @_extern(wasm, module: "bjs", name: "invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTests9APIResultO_SS")
 fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTests9APIResultO_SS_extern(_ callback: Int32, _ param0: Int32) -> Int32
@@ -484,8 +608,8 @@ private enum _BJS_Closure_20BridgeJSRuntimeTests9APIResultO_SS {
         let callback = JSObject.bridgeJSLiftParameter(callbackId)
         return { [callback] param0 in
             #if arch(wasm32)
-            let callbackValue = callback.bridgeJSLowerParameter()
             let param0CaseId = param0.bridgeJSLowerParameter()
+            let callbackValue = callback.bridgeJSLowerParameter()
             let ret = invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTests9APIResultO_SS(callbackValue, param0CaseId)
             return String.bridgeJSLiftReturn(ret)
             #else
@@ -547,8 +671,8 @@ private enum _BJS_Closure_20BridgeJSRuntimeTests9DirectionO_SS {
         let callback = JSObject.bridgeJSLiftParameter(callbackId)
         return { [callback] param0 in
             #if arch(wasm32)
-            let callbackValue = callback.bridgeJSLowerParameter()
             let param0Value = param0.bridgeJSLowerParameter()
+            let callbackValue = callback.bridgeJSLowerParameter()
             let ret = invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTests9DirectionO_SS(callbackValue, param0Value)
             return String.bridgeJSLiftReturn(ret)
             #else
@@ -610,8 +734,8 @@ private enum _BJS_Closure_20BridgeJSRuntimeTests9DirectionO_Sb {
         let callback = JSObject.bridgeJSLiftParameter(callbackId)
         return { [callback] param0 in
             #if arch(wasm32)
-            let callbackValue = callback.bridgeJSLowerParameter()
             let param0Value = param0.bridgeJSLowerParameter()
+            let callbackValue = callback.bridgeJSLowerParameter()
             let ret = invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTests9DirectionO_Sb(callbackValue, param0Value)
             return Bool.bridgeJSLiftReturn(ret)
             #else
@@ -644,6 +768,235 @@ public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests9Di
     #endif
 }
 
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsAl7Polygon_Si")
+fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsAl7Polygon_Si_extern(_ callback: Int32, _ param0: UnsafeMutableRawPointer) -> Int32
+#else
+fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsAl7Polygon_Si_extern(_ callback: Int32, _ param0: UnsafeMutableRawPointer) -> Int32 {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsAl7Polygon_Si(_ callback: Int32, _ param0: UnsafeMutableRawPointer) -> Int32 {
+    return invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsAl7Polygon_Si_extern(callback, param0)
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsAl7Polygon_Si")
+fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsAl7Polygon_Si_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer<UInt8>, _ line: UInt32) -> Int32
+#else
+fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsAl7Polygon_Si_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer<UInt8>, _ line: UInt32) -> Int32 {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsAl7Polygon_Si(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer<UInt8>, _ line: UInt32) -> Int32 {
+    return make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsAl7Polygon_Si_extern(boxPtr, file, line)
+}
+
+private enum _BJS_Closure_20BridgeJSRuntimeTestsAl7Polygon_Si {
+    static func bridgeJSLift(_ callbackId: Int32) -> (Polygon) -> Int {
+        let callback = JSObject.bridgeJSLiftParameter(callbackId)
+        return { [callback] param0 in
+            #if arch(wasm32)
+            let param0Pointer = param0.bridgeJSLowerParameter()
+            let callbackValue = callback.bridgeJSLowerParameter()
+            let ret = invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsAl7Polygon_Si(callbackValue, param0Pointer)
+            return Int.bridgeJSLiftReturn(ret)
+            #else
+            fatalError("Only available on WebAssembly")
+            #endif
+        }
+    }
+}
+
+extension JSTypedClosure where Signature == (Polygon) -> Int {
+    init(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping (Polygon) -> Int) {
+        self.init(
+            makeClosure: make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsAl7Polygon_Si,
+            body: body,
+            fileID: fileID,
+            line: line
+        )
+    }
+}
+
+@_expose(wasm, "invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsAl7Polygon_Si")
+@_cdecl("invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsAl7Polygon_Si")
+public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsAl7Polygon_Si(_ boxPtr: UnsafeMutableRawPointer, _ param0: UnsafeMutableRawPointer) -> Int32 {
+    #if arch(wasm32)
+    let closure = Unmanaged<_BridgeJSTypedClosureBox<(Polygon) -> Int>>.fromOpaque(boxPtr).takeUnretainedValue().closure
+    let result = closure(Polygon.bridgeJSLiftParameter(param0))
+    return result.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsKSS_Sb")
+fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsKSS_Sb_extern(_ callback: Int32, _ param0Bytes: Int32, _ param0Length: Int32) -> Int32
+#else
+fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsKSS_Sb_extern(_ callback: Int32, _ param0Bytes: Int32, _ param0Length: Int32) -> Int32 {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsKSS_Sb(_ callback: Int32, _ param0Bytes: Int32, _ param0Length: Int32) -> Int32 {
+    return invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsKSS_Sb_extern(callback, param0Bytes, param0Length)
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsKSS_Sb")
+fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsKSS_Sb_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer<UInt8>, _ line: UInt32) -> Int32
+#else
+fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsKSS_Sb_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer<UInt8>, _ line: UInt32) -> Int32 {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsKSS_Sb(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer<UInt8>, _ line: UInt32) -> Int32 {
+    return make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsKSS_Sb_extern(boxPtr, file, line)
+}
+
+private enum _BJS_Closure_20BridgeJSRuntimeTestsKSS_Sb {
+    static func bridgeJSLift(_ callbackId: Int32) -> (String) throws(JSException) -> Bool {
+        let callback = JSObject.bridgeJSLiftParameter(callbackId)
+        return { [callback] (param0: String) throws(JSException) -> Bool in
+            #if arch(wasm32)
+            let ret0 = param0.bridgeJSWithLoweredParameter { (param0Bytes, param0Length) in
+                let callbackValue = callback.bridgeJSLowerParameter()
+                let ret = invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsKSS_Sb(callbackValue, param0Bytes, param0Length)
+                return ret
+            }
+            let ret = ret0
+            if let error = _swift_js_take_exception() {
+                throw error
+            }
+            return Bool.bridgeJSLiftReturn(ret)
+            #else
+            fatalError("Only available on WebAssembly")
+            #endif
+        }
+    }
+}
+
+extension JSTypedClosure where Signature == (String) throws(JSException) -> Bool {
+    init(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping (String) throws(JSException) -> Bool) {
+        self.init(
+            makeClosure: make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsKSS_Sb,
+            body: body,
+            fileID: fileID,
+            line: line
+        )
+    }
+}
+
+@_expose(wasm, "invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsKSS_Sb")
+@_cdecl("invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsKSS_Sb")
+public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsKSS_Sb(_ boxPtr: UnsafeMutableRawPointer, _ param0Bytes: Int32, _ param0Length: Int32) -> Int32 {
+    #if arch(wasm32)
+    let closure = Unmanaged<_BridgeJSTypedClosureBox<(String) throws(JSException) -> Bool>>.fromOpaque(boxPtr).takeUnretainedValue().closure
+    do {
+        let result = try closure(String.bridgeJSLiftParameter(param0Bytes, param0Length))
+        return result.bridgeJSLowerReturn()
+    } catch let error {
+        if let error = error.thrownValue.object {
+            withExtendedLifetime(error) {
+                _swift_js_throw(Int32(bitPattern: $0.id))
+            }
+        } else {
+            let jsError = JSError(message: error.description)
+            withExtendedLifetime(jsError.jsObject) {
+                _swift_js_throw(Int32(bitPattern: $0.id))
+            }
+        }
+        return 0
+    }
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsKSS_Si")
+fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsKSS_Si_extern(_ callback: Int32, _ param0Bytes: Int32, _ param0Length: Int32) -> Int32
+#else
+fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsKSS_Si_extern(_ callback: Int32, _ param0Bytes: Int32, _ param0Length: Int32) -> Int32 {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsKSS_Si(_ callback: Int32, _ param0Bytes: Int32, _ param0Length: Int32) -> Int32 {
+    return invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsKSS_Si_extern(callback, param0Bytes, param0Length)
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsKSS_Si")
+fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsKSS_Si_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer<UInt8>, _ line: UInt32) -> Int32
+#else
+fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsKSS_Si_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer<UInt8>, _ line: UInt32) -> Int32 {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsKSS_Si(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer<UInt8>, _ line: UInt32) -> Int32 {
+    return make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsKSS_Si_extern(boxPtr, file, line)
+}
+
+private enum _BJS_Closure_20BridgeJSRuntimeTestsKSS_Si {
+    static func bridgeJSLift(_ callbackId: Int32) -> (String) throws(JSException) -> Int {
+        let callback = JSObject.bridgeJSLiftParameter(callbackId)
+        return { [callback] (param0: String) throws(JSException) -> Int in
+            #if arch(wasm32)
+            let ret0 = param0.bridgeJSWithLoweredParameter { (param0Bytes, param0Length) in
+                let callbackValue = callback.bridgeJSLowerParameter()
+                let ret = invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsKSS_Si(callbackValue, param0Bytes, param0Length)
+                return ret
+            }
+            let ret = ret0
+            if let error = _swift_js_take_exception() {
+                throw error
+            }
+            return Int.bridgeJSLiftReturn(ret)
+            #else
+            fatalError("Only available on WebAssembly")
+            #endif
+        }
+    }
+}
+
+extension JSTypedClosure where Signature == (String) throws(JSException) -> Int {
+    init(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping (String) throws(JSException) -> Int) {
+        self.init(
+            makeClosure: make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsKSS_Si,
+            body: body,
+            fileID: fileID,
+            line: line
+        )
+    }
+}
+
+@_expose(wasm, "invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsKSS_Si")
+@_cdecl("invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsKSS_Si")
+public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsKSS_Si(_ boxPtr: UnsafeMutableRawPointer, _ param0Bytes: Int32, _ param0Length: Int32) -> Int32 {
+    #if arch(wasm32)
+    let closure = Unmanaged<_BridgeJSTypedClosureBox<(String) throws(JSException) -> Int>>.fromOpaque(boxPtr).takeUnretainedValue().closure
+    do {
+        let result = try closure(String.bridgeJSLiftParameter(param0Bytes, param0Length))
+        return result.bridgeJSLowerReturn()
+    } catch let error {
+        if let error = error.thrownValue.object {
+            withExtendedLifetime(error) {
+                _swift_js_throw(Int32(bitPattern: $0.id))
+            }
+        } else {
+            let jsError = JSError(message: error.description)
+            withExtendedLifetime(jsError.jsObject) {
+                _swift_js_throw(Int32(bitPattern: $0.id))
+            }
+        }
+        return 0
+    }
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
 #if arch(wasm32)
 @_extern(wasm, module: "bjs", name: "invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSS_7GreeterC")
 fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSS_7GreeterC_extern(_ callback: Int32, _ param0Bytes: Int32, _ param0Length: Int32) -> UnsafeMutableRawPointer
@@ -673,8 +1026,8 @@ private enum _BJS_Closure_20BridgeJSRuntimeTestsSS_7GreeterC {
         let callback = JSObject.bridgeJSLiftParameter(callbackId)
         return { [callback] param0 in
             #if arch(wasm32)
-            let callbackValue = callback.bridgeJSLowerParameter()
             let ret0 = param0.bridgeJSWithLoweredParameter { (param0Bytes, param0Length) in
+                let callbackValue = callback.bridgeJSLowerParameter()
                 let ret = invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSS_7GreeterC(callbackValue, param0Bytes, param0Length)
                 return ret
             }
@@ -739,8 +1092,8 @@ private enum _BJS_Closure_20BridgeJSRuntimeTestsSS_SS {
         let callback = JSObject.bridgeJSLiftParameter(callbackId)
         return { [callback] param0 in
             #if arch(wasm32)
-            let callbackValue = callback.bridgeJSLowerParameter()
             let ret0 = param0.bridgeJSWithLoweredParameter { (param0Bytes, param0Length) in
+                let callbackValue = callback.bridgeJSLowerParameter()
                 let ret = invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSS_SS(callbackValue, param0Bytes, param0Length)
                 return ret
             }
@@ -805,8 +1158,8 @@ private enum _BJS_Closure_20BridgeJSRuntimeTestsSd_8Vector2DV {
         let callback = JSObject.bridgeJSLiftParameter(callbackId)
         return { [callback] param0 in
             #if arch(wasm32)
-            let callbackValue = callback.bridgeJSLowerParameter()
             let param0Value = param0.bridgeJSLowerParameter()
+            let callbackValue = callback.bridgeJSLowerParameter()
             invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSd_8Vector2DV(callbackValue, param0Value)
             return Vector2D.bridgeJSLiftReturn()
             #else
@@ -868,8 +1221,8 @@ private enum _BJS_Closure_20BridgeJSRuntimeTestsSd_Sd {
         let callback = JSObject.bridgeJSLiftParameter(callbackId)
         return { [callback] param0 in
             #if arch(wasm32)
-            let callbackValue = callback.bridgeJSLowerParameter()
             let param0Value = param0.bridgeJSLowerParameter()
+            let callbackValue = callback.bridgeJSLowerParameter()
             let ret = invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSd_Sd(callbackValue, param0Value)
             return Double.bridgeJSLiftReturn(ret)
             #else
@@ -931,8 +1284,8 @@ private enum _BJS_Closure_20BridgeJSRuntimeTestsSd_Sq8Vector2DV {
         let callback = JSObject.bridgeJSLiftParameter(callbackId)
         return { [callback] param0 in
             #if arch(wasm32)
-            let callbackValue = callback.bridgeJSLowerParameter()
             let param0Value = param0.bridgeJSLowerParameter()
+            let callbackValue = callback.bridgeJSLowerParameter()
             invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSd_Sq8Vector2DV(callbackValue, param0Value)
             return Optional<Vector2D>.bridgeJSLiftReturn()
             #else
@@ -994,10 +1347,10 @@ private enum _BJS_Closure_20BridgeJSRuntimeTestsSiSSSd_SS {
         let callback = JSObject.bridgeJSLiftParameter(callbackId)
         return { [callback] (param0, param1, param2) in
             #if arch(wasm32)
-            let callbackValue = callback.bridgeJSLowerParameter()
-            let param0Value = param0.bridgeJSLowerParameter()
             let ret0 = param1.bridgeJSWithLoweredParameter { (param1Bytes, param1Length) in
                 let param2Value = param2.bridgeJSLowerParameter()
+                let param0Value = param0.bridgeJSLowerParameter()
+                let callbackValue = callback.bridgeJSLowerParameter()
                 let ret = invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSiSSSd_SS(callbackValue, param0Value, param1Bytes, param1Length, param2Value)
                 return ret
             }
@@ -1062,10 +1415,10 @@ private enum _BJS_Closure_20BridgeJSRuntimeTestsSiSiSi_Si {
         let callback = JSObject.bridgeJSLiftParameter(callbackId)
         return { [callback] (param0, param1, param2) in
             #if arch(wasm32)
-            let callbackValue = callback.bridgeJSLowerParameter()
-            let param0Value = param0.bridgeJSLowerParameter()
-            let param1Value = param1.bridgeJSLowerParameter()
             let param2Value = param2.bridgeJSLowerParameter()
+            let param1Value = param1.bridgeJSLowerParameter()
+            let param0Value = param0.bridgeJSLowerParameter()
+            let callbackValue = callback.bridgeJSLowerParameter()
             let ret = invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSiSiSi_Si(callbackValue, param0Value, param1Value, param2Value)
             return Int.bridgeJSLiftReturn(ret)
             #else
@@ -1127,9 +1480,9 @@ private enum _BJS_Closure_20BridgeJSRuntimeTestsSiSi_Si {
         let callback = JSObject.bridgeJSLiftParameter(callbackId)
         return { [callback] (param0, param1) in
             #if arch(wasm32)
-            let callbackValue = callback.bridgeJSLowerParameter()
-            let param0Value = param0.bridgeJSLowerParameter()
             let param1Value = param1.bridgeJSLowerParameter()
+            let param0Value = param0.bridgeJSLowerParameter()
+            let callbackValue = callback.bridgeJSLowerParameter()
             let ret = invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSiSi_Si(callbackValue, param0Value, param1Value)
             return Int.bridgeJSLiftReturn(ret)
             #else
@@ -1191,8 +1544,8 @@ private enum _BJS_Closure_20BridgeJSRuntimeTestsSi_Si {
         let callback = JSObject.bridgeJSLiftParameter(callbackId)
         return { [callback] param0 in
             #if arch(wasm32)
-            let callbackValue = callback.bridgeJSLowerParameter()
             let param0Value = param0.bridgeJSLowerParameter()
+            let callbackValue = callback.bridgeJSLowerParameter()
             let ret = invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSi_Si(callbackValue, param0Value)
             return Int.bridgeJSLiftReturn(ret)
             #else
@@ -1254,8 +1607,8 @@ private enum _BJS_Closure_20BridgeJSRuntimeTestsSi_y {
         let callback = JSObject.bridgeJSLiftParameter(callbackId)
         return { [callback] param0 in
             #if arch(wasm32)
-            let callbackValue = callback.bridgeJSLowerParameter()
             let param0Value = param0.bridgeJSLowerParameter()
+            let callbackValue = callback.bridgeJSLowerParameter()
             invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSi_y(callbackValue, param0Value)
             #else
             fatalError("Only available on WebAssembly")
@@ -1315,13 +1668,13 @@ private enum _BJS_Closure_20BridgeJSRuntimeTestsSq13DataProcessorP_SS {
         let callback = JSObject.bridgeJSLiftParameter(callbackId)
         return { [callback] param0 in
             #if arch(wasm32)
-            let callbackValue = callback.bridgeJSLowerParameter()
             let (param0IsSome, param0ObjectId): (Int32, Int32)
             if let param0 {
                 (param0IsSome, param0ObjectId) = (1, (param0 as! _BridgedSwiftProtocolExportable).bridgeJSLowerAsProtocolReturn())
             } else {
                 (param0IsSome, param0ObjectId) = (0, 0)
             }
+            let callbackValue = callback.bridgeJSLowerParameter()
             let ret = invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq13DataProcessorP_SS(callbackValue, param0IsSome, param0ObjectId)
             return String.bridgeJSLiftReturn(ret)
             #else
@@ -1383,8 +1736,8 @@ private enum _BJS_Closure_20BridgeJSRuntimeTestsSq5ThemeO_SS {
         let callback = JSObject.bridgeJSLiftParameter(callbackId)
         return { [callback] param0 in
             #if arch(wasm32)
-            let callbackValue = callback.bridgeJSLowerParameter()
             let ret0 = param0.bridgeJSWithLoweredParameter { (param0IsSome, param0Bytes, param0Length) in
+                let callbackValue = callback.bridgeJSLowerParameter()
                 let ret = invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq5ThemeO_SS(callbackValue, param0IsSome, param0Bytes, param0Length)
                 return ret
             }
@@ -1449,8 +1802,8 @@ private enum _BJS_Closure_20BridgeJSRuntimeTestsSq7GreeterC_SS {
         let callback = JSObject.bridgeJSLiftParameter(callbackId)
         return { [callback] param0 in
             #if arch(wasm32)
-            let callbackValue = callback.bridgeJSLowerParameter()
             let (param0IsSome, param0Pointer) = param0.bridgeJSLowerParameter()
+            let callbackValue = callback.bridgeJSLowerParameter()
             let ret = invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq7GreeterC_SS(callbackValue, param0IsSome, param0Pointer)
             return String.bridgeJSLiftReturn(ret)
             #else
@@ -1512,8 +1865,8 @@ private enum _BJS_Closure_20BridgeJSRuntimeTestsSq7GreeterC_Sq7GreeterC {
         let callback = JSObject.bridgeJSLiftParameter(callbackId)
         return { [callback] param0 in
             #if arch(wasm32)
-            let callbackValue = callback.bridgeJSLowerParameter()
             let (param0IsSome, param0Pointer) = param0.bridgeJSLowerParameter()
+            let callbackValue = callback.bridgeJSLowerParameter()
             let ret = invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq7GreeterC_Sq7GreeterC(callbackValue, param0IsSome, param0Pointer)
             return Optional<Greeter>.bridgeJSLiftReturn(ret)
             #else
@@ -1575,8 +1928,8 @@ private enum _BJS_Closure_20BridgeJSRuntimeTestsSq9APIResultO_SS {
         let callback = JSObject.bridgeJSLiftParameter(callbackId)
         return { [callback] param0 in
             #if arch(wasm32)
-            let callbackValue = callback.bridgeJSLowerParameter()
             let (param0IsSome, param0CaseId) = param0.bridgeJSLowerParameter()
+            let callbackValue = callback.bridgeJSLowerParameter()
             let ret = invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq9APIResultO_SS(callbackValue, param0IsSome, param0CaseId)
             return String.bridgeJSLiftReturn(ret)
             #else
@@ -1638,8 +1991,8 @@ private enum _BJS_Closure_20BridgeJSRuntimeTestsSq9DirectionO_SS {
         let callback = JSObject.bridgeJSLiftParameter(callbackId)
         return { [callback] param0 in
             #if arch(wasm32)
-            let callbackValue = callback.bridgeJSLowerParameter()
             let (param0IsSome, param0Value) = param0.bridgeJSLowerParameter()
+            let callbackValue = callback.bridgeJSLowerParameter()
             let ret = invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq9DirectionO_SS(callbackValue, param0IsSome, param0Value)
             return String.bridgeJSLiftReturn(ret)
             #else
@@ -1701,8 +2054,8 @@ private enum _BJS_Closure_20BridgeJSRuntimeTestsSqSS_SS {
         let callback = JSObject.bridgeJSLiftParameter(callbackId)
         return { [callback] param0 in
             #if arch(wasm32)
-            let callbackValue = callback.bridgeJSLowerParameter()
             let ret0 = param0.bridgeJSWithLoweredParameter { (param0IsSome, param0Bytes, param0Length) in
+                let callbackValue = callback.bridgeJSLowerParameter()
                 let ret = invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSqSS_SS(callbackValue, param0IsSome, param0Bytes, param0Length)
                 return ret
             }
@@ -1767,8 +2120,8 @@ private enum _BJS_Closure_20BridgeJSRuntimeTestsSqSi_SS {
         let callback = JSObject.bridgeJSLiftParameter(callbackId)
         return { [callback] param0 in
             #if arch(wasm32)
-            let callbackValue = callback.bridgeJSLowerParameter()
             let (param0IsSome, param0Value) = param0.bridgeJSLowerParameter()
+            let callbackValue = callback.bridgeJSLowerParameter()
             let ret = invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSqSi_SS(callbackValue, param0IsSome, param0Value)
             return String.bridgeJSLiftReturn(ret)
             #else
@@ -1802,38 +2155,45 @@ public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSqS
 }
 
 #if arch(wasm32)
-@_extern(wasm, module: "bjs", name: "invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestss11FeatureFlagO_y")
-fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestss11FeatureFlagO_y_extern(_ callback: Int32, _ param0Bytes: Int32, _ param0Length: Int32) -> Void
+@_extern(wasm, module: "bjs", name: "invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsYaKSS_SS")
+fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsYaKSS_SS_extern(_ resolveRef: Int32, _ rejectRef: Int32, _ callback: Int32, _ param0Bytes: Int32, _ param0Length: Int32) -> Void
 #else
-fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestss11FeatureFlagO_y_extern(_ callback: Int32, _ param0Bytes: Int32, _ param0Length: Int32) -> Void {
+fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsYaKSS_SS_extern(_ resolveRef: Int32, _ rejectRef: Int32, _ callback: Int32, _ param0Bytes: Int32, _ param0Length: Int32) -> Void {
     fatalError("Only available on WebAssembly")
 }
 #endif
-@inline(never) fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestss11FeatureFlagO_y(_ callback: Int32, _ param0Bytes: Int32, _ param0Length: Int32) -> Void {
-    return invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestss11FeatureFlagO_y_extern(callback, param0Bytes, param0Length)
+@inline(never) fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsYaKSS_SS(_ resolveRef: Int32, _ rejectRef: Int32, _ callback: Int32, _ param0Bytes: Int32, _ param0Length: Int32) -> Void {
+    return invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsYaKSS_SS_extern(resolveRef, rejectRef, callback, param0Bytes, param0Length)
 }
 
 #if arch(wasm32)
-@_extern(wasm, module: "bjs", name: "make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestss11FeatureFlagO_y")
-fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestss11FeatureFlagO_y_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer<UInt8>, _ line: UInt32) -> Int32
+@_extern(wasm, module: "bjs", name: "make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsYaKSS_SS")
+fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsYaKSS_SS_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer<UInt8>, _ line: UInt32) -> Int32
 #else
-fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestss11FeatureFlagO_y_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer<UInt8>, _ line: UInt32) -> Int32 {
+fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsYaKSS_SS_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer<UInt8>, _ line: UInt32) -> Int32 {
     fatalError("Only available on WebAssembly")
 }
 #endif
-@inline(never) fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestss11FeatureFlagO_y(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer<UInt8>, _ line: UInt32) -> Int32 {
-    return make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestss11FeatureFlagO_y_extern(boxPtr, file, line)
+@inline(never) fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsYaKSS_SS(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer<UInt8>, _ line: UInt32) -> Int32 {
+    return make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsYaKSS_SS_extern(boxPtr, file, line)
 }
 
-private enum _BJS_Closure_20BridgeJSRuntimeTestss11FeatureFlagO_y {
-    static func bridgeJSLift(_ callbackId: Int32) -> (sending FeatureFlag) -> Void {
+private enum _BJS_Closure_20BridgeJSRuntimeTestsYaKSS_SS {
+    static func bridgeJSLift(_ callbackId: Int32) -> (String) async throws(JSException) -> String {
         let callback = JSObject.bridgeJSLiftParameter(callbackId)
-        return { [callback] param0 in
+        return { [callback] (param0: String) async throws(JSException) -> String in
             #if arch(wasm32)
-            let callbackValue = callback.bridgeJSLowerParameter()
-            param0.bridgeJSWithLoweredParameter { (param0Bytes, param0Length) in
-                invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestss11FeatureFlagO_y(callbackValue, param0Bytes, param0Length)
+            let resolved = try await _bjs_awaitPromise(makeResolveClosure: {
+                    JSTypedClosure<(sending String) -> Void>($0)
+                }, makeRejectClosure: {
+                    JSTypedClosure<(sending JSValue) -> Void>($0)
+                }) { resolveRef, rejectRef in
+                param0.bridgeJSWithLoweredParameter { (param0Bytes, param0Length) in
+                    let callbackValue = callback.bridgeJSLowerParameter()
+                    invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsYaKSS_SS(resolveRef, rejectRef, callbackValue, param0Bytes, param0Length)
+                }
             }
+            return resolved
             #else
             fatalError("Only available on WebAssembly")
             #endif
@@ -1841,10 +2201,10 @@ private enum _BJS_Closure_20BridgeJSRuntimeTestss11FeatureFlagO_y {
     }
 }
 
-extension JSTypedClosure where Signature == (sending FeatureFlag) -> Void {
-    init(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping (sending FeatureFlag) -> Void) {
+extension JSTypedClosure where Signature == (String) async throws(JSException) -> String {
+    init(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping (String) async throws(JSException) -> String) {
         self.init(
-            makeClosure: make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestss11FeatureFlagO_y,
+            makeClosure: make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsYaKSS_SS,
             body: body,
             fileID: fileID,
             line: line
@@ -1852,49 +2212,58 @@ extension JSTypedClosure where Signature == (sending FeatureFlag) -> Void {
     }
 }
 
-@_expose(wasm, "invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestss11FeatureFlagO_y")
-@_cdecl("invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestss11FeatureFlagO_y")
-public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestss11FeatureFlagO_y(_ boxPtr: UnsafeMutableRawPointer, _ param0Bytes: Int32, _ param0Length: Int32) -> Void {
+@_expose(wasm, "invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsYaKSS_SS")
+@_cdecl("invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsYaKSS_SS")
+public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsYaKSS_SS(_ boxPtr: UnsafeMutableRawPointer, _ param0Bytes: Int32, _ param0Length: Int32) -> Int32 {
     #if arch(wasm32)
-    let closure = Unmanaged<_BridgeJSTypedClosureBox<(sending FeatureFlag) -> Void>>.fromOpaque(boxPtr).takeUnretainedValue().closure
-    closure(FeatureFlag.bridgeJSLiftParameter(param0Bytes, param0Length))
+    let closure = Unmanaged<_BridgeJSTypedClosureBox<(String) async throws(JSException) -> String>>.fromOpaque(boxPtr).takeUnretainedValue().closure
+    return _bjs_makePromise(resolve: Promise_resolve_SS, reject: Promise_reject) { () async throws(JSException) -> String in
+        return try await closure(String.bridgeJSLiftParameter(param0Bytes, param0Length))
+    }
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
 #if arch(wasm32)
-@_extern(wasm, module: "bjs", name: "invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestss11WeatherDataC_y")
-fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestss11WeatherDataC_y_extern(_ callback: Int32, _ param0: Int32) -> Void
+@_extern(wasm, module: "bjs", name: "invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsYaKSS_y")
+fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsYaKSS_y_extern(_ resolveRef: Int32, _ rejectRef: Int32, _ callback: Int32, _ param0Bytes: Int32, _ param0Length: Int32) -> Void
 #else
-fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestss11WeatherDataC_y_extern(_ callback: Int32, _ param0: Int32) -> Void {
+fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsYaKSS_y_extern(_ resolveRef: Int32, _ rejectRef: Int32, _ callback: Int32, _ param0Bytes: Int32, _ param0Length: Int32) -> Void {
     fatalError("Only available on WebAssembly")
 }
 #endif
-@inline(never) fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestss11WeatherDataC_y(_ callback: Int32, _ param0: Int32) -> Void {
-    return invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestss11WeatherDataC_y_extern(callback, param0)
+@inline(never) fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsYaKSS_y(_ resolveRef: Int32, _ rejectRef: Int32, _ callback: Int32, _ param0Bytes: Int32, _ param0Length: Int32) -> Void {
+    return invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsYaKSS_y_extern(resolveRef, rejectRef, callback, param0Bytes, param0Length)
 }
 
 #if arch(wasm32)
-@_extern(wasm, module: "bjs", name: "make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestss11WeatherDataC_y")
-fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestss11WeatherDataC_y_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer<UInt8>, _ line: UInt32) -> Int32
+@_extern(wasm, module: "bjs", name: "make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsYaKSS_y")
+fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsYaKSS_y_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer<UInt8>, _ line: UInt32) -> Int32
 #else
-fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestss11WeatherDataC_y_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer<UInt8>, _ line: UInt32) -> Int32 {
+fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsYaKSS_y_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer<UInt8>, _ line: UInt32) -> Int32 {
     fatalError("Only available on WebAssembly")
 }
 #endif
-@inline(never) fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestss11WeatherDataC_y(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer<UInt8>, _ line: UInt32) -> Int32 {
-    return make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestss11WeatherDataC_y_extern(boxPtr, file, line)
+@inline(never) fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsYaKSS_y(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer<UInt8>, _ line: UInt32) -> Int32 {
+    return make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsYaKSS_y_extern(boxPtr, file, line)
 }
 
-private enum _BJS_Closure_20BridgeJSRuntimeTestss11WeatherDataC_y {
-    static func bridgeJSLift(_ callbackId: Int32) -> (sending WeatherData) -> Void {
+private enum _BJS_Closure_20BridgeJSRuntimeTestsYaKSS_y {
+    static func bridgeJSLift(_ callbackId: Int32) -> (String) async throws(JSException) -> Void {
         let callback = JSObject.bridgeJSLiftParameter(callbackId)
-        return { [callback] param0 in
+        return { [callback] (param0: String) async throws(JSException) -> Void in
             #if arch(wasm32)
-            let callbackValue = callback.bridgeJSLowerParameter()
-            let param0Value = param0.bridgeJSLowerParameter()
-            invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestss11WeatherDataC_y(callbackValue, param0Value)
+            try await _bjs_awaitPromise(makeResolveClosure: {
+                    JSTypedClosure<() -> Void>($0)
+                }, makeRejectClosure: {
+                    JSTypedClosure<(sending JSValue) -> Void>($0)
+                }) { resolveRef, rejectRef in
+                param0.bridgeJSWithLoweredParameter { (param0Bytes, param0Length) in
+                    let callbackValue = callback.bridgeJSLowerParameter()
+                    invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsYaKSS_y(resolveRef, rejectRef, callbackValue, param0Bytes, param0Length)
+                }
+            }
             #else
             fatalError("Only available on WebAssembly")
             #endif
@@ -1902,10 +2271,10 @@ private enum _BJS_Closure_20BridgeJSRuntimeTestss11WeatherDataC_y {
     }
 }
 
-extension JSTypedClosure where Signature == (sending WeatherData) -> Void {
-    init(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping (sending WeatherData) -> Void) {
+extension JSTypedClosure where Signature == (String) async throws(JSException) -> Void {
+    init(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping (String) async throws(JSException) -> Void) {
         self.init(
-            makeClosure: make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestss11WeatherDataC_y,
+            makeClosure: make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsYaKSS_y,
             body: body,
             fileID: fileID,
             line: line
@@ -1913,49 +2282,58 @@ extension JSTypedClosure where Signature == (sending WeatherData) -> Void {
     }
 }
 
-@_expose(wasm, "invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestss11WeatherDataC_y")
-@_cdecl("invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestss11WeatherDataC_y")
-public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestss11WeatherDataC_y(_ boxPtr: UnsafeMutableRawPointer, _ param0: Int32) -> Void {
+@_expose(wasm, "invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsYaKSS_y")
+@_cdecl("invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsYaKSS_y")
+public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsYaKSS_y(_ boxPtr: UnsafeMutableRawPointer, _ param0Bytes: Int32, _ param0Length: Int32) -> Int32 {
     #if arch(wasm32)
-    let closure = Unmanaged<_BridgeJSTypedClosureBox<(sending WeatherData) -> Void>>.fromOpaque(boxPtr).takeUnretainedValue().closure
-    closure(WeatherData.bridgeJSLiftParameter(param0))
+    let closure = Unmanaged<_BridgeJSTypedClosureBox<(String) async throws(JSException) -> Void>>.fromOpaque(boxPtr).takeUnretainedValue().closure
+    return _bjs_makePromise(resolve: Promise_resolve_y, reject: Promise_reject) { () async throws(JSException) in
+        try await closure(String.bridgeJSLiftParameter(param0Bytes, param0Length))
+    }
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
 #if arch(wasm32)
-@_extern(wasm, module: "bjs", name: "invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestss7JSValueV_y")
-fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestss7JSValueV_y_extern(_ callback: Int32, _ param0Kind: Int32, _ param0Payload1: Int32, _ param0Payload2: Float64) -> Void
+@_extern(wasm, module: "bjs", name: "invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsYaKSb_18AsyncPayloadResultO")
+fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsYaKSb_18AsyncPayloadResultO_extern(_ resolveRef: Int32, _ rejectRef: Int32, _ callback: Int32, _ param0: Int32) -> Void
 #else
-fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestss7JSValueV_y_extern(_ callback: Int32, _ param0Kind: Int32, _ param0Payload1: Int32, _ param0Payload2: Float64) -> Void {
+fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsYaKSb_18AsyncPayloadResultO_extern(_ resolveRef: Int32, _ rejectRef: Int32, _ callback: Int32, _ param0: Int32) -> Void {
     fatalError("Only available on WebAssembly")
 }
 #endif
-@inline(never) fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestss7JSValueV_y(_ callback: Int32, _ param0Kind: Int32, _ param0Payload1: Int32, _ param0Payload2: Float64) -> Void {
-    return invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestss7JSValueV_y_extern(callback, param0Kind, param0Payload1, param0Payload2)
+@inline(never) fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsYaKSb_18AsyncPayloadResultO(_ resolveRef: Int32, _ rejectRef: Int32, _ callback: Int32, _ param0: Int32) -> Void {
+    return invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsYaKSb_18AsyncPayloadResultO_extern(resolveRef, rejectRef, callback, param0)
 }
 
 #if arch(wasm32)
-@_extern(wasm, module: "bjs", name: "make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestss7JSValueV_y")
-fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestss7JSValueV_y_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer<UInt8>, _ line: UInt32) -> Int32
+@_extern(wasm, module: "bjs", name: "make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsYaKSb_18AsyncPayloadResultO")
+fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsYaKSb_18AsyncPayloadResultO_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer<UInt8>, _ line: UInt32) -> Int32
 #else
-fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestss7JSValueV_y_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer<UInt8>, _ line: UInt32) -> Int32 {
+fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsYaKSb_18AsyncPayloadResultO_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer<UInt8>, _ line: UInt32) -> Int32 {
     fatalError("Only available on WebAssembly")
 }
 #endif
-@inline(never) fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestss7JSValueV_y(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer<UInt8>, _ line: UInt32) -> Int32 {
-    return make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestss7JSValueV_y_extern(boxPtr, file, line)
+@inline(never) fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsYaKSb_18AsyncPayloadResultO(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer<UInt8>, _ line: UInt32) -> Int32 {
+    return make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsYaKSb_18AsyncPayloadResultO_extern(boxPtr, file, line)
 }
 
-private enum _BJS_Closure_20BridgeJSRuntimeTestss7JSValueV_y {
-    static func bridgeJSLift(_ callbackId: Int32) -> (sending JSValue) -> Void {
+private enum _BJS_Closure_20BridgeJSRuntimeTestsYaKSb_18AsyncPayloadResultO {
+    static func bridgeJSLift(_ callbackId: Int32) -> (Bool) async throws(JSException) -> AsyncPayloadResult {
         let callback = JSObject.bridgeJSLiftParameter(callbackId)
-        return { [callback] param0 in
+        return { [callback] (param0: Bool) async throws(JSException) -> AsyncPayloadResult in
             #if arch(wasm32)
-            let callbackValue = callback.bridgeJSLowerParameter()
-            let (param0Kind, param0Payload1, param0Payload2) = param0.bridgeJSLowerParameter()
-            invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestss7JSValueV_y(callbackValue, param0Kind, param0Payload1, param0Payload2)
+            let resolved = try await _bjs_awaitPromise(makeResolveClosure: {
+                    JSTypedClosure<(sending AsyncPayloadResult) -> Void>($0)
+                }, makeRejectClosure: {
+                    JSTypedClosure<(sending JSValue) -> Void>($0)
+                }) { resolveRef, rejectRef in
+                let param0Value = param0.bridgeJSLowerParameter()
+                let callbackValue = callback.bridgeJSLowerParameter()
+                invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsYaKSb_18AsyncPayloadResultO(resolveRef, rejectRef, callbackValue, param0Value)
+            }
+            return resolved
             #else
             fatalError("Only available on WebAssembly")
             #endif
@@ -1963,10 +2341,10 @@ private enum _BJS_Closure_20BridgeJSRuntimeTestss7JSValueV_y {
     }
 }
 
-extension JSTypedClosure where Signature == (sending JSValue) -> Void {
-    init(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping (sending JSValue) -> Void) {
+extension JSTypedClosure where Signature == (Bool) async throws(JSException) -> AsyncPayloadResult {
+    init(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping (Bool) async throws(JSException) -> AsyncPayloadResult) {
         self.init(
-            makeClosure: make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestss7JSValueV_y,
+            makeClosure: make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsYaKSb_18AsyncPayloadResultO,
             body: body,
             fileID: fileID,
             line: line
@@ -1974,50 +2352,59 @@ extension JSTypedClosure where Signature == (sending JSValue) -> Void {
     }
 }
 
-@_expose(wasm, "invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestss7JSValueV_y")
-@_cdecl("invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestss7JSValueV_y")
-public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestss7JSValueV_y(_ boxPtr: UnsafeMutableRawPointer, _ param0Kind: Int32, _ param0Payload1: Int32, _ param0Payload2: Float64) -> Void {
+@_expose(wasm, "invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsYaKSb_18AsyncPayloadResultO")
+@_cdecl("invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsYaKSb_18AsyncPayloadResultO")
+public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsYaKSb_18AsyncPayloadResultO(_ boxPtr: UnsafeMutableRawPointer, _ param0: Int32) -> Int32 {
     #if arch(wasm32)
-    let closure = Unmanaged<_BridgeJSTypedClosureBox<(sending JSValue) -> Void>>.fromOpaque(boxPtr).takeUnretainedValue().closure
-    closure(JSValue.bridgeJSLiftParameter(param0Kind, param0Payload1, param0Payload2))
+    let closure = Unmanaged<_BridgeJSTypedClosureBox<(Bool) async throws(JSException) -> AsyncPayloadResult>>.fromOpaque(boxPtr).takeUnretainedValue().closure
+    return _bjs_makePromise(resolve: Promise_resolve_18AsyncPayloadResultO, reject: Promise_reject) { () async throws(JSException) -> AsyncPayloadResult in
+        return try await closure(Bool.bridgeJSLiftParameter(param0))
+    }
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
 #if arch(wasm32)
-@_extern(wasm, module: "bjs", name: "invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSS_y")
-fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSS_y_extern(_ callback: Int32, _ param0Bytes: Int32, _ param0Length: Int32) -> Void
+@_extern(wasm, module: "bjs", name: "invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsYaSS_SS")
+fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsYaSS_SS_extern(_ resolveRef: Int32, _ rejectRef: Int32, _ callback: Int32, _ param0Bytes: Int32, _ param0Length: Int32) -> Void
 #else
-fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSS_y_extern(_ callback: Int32, _ param0Bytes: Int32, _ param0Length: Int32) -> Void {
+fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsYaSS_SS_extern(_ resolveRef: Int32, _ rejectRef: Int32, _ callback: Int32, _ param0Bytes: Int32, _ param0Length: Int32) -> Void {
     fatalError("Only available on WebAssembly")
 }
 #endif
-@inline(never) fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSS_y(_ callback: Int32, _ param0Bytes: Int32, _ param0Length: Int32) -> Void {
-    return invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSS_y_extern(callback, param0Bytes, param0Length)
+@inline(never) fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsYaSS_SS(_ resolveRef: Int32, _ rejectRef: Int32, _ callback: Int32, _ param0Bytes: Int32, _ param0Length: Int32) -> Void {
+    return invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsYaSS_SS_extern(resolveRef, rejectRef, callback, param0Bytes, param0Length)
 }
 
 #if arch(wasm32)
-@_extern(wasm, module: "bjs", name: "make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSS_y")
-fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSS_y_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer<UInt8>, _ line: UInt32) -> Int32
+@_extern(wasm, module: "bjs", name: "make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsYaSS_SS")
+fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsYaSS_SS_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer<UInt8>, _ line: UInt32) -> Int32
 #else
-fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSS_y_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer<UInt8>, _ line: UInt32) -> Int32 {
+fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsYaSS_SS_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer<UInt8>, _ line: UInt32) -> Int32 {
     fatalError("Only available on WebAssembly")
 }
 #endif
-@inline(never) fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSS_y(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer<UInt8>, _ line: UInt32) -> Int32 {
-    return make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSS_y_extern(boxPtr, file, line)
+@inline(never) fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsYaSS_SS(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer<UInt8>, _ line: UInt32) -> Int32 {
+    return make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsYaSS_SS_extern(boxPtr, file, line)
 }
 
-private enum _BJS_Closure_20BridgeJSRuntimeTestssSS_y {
-    static func bridgeJSLift(_ callbackId: Int32) -> (sending String) -> Void {
+private enum _BJS_Closure_20BridgeJSRuntimeTestsYaSS_SS {
+    static func bridgeJSLift(_ callbackId: Int32) -> (String) async -> String {
         let callback = JSObject.bridgeJSLiftParameter(callbackId)
-        return { [callback] param0 in
+        return { [callback] (param0: String) async -> String in
             #if arch(wasm32)
-            let callbackValue = callback.bridgeJSLowerParameter()
-            param0.bridgeJSWithLoweredParameter { (param0Bytes, param0Length) in
-                invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSS_y(callbackValue, param0Bytes, param0Length)
+            let resolved = try! await _bjs_awaitPromise(makeResolveClosure: {
+                    JSTypedClosure<(sending String) -> Void>($0)
+                }, makeRejectClosure: {
+                    JSTypedClosure<(sending JSValue) -> Void>($0)
+                }) { resolveRef, rejectRef in
+                param0.bridgeJSWithLoweredParameter { (param0Bytes, param0Length) in
+                    let callbackValue = callback.bridgeJSLowerParameter()
+                    invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsYaSS_SS(resolveRef, rejectRef, callbackValue, param0Bytes, param0Length)
+                }
             }
+            return resolved
             #else
             fatalError("Only available on WebAssembly")
             #endif
@@ -2025,10 +2412,10 @@ private enum _BJS_Closure_20BridgeJSRuntimeTestssSS_y {
     }
 }
 
-extension JSTypedClosure where Signature == (sending String) -> Void {
-    init(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping (sending String) -> Void) {
+extension JSTypedClosure where Signature == (String) async -> String {
+    init(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping (String) async -> String) {
         self.init(
-            makeClosure: make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSS_y,
+            makeClosure: make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsYaSS_SS,
             body: body,
             fileID: fileID,
             line: line
@@ -2036,49 +2423,58 @@ extension JSTypedClosure where Signature == (sending String) -> Void {
     }
 }
 
-@_expose(wasm, "invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSS_y")
-@_cdecl("invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSS_y")
-public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSS_y(_ boxPtr: UnsafeMutableRawPointer, _ param0Bytes: Int32, _ param0Length: Int32) -> Void {
+@_expose(wasm, "invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsYaSS_SS")
+@_cdecl("invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsYaSS_SS")
+public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsYaSS_SS(_ boxPtr: UnsafeMutableRawPointer, _ param0Bytes: Int32, _ param0Length: Int32) -> Int32 {
     #if arch(wasm32)
-    let closure = Unmanaged<_BridgeJSTypedClosureBox<(sending String) -> Void>>.fromOpaque(boxPtr).takeUnretainedValue().closure
-    closure(String.bridgeJSLiftParameter(param0Bytes, param0Length))
+    let closure = Unmanaged<_BridgeJSTypedClosureBox<(String) async -> String>>.fromOpaque(boxPtr).takeUnretainedValue().closure
+    return _bjs_makePromise(resolve: Promise_resolve_SS, reject: Promise_reject) {
+        return await closure(String.bridgeJSLiftParameter(param0Bytes, param0Length))
+    }
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
 #if arch(wasm32)
-@_extern(wasm, module: "bjs", name: "invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSaSS_y")
-fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSaSS_y_extern(_ callback: Int32) -> Void
+@_extern(wasm, module: "bjs", name: "invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsYaSd_9DataPointV")
+fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsYaSd_9DataPointV_extern(_ resolveRef: Int32, _ rejectRef: Int32, _ callback: Int32, _ param0: Float64) -> Void
 #else
-fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSaSS_y_extern(_ callback: Int32) -> Void {
+fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsYaSd_9DataPointV_extern(_ resolveRef: Int32, _ rejectRef: Int32, _ callback: Int32, _ param0: Float64) -> Void {
     fatalError("Only available on WebAssembly")
 }
 #endif
-@inline(never) fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSaSS_y(_ callback: Int32) -> Void {
-    return invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSaSS_y_extern(callback)
+@inline(never) fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsYaSd_9DataPointV(_ resolveRef: Int32, _ rejectRef: Int32, _ callback: Int32, _ param0: Float64) -> Void {
+    return invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsYaSd_9DataPointV_extern(resolveRef, rejectRef, callback, param0)
 }
 
 #if arch(wasm32)
-@_extern(wasm, module: "bjs", name: "make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSaSS_y")
-fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSaSS_y_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer<UInt8>, _ line: UInt32) -> Int32
+@_extern(wasm, module: "bjs", name: "make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsYaSd_9DataPointV")
+fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsYaSd_9DataPointV_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer<UInt8>, _ line: UInt32) -> Int32
 #else
-fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSaSS_y_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer<UInt8>, _ line: UInt32) -> Int32 {
+fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsYaSd_9DataPointV_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer<UInt8>, _ line: UInt32) -> Int32 {
     fatalError("Only available on WebAssembly")
 }
 #endif
-@inline(never) fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSaSS_y(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer<UInt8>, _ line: UInt32) -> Int32 {
-    return make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSaSS_y_extern(boxPtr, file, line)
+@inline(never) fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsYaSd_9DataPointV(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer<UInt8>, _ line: UInt32) -> Int32 {
+    return make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsYaSd_9DataPointV_extern(boxPtr, file, line)
 }
 
-private enum _BJS_Closure_20BridgeJSRuntimeTestssSaSS_y {
-    static func bridgeJSLift(_ callbackId: Int32) -> (sending [String]) -> Void {
+private enum _BJS_Closure_20BridgeJSRuntimeTestsYaSd_9DataPointV {
+    static func bridgeJSLift(_ callbackId: Int32) -> (Double) async -> DataPoint {
         let callback = JSObject.bridgeJSLiftParameter(callbackId)
-        return { [callback] param0 in
+        return { [callback] (param0: Double) async -> DataPoint in
             #if arch(wasm32)
-            let callbackValue = callback.bridgeJSLowerParameter()
-            let _ = param0.bridgeJSLowerParameter()
-            invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSaSS_y(callbackValue)
+            let resolved = try! await _bjs_awaitPromise(makeResolveClosure: {
+                    JSTypedClosure<(sending DataPoint) -> Void>($0)
+                }, makeRejectClosure: {
+                    JSTypedClosure<(sending JSValue) -> Void>($0)
+                }) { resolveRef, rejectRef in
+                let param0Value = param0.bridgeJSLowerParameter()
+                let callbackValue = callback.bridgeJSLowerParameter()
+                invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsYaSd_9DataPointV(resolveRef, rejectRef, callbackValue, param0Value)
+            }
+            return resolved
             #else
             fatalError("Only available on WebAssembly")
             #endif
@@ -2086,10 +2482,10 @@ private enum _BJS_Closure_20BridgeJSRuntimeTestssSaSS_y {
     }
 }
 
-extension JSTypedClosure where Signature == (sending [String]) -> Void {
-    init(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping (sending [String]) -> Void) {
+extension JSTypedClosure where Signature == (Double) async -> DataPoint {
+    init(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping (Double) async -> DataPoint) {
         self.init(
-            makeClosure: make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSaSS_y,
+            makeClosure: make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsYaSd_9DataPointV,
             body: body,
             fileID: fileID,
             line: line
@@ -2097,49 +2493,52 @@ extension JSTypedClosure where Signature == (sending [String]) -> Void {
     }
 }
 
-@_expose(wasm, "invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSaSS_y")
-@_cdecl("invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSaSS_y")
-public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSaSS_y(_ boxPtr: UnsafeMutableRawPointer) -> Void {
+@_expose(wasm, "invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsYaSd_9DataPointV")
+@_cdecl("invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsYaSd_9DataPointV")
+public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsYaSd_9DataPointV(_ boxPtr: UnsafeMutableRawPointer, _ param0: Float64) -> Int32 {
     #if arch(wasm32)
-    let closure = Unmanaged<_BridgeJSTypedClosureBox<(sending [String]) -> Void>>.fromOpaque(boxPtr).takeUnretainedValue().closure
-    closure([String].bridgeJSLiftParameter())
+    let closure = Unmanaged<_BridgeJSTypedClosureBox<(Double) async -> DataPoint>>.fromOpaque(boxPtr).takeUnretainedValue().closure
+    return _bjs_makePromise(resolve: Promise_resolve_9DataPointV, reject: Promise_reject) {
+        return await closure(Double.bridgeJSLiftParameter(param0))
+    }
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
 #if arch(wasm32)
-@_extern(wasm, module: "bjs", name: "invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSaSb_y")
-fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSaSb_y_extern(_ callback: Int32) -> Void
+@_extern(wasm, module: "bjs", name: "invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestss11FeatureFlagO_y")
+fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestss11FeatureFlagO_y_extern(_ callback: Int32, _ param0Bytes: Int32, _ param0Length: Int32) -> Void
 #else
-fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSaSb_y_extern(_ callback: Int32) -> Void {
+fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestss11FeatureFlagO_y_extern(_ callback: Int32, _ param0Bytes: Int32, _ param0Length: Int32) -> Void {
     fatalError("Only available on WebAssembly")
 }
 #endif
-@inline(never) fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSaSb_y(_ callback: Int32) -> Void {
-    return invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSaSb_y_extern(callback)
+@inline(never) fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestss11FeatureFlagO_y(_ callback: Int32, _ param0Bytes: Int32, _ param0Length: Int32) -> Void {
+    return invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestss11FeatureFlagO_y_extern(callback, param0Bytes, param0Length)
 }
 
 #if arch(wasm32)
-@_extern(wasm, module: "bjs", name: "make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSaSb_y")
-fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSaSb_y_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer<UInt8>, _ line: UInt32) -> Int32
+@_extern(wasm, module: "bjs", name: "make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestss11FeatureFlagO_y")
+fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestss11FeatureFlagO_y_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer<UInt8>, _ line: UInt32) -> Int32
 #else
-fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSaSb_y_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer<UInt8>, _ line: UInt32) -> Int32 {
+fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestss11FeatureFlagO_y_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer<UInt8>, _ line: UInt32) -> Int32 {
     fatalError("Only available on WebAssembly")
 }
 #endif
-@inline(never) fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSaSb_y(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer<UInt8>, _ line: UInt32) -> Int32 {
-    return make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSaSb_y_extern(boxPtr, file, line)
+@inline(never) fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestss11FeatureFlagO_y(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer<UInt8>, _ line: UInt32) -> Int32 {
+    return make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestss11FeatureFlagO_y_extern(boxPtr, file, line)
 }
 
-private enum _BJS_Closure_20BridgeJSRuntimeTestssSaSb_y {
-    static func bridgeJSLift(_ callbackId: Int32) -> (sending [Bool]) -> Void {
+private enum _BJS_Closure_20BridgeJSRuntimeTestss11FeatureFlagO_y {
+    static func bridgeJSLift(_ callbackId: Int32) -> (sending FeatureFlag) -> Void {
         let callback = JSObject.bridgeJSLiftParameter(callbackId)
         return { [callback] param0 in
             #if arch(wasm32)
-            let callbackValue = callback.bridgeJSLowerParameter()
-            let _ = param0.bridgeJSLowerParameter()
-            invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSaSb_y(callbackValue)
+            param0.bridgeJSWithLoweredParameter { (param0Bytes, param0Length) in
+                let callbackValue = callback.bridgeJSLowerParameter()
+                invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestss11FeatureFlagO_y(callbackValue, param0Bytes, param0Length)
+            }
             #else
             fatalError("Only available on WebAssembly")
             #endif
@@ -2147,10 +2546,10 @@ private enum _BJS_Closure_20BridgeJSRuntimeTestssSaSb_y {
     }
 }
 
-extension JSTypedClosure where Signature == (sending [Bool]) -> Void {
-    init(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping (sending [Bool]) -> Void) {
+extension JSTypedClosure where Signature == (sending FeatureFlag) -> Void {
+    init(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping (sending FeatureFlag) -> Void) {
         self.init(
-            makeClosure: make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSaSb_y,
+            makeClosure: make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestss11FeatureFlagO_y,
             body: body,
             fileID: fileID,
             line: line
@@ -2158,49 +2557,49 @@ extension JSTypedClosure where Signature == (sending [Bool]) -> Void {
     }
 }
 
-@_expose(wasm, "invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSaSb_y")
-@_cdecl("invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSaSb_y")
-public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSaSb_y(_ boxPtr: UnsafeMutableRawPointer) -> Void {
+@_expose(wasm, "invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestss11FeatureFlagO_y")
+@_cdecl("invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestss11FeatureFlagO_y")
+public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestss11FeatureFlagO_y(_ boxPtr: UnsafeMutableRawPointer, _ param0Bytes: Int32, _ param0Length: Int32) -> Void {
     #if arch(wasm32)
-    let closure = Unmanaged<_BridgeJSTypedClosureBox<(sending [Bool]) -> Void>>.fromOpaque(boxPtr).takeUnretainedValue().closure
-    closure([Bool].bridgeJSLiftParameter())
+    let closure = Unmanaged<_BridgeJSTypedClosureBox<(sending FeatureFlag) -> Void>>.fromOpaque(boxPtr).takeUnretainedValue().closure
+    closure(FeatureFlag.bridgeJSLiftParameter(param0Bytes, param0Length))
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
 #if arch(wasm32)
-@_extern(wasm, module: "bjs", name: "invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSaSd_y")
-fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSaSd_y_extern(_ callback: Int32) -> Void
+@_extern(wasm, module: "bjs", name: "invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestss11WeatherDataC_y")
+fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestss11WeatherDataC_y_extern(_ callback: Int32, _ param0: Int32) -> Void
 #else
-fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSaSd_y_extern(_ callback: Int32) -> Void {
+fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestss11WeatherDataC_y_extern(_ callback: Int32, _ param0: Int32) -> Void {
     fatalError("Only available on WebAssembly")
 }
 #endif
-@inline(never) fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSaSd_y(_ callback: Int32) -> Void {
-    return invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSaSd_y_extern(callback)
+@inline(never) fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestss11WeatherDataC_y(_ callback: Int32, _ param0: Int32) -> Void {
+    return invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestss11WeatherDataC_y_extern(callback, param0)
 }
 
 #if arch(wasm32)
-@_extern(wasm, module: "bjs", name: "make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSaSd_y")
-fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSaSd_y_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer<UInt8>, _ line: UInt32) -> Int32
+@_extern(wasm, module: "bjs", name: "make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestss11WeatherDataC_y")
+fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestss11WeatherDataC_y_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer<UInt8>, _ line: UInt32) -> Int32
 #else
-fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSaSd_y_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer<UInt8>, _ line: UInt32) -> Int32 {
+fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestss11WeatherDataC_y_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer<UInt8>, _ line: UInt32) -> Int32 {
     fatalError("Only available on WebAssembly")
 }
 #endif
-@inline(never) fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSaSd_y(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer<UInt8>, _ line: UInt32) -> Int32 {
-    return make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSaSd_y_extern(boxPtr, file, line)
+@inline(never) fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestss11WeatherDataC_y(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer<UInt8>, _ line: UInt32) -> Int32 {
+    return make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestss11WeatherDataC_y_extern(boxPtr, file, line)
 }
 
-private enum _BJS_Closure_20BridgeJSRuntimeTestssSaSd_y {
-    static func bridgeJSLift(_ callbackId: Int32) -> (sending [Double]) -> Void {
+private enum _BJS_Closure_20BridgeJSRuntimeTestss11WeatherDataC_y {
+    static func bridgeJSLift(_ callbackId: Int32) -> (sending WeatherData) -> Void {
         let callback = JSObject.bridgeJSLiftParameter(callbackId)
         return { [callback] param0 in
             #if arch(wasm32)
+            let param0Value = param0.bridgeJSLowerParameter()
             let callbackValue = callback.bridgeJSLowerParameter()
-            let _ = param0.bridgeJSLowerParameter()
-            invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSaSd_y(callbackValue)
+            invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestss11WeatherDataC_y(callbackValue, param0Value)
             #else
             fatalError("Only available on WebAssembly")
             #endif
@@ -2208,10 +2607,10 @@ private enum _BJS_Closure_20BridgeJSRuntimeTestssSaSd_y {
     }
 }
 
-extension JSTypedClosure where Signature == (sending [Double]) -> Void {
-    init(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping (sending [Double]) -> Void) {
+extension JSTypedClosure where Signature == (sending WeatherData) -> Void {
+    init(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping (sending WeatherData) -> Void) {
         self.init(
-            makeClosure: make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSaSd_y,
+            makeClosure: make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestss11WeatherDataC_y,
             body: body,
             fileID: fileID,
             line: line
@@ -2219,49 +2618,49 @@ extension JSTypedClosure where Signature == (sending [Double]) -> Void {
     }
 }
 
-@_expose(wasm, "invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSaSd_y")
-@_cdecl("invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSaSd_y")
-public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSaSd_y(_ boxPtr: UnsafeMutableRawPointer) -> Void {
+@_expose(wasm, "invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestss11WeatherDataC_y")
+@_cdecl("invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestss11WeatherDataC_y")
+public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestss11WeatherDataC_y(_ boxPtr: UnsafeMutableRawPointer, _ param0: Int32) -> Void {
     #if arch(wasm32)
-    let closure = Unmanaged<_BridgeJSTypedClosureBox<(sending [Double]) -> Void>>.fromOpaque(boxPtr).takeUnretainedValue().closure
-    closure([Double].bridgeJSLiftParameter())
+    let closure = Unmanaged<_BridgeJSTypedClosureBox<(sending WeatherData) -> Void>>.fromOpaque(boxPtr).takeUnretainedValue().closure
+    closure(WeatherData.bridgeJSLiftParameter(param0))
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
 #if arch(wasm32)
-@_extern(wasm, module: "bjs", name: "invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSb_y")
-fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSb_y_extern(_ callback: Int32, _ param0: Int32) -> Void
+@_extern(wasm, module: "bjs", name: "invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestss18AsyncPayloadResultO_y")
+fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestss18AsyncPayloadResultO_y_extern(_ callback: Int32, _ param0: Int32) -> Void
 #else
-fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSb_y_extern(_ callback: Int32, _ param0: Int32) -> Void {
+fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestss18AsyncPayloadResultO_y_extern(_ callback: Int32, _ param0: Int32) -> Void {
     fatalError("Only available on WebAssembly")
 }
 #endif
-@inline(never) fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSb_y(_ callback: Int32, _ param0: Int32) -> Void {
-    return invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSb_y_extern(callback, param0)
+@inline(never) fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestss18AsyncPayloadResultO_y(_ callback: Int32, _ param0: Int32) -> Void {
+    return invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestss18AsyncPayloadResultO_y_extern(callback, param0)
 }
 
 #if arch(wasm32)
-@_extern(wasm, module: "bjs", name: "make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSb_y")
-fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSb_y_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer<UInt8>, _ line: UInt32) -> Int32
+@_extern(wasm, module: "bjs", name: "make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestss18AsyncPayloadResultO_y")
+fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestss18AsyncPayloadResultO_y_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer<UInt8>, _ line: UInt32) -> Int32
 #else
-fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSb_y_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer<UInt8>, _ line: UInt32) -> Int32 {
+fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestss18AsyncPayloadResultO_y_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer<UInt8>, _ line: UInt32) -> Int32 {
     fatalError("Only available on WebAssembly")
 }
 #endif
-@inline(never) fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSb_y(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer<UInt8>, _ line: UInt32) -> Int32 {
-    return make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSb_y_extern(boxPtr, file, line)
+@inline(never) fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestss18AsyncPayloadResultO_y(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer<UInt8>, _ line: UInt32) -> Int32 {
+    return make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestss18AsyncPayloadResultO_y_extern(boxPtr, file, line)
 }
 
-private enum _BJS_Closure_20BridgeJSRuntimeTestssSb_y {
-    static func bridgeJSLift(_ callbackId: Int32) -> (sending Bool) -> Void {
+private enum _BJS_Closure_20BridgeJSRuntimeTestss18AsyncPayloadResultO_y {
+    static func bridgeJSLift(_ callbackId: Int32) -> (sending AsyncPayloadResult) -> Void {
         let callback = JSObject.bridgeJSLiftParameter(callbackId)
         return { [callback] param0 in
             #if arch(wasm32)
+            let param0CaseId = param0.bridgeJSLowerParameter()
             let callbackValue = callback.bridgeJSLowerParameter()
-            let param0Value = param0.bridgeJSLowerParameter()
-            invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSb_y(callbackValue, param0Value)
+            invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestss18AsyncPayloadResultO_y(callbackValue, param0CaseId)
             #else
             fatalError("Only available on WebAssembly")
             #endif
@@ -2269,10 +2668,10 @@ private enum _BJS_Closure_20BridgeJSRuntimeTestssSb_y {
     }
 }
 
-extension JSTypedClosure where Signature == (sending Bool) -> Void {
-    init(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping (sending Bool) -> Void) {
+extension JSTypedClosure where Signature == (sending AsyncPayloadResult) -> Void {
+    init(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping (sending AsyncPayloadResult) -> Void) {
         self.init(
-            makeClosure: make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSb_y,
+            makeClosure: make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestss18AsyncPayloadResultO_y,
             body: body,
             fileID: fileID,
             line: line
@@ -2280,49 +2679,49 @@ extension JSTypedClosure where Signature == (sending Bool) -> Void {
     }
 }
 
-@_expose(wasm, "invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSb_y")
-@_cdecl("invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSb_y")
-public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSb_y(_ boxPtr: UnsafeMutableRawPointer, _ param0: Int32) -> Void {
+@_expose(wasm, "invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestss18AsyncPayloadResultO_y")
+@_cdecl("invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestss18AsyncPayloadResultO_y")
+public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestss18AsyncPayloadResultO_y(_ boxPtr: UnsafeMutableRawPointer, _ param0: Int32) -> Void {
     #if arch(wasm32)
-    let closure = Unmanaged<_BridgeJSTypedClosureBox<(sending Bool) -> Void>>.fromOpaque(boxPtr).takeUnretainedValue().closure
-    closure(Bool.bridgeJSLiftParameter(param0))
+    let closure = Unmanaged<_BridgeJSTypedClosureBox<(sending AsyncPayloadResult) -> Void>>.fromOpaque(boxPtr).takeUnretainedValue().closure
+    closure(AsyncPayloadResult.bridgeJSLiftParameter(param0))
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
 #if arch(wasm32)
-@_extern(wasm, module: "bjs", name: "invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSd_y")
-fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSd_y_extern(_ callback: Int32, _ param0: Float64) -> Void
+@_extern(wasm, module: "bjs", name: "invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestss26AsyncImportedPayloadResultO_y")
+fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestss26AsyncImportedPayloadResultO_y_extern(_ callback: Int32, _ param0: Int32) -> Void
 #else
-fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSd_y_extern(_ callback: Int32, _ param0: Float64) -> Void {
+fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestss26AsyncImportedPayloadResultO_y_extern(_ callback: Int32, _ param0: Int32) -> Void {
     fatalError("Only available on WebAssembly")
 }
 #endif
-@inline(never) fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSd_y(_ callback: Int32, _ param0: Float64) -> Void {
-    return invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSd_y_extern(callback, param0)
+@inline(never) fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestss26AsyncImportedPayloadResultO_y(_ callback: Int32, _ param0: Int32) -> Void {
+    return invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestss26AsyncImportedPayloadResultO_y_extern(callback, param0)
 }
 
 #if arch(wasm32)
-@_extern(wasm, module: "bjs", name: "make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSd_y")
-fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSd_y_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer<UInt8>, _ line: UInt32) -> Int32
+@_extern(wasm, module: "bjs", name: "make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestss26AsyncImportedPayloadResultO_y")
+fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestss26AsyncImportedPayloadResultO_y_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer<UInt8>, _ line: UInt32) -> Int32
 #else
-fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSd_y_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer<UInt8>, _ line: UInt32) -> Int32 {
+fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestss26AsyncImportedPayloadResultO_y_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer<UInt8>, _ line: UInt32) -> Int32 {
     fatalError("Only available on WebAssembly")
 }
 #endif
-@inline(never) fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSd_y(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer<UInt8>, _ line: UInt32) -> Int32 {
-    return make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSd_y_extern(boxPtr, file, line)
+@inline(never) fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestss26AsyncImportedPayloadResultO_y(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer<UInt8>, _ line: UInt32) -> Int32 {
+    return make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestss26AsyncImportedPayloadResultO_y_extern(boxPtr, file, line)
 }
 
-private enum _BJS_Closure_20BridgeJSRuntimeTestssSd_y {
-    static func bridgeJSLift(_ callbackId: Int32) -> (sending Double) -> Void {
+private enum _BJS_Closure_20BridgeJSRuntimeTestss26AsyncImportedPayloadResultO_y {
+    static func bridgeJSLift(_ callbackId: Int32) -> (sending AsyncImportedPayloadResult) -> Void {
         let callback = JSObject.bridgeJSLiftParameter(callbackId)
         return { [callback] param0 in
             #if arch(wasm32)
+            let param0CaseId = param0.bridgeJSLowerParameter()
             let callbackValue = callback.bridgeJSLowerParameter()
-            let param0Value = param0.bridgeJSLowerParameter()
-            invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSd_y(callbackValue, param0Value)
+            invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestss26AsyncImportedPayloadResultO_y(callbackValue, param0CaseId)
             #else
             fatalError("Only available on WebAssembly")
             #endif
@@ -2330,10 +2729,10 @@ private enum _BJS_Closure_20BridgeJSRuntimeTestssSd_y {
     }
 }
 
-extension JSTypedClosure where Signature == (sending Double) -> Void {
-    init(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping (sending Double) -> Void) {
+extension JSTypedClosure where Signature == (sending AsyncImportedPayloadResult) -> Void {
+    init(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping (sending AsyncImportedPayloadResult) -> Void) {
         self.init(
-            makeClosure: make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSd_y,
+            makeClosure: make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestss26AsyncImportedPayloadResultO_y,
             body: body,
             fileID: fileID,
             line: line
@@ -2341,50 +2740,49 @@ extension JSTypedClosure where Signature == (sending Double) -> Void {
     }
 }
 
-@_expose(wasm, "invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSd_y")
-@_cdecl("invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSd_y")
-public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSd_y(_ boxPtr: UnsafeMutableRawPointer, _ param0: Float64) -> Void {
+@_expose(wasm, "invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestss26AsyncImportedPayloadResultO_y")
+@_cdecl("invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestss26AsyncImportedPayloadResultO_y")
+public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestss26AsyncImportedPayloadResultO_y(_ boxPtr: UnsafeMutableRawPointer, _ param0: Int32) -> Void {
     #if arch(wasm32)
-    let closure = Unmanaged<_BridgeJSTypedClosureBox<(sending Double) -> Void>>.fromOpaque(boxPtr).takeUnretainedValue().closure
-    closure(Double.bridgeJSLiftParameter(param0))
+    let closure = Unmanaged<_BridgeJSTypedClosureBox<(sending AsyncImportedPayloadResult) -> Void>>.fromOpaque(boxPtr).takeUnretainedValue().closure
+    closure(AsyncImportedPayloadResult.bridgeJSLiftParameter(param0))
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
 #if arch(wasm32)
-@_extern(wasm, module: "bjs", name: "invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSqSS_y")
-fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSqSS_y_extern(_ callback: Int32, _ param0IsSome: Int32, _ param0Bytes: Int32, _ param0Length: Int32) -> Void
+@_extern(wasm, module: "bjs", name: "invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestss7JSValueV_y")
+fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestss7JSValueV_y_extern(_ callback: Int32, _ param0Kind: Int32, _ param0Payload1: Int32, _ param0Payload2: Float64) -> Void
 #else
-fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSqSS_y_extern(_ callback: Int32, _ param0IsSome: Int32, _ param0Bytes: Int32, _ param0Length: Int32) -> Void {
+fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestss7JSValueV_y_extern(_ callback: Int32, _ param0Kind: Int32, _ param0Payload1: Int32, _ param0Payload2: Float64) -> Void {
     fatalError("Only available on WebAssembly")
 }
 #endif
-@inline(never) fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSqSS_y(_ callback: Int32, _ param0IsSome: Int32, _ param0Bytes: Int32, _ param0Length: Int32) -> Void {
-    return invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSqSS_y_extern(callback, param0IsSome, param0Bytes, param0Length)
+@inline(never) fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestss7JSValueV_y(_ callback: Int32, _ param0Kind: Int32, _ param0Payload1: Int32, _ param0Payload2: Float64) -> Void {
+    return invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestss7JSValueV_y_extern(callback, param0Kind, param0Payload1, param0Payload2)
 }
 
 #if arch(wasm32)
-@_extern(wasm, module: "bjs", name: "make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSqSS_y")
-fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSqSS_y_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer<UInt8>, _ line: UInt32) -> Int32
+@_extern(wasm, module: "bjs", name: "make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestss7JSValueV_y")
+fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestss7JSValueV_y_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer<UInt8>, _ line: UInt32) -> Int32
 #else
-fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSqSS_y_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer<UInt8>, _ line: UInt32) -> Int32 {
+fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestss7JSValueV_y_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer<UInt8>, _ line: UInt32) -> Int32 {
     fatalError("Only available on WebAssembly")
 }
 #endif
-@inline(never) fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSqSS_y(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer<UInt8>, _ line: UInt32) -> Int32 {
-    return make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSqSS_y_extern(boxPtr, file, line)
+@inline(never) fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestss7JSValueV_y(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer<UInt8>, _ line: UInt32) -> Int32 {
+    return make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestss7JSValueV_y_extern(boxPtr, file, line)
 }
 
-private enum _BJS_Closure_20BridgeJSRuntimeTestssSqSS_y {
-    static func bridgeJSLift(_ callbackId: Int32) -> (sending Optional<String>) -> Void {
+private enum _BJS_Closure_20BridgeJSRuntimeTestss7JSValueV_y {
+    static func bridgeJSLift(_ callbackId: Int32) -> (sending JSValue) -> Void {
         let callback = JSObject.bridgeJSLiftParameter(callbackId)
         return { [callback] param0 in
             #if arch(wasm32)
+            let (param0Kind, param0Payload1, param0Payload2) = param0.bridgeJSLowerParameter()
             let callbackValue = callback.bridgeJSLowerParameter()
-            param0.bridgeJSWithLoweredParameter { (param0IsSome, param0Bytes, param0Length) in
-                invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSqSS_y(callbackValue, param0IsSome, param0Bytes, param0Length)
-            }
+            invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestss7JSValueV_y(callbackValue, param0Kind, param0Payload1, param0Payload2)
             #else
             fatalError("Only available on WebAssembly")
             #endif
@@ -2392,10 +2790,10 @@ private enum _BJS_Closure_20BridgeJSRuntimeTestssSqSS_y {
     }
 }
 
-extension JSTypedClosure where Signature == (sending Optional<String>) -> Void {
-    init(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping (sending Optional<String>) -> Void) {
+extension JSTypedClosure where Signature == (sending JSValue) -> Void {
+    init(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping (sending JSValue) -> Void) {
         self.init(
-            makeClosure: make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSqSS_y,
+            makeClosure: make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestss7JSValueV_y,
             body: body,
             fileID: fileID,
             line: line
@@ -2403,49 +2801,49 @@ extension JSTypedClosure where Signature == (sending Optional<String>) -> Void {
     }
 }
 
-@_expose(wasm, "invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSqSS_y")
-@_cdecl("invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSqSS_y")
-public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSqSS_y(_ boxPtr: UnsafeMutableRawPointer, _ param0IsSome: Int32, _ param0Bytes: Int32, _ param0Length: Int32) -> Void {
+@_expose(wasm, "invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestss7JSValueV_y")
+@_cdecl("invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestss7JSValueV_y")
+public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestss7JSValueV_y(_ boxPtr: UnsafeMutableRawPointer, _ param0Kind: Int32, _ param0Payload1: Int32, _ param0Payload2: Float64) -> Void {
     #if arch(wasm32)
-    let closure = Unmanaged<_BridgeJSTypedClosureBox<(sending Optional<String>) -> Void>>.fromOpaque(boxPtr).takeUnretainedValue().closure
-    closure(Optional<String>.bridgeJSLiftParameter(param0IsSome, param0Bytes, param0Length))
+    let closure = Unmanaged<_BridgeJSTypedClosureBox<(sending JSValue) -> Void>>.fromOpaque(boxPtr).takeUnretainedValue().closure
+    closure(JSValue.bridgeJSLiftParameter(param0Kind, param0Payload1, param0Payload2))
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
 #if arch(wasm32)
-@_extern(wasm, module: "bjs", name: "invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSqSd_y")
-fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSqSd_y_extern(_ callback: Int32, _ param0IsSome: Int32, _ param0Value: Float64) -> Void
+@_extern(wasm, module: "bjs", name: "invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestss9DataPointV_y")
+fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestss9DataPointV_y_extern(_ callback: Int32) -> Void
 #else
-fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSqSd_y_extern(_ callback: Int32, _ param0IsSome: Int32, _ param0Value: Float64) -> Void {
+fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestss9DataPointV_y_extern(_ callback: Int32) -> Void {
     fatalError("Only available on WebAssembly")
 }
 #endif
-@inline(never) fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSqSd_y(_ callback: Int32, _ param0IsSome: Int32, _ param0Value: Float64) -> Void {
-    return invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSqSd_y_extern(callback, param0IsSome, param0Value)
+@inline(never) fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestss9DataPointV_y(_ callback: Int32) -> Void {
+    return invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestss9DataPointV_y_extern(callback)
 }
 
 #if arch(wasm32)
-@_extern(wasm, module: "bjs", name: "make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSqSd_y")
-fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSqSd_y_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer<UInt8>, _ line: UInt32) -> Int32
+@_extern(wasm, module: "bjs", name: "make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestss9DataPointV_y")
+fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestss9DataPointV_y_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer<UInt8>, _ line: UInt32) -> Int32
 #else
-fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSqSd_y_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer<UInt8>, _ line: UInt32) -> Int32 {
+fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestss9DataPointV_y_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer<UInt8>, _ line: UInt32) -> Int32 {
     fatalError("Only available on WebAssembly")
 }
 #endif
-@inline(never) fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSqSd_y(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer<UInt8>, _ line: UInt32) -> Int32 {
-    return make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSqSd_y_extern(boxPtr, file, line)
+@inline(never) fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestss9DataPointV_y(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer<UInt8>, _ line: UInt32) -> Int32 {
+    return make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestss9DataPointV_y_extern(boxPtr, file, line)
 }
 
-private enum _BJS_Closure_20BridgeJSRuntimeTestssSqSd_y {
-    static func bridgeJSLift(_ callbackId: Int32) -> (sending Optional<Double>) -> Void {
+private enum _BJS_Closure_20BridgeJSRuntimeTestss9DataPointV_y {
+    static func bridgeJSLift(_ callbackId: Int32) -> (sending DataPoint) -> Void {
         let callback = JSObject.bridgeJSLiftParameter(callbackId)
         return { [callback] param0 in
             #if arch(wasm32)
+            let _ = param0.bridgeJSLowerParameter()
             let callbackValue = callback.bridgeJSLowerParameter()
-            let (param0IsSome, param0Value) = param0.bridgeJSLowerParameter()
-            invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSqSd_y(callbackValue, param0IsSome, param0Value)
+            invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestss9DataPointV_y(callbackValue)
             #else
             fatalError("Only available on WebAssembly")
             #endif
@@ -2453,10 +2851,10 @@ private enum _BJS_Closure_20BridgeJSRuntimeTestssSqSd_y {
     }
 }
 
-extension JSTypedClosure where Signature == (sending Optional<Double>) -> Void {
-    init(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping (sending Optional<Double>) -> Void) {
+extension JSTypedClosure where Signature == (sending DataPoint) -> Void {
+    init(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping (sending DataPoint) -> Void) {
         self.init(
-            makeClosure: make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSqSd_y,
+            makeClosure: make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestss9DataPointV_y,
             body: body,
             fileID: fileID,
             line: line
@@ -2464,49 +2862,50 @@ extension JSTypedClosure where Signature == (sending Optional<Double>) -> Void {
     }
 }
 
-@_expose(wasm, "invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSqSd_y")
-@_cdecl("invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSqSd_y")
-public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSqSd_y(_ boxPtr: UnsafeMutableRawPointer, _ param0IsSome: Int32, _ param0Value: Float64) -> Void {
+@_expose(wasm, "invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestss9DataPointV_y")
+@_cdecl("invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestss9DataPointV_y")
+public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestss9DataPointV_y(_ boxPtr: UnsafeMutableRawPointer) -> Void {
     #if arch(wasm32)
-    let closure = Unmanaged<_BridgeJSTypedClosureBox<(sending Optional<Double>) -> Void>>.fromOpaque(boxPtr).takeUnretainedValue().closure
-    closure(Optional<Double>.bridgeJSLiftParameter(param0IsSome, param0Value))
+    let closure = Unmanaged<_BridgeJSTypedClosureBox<(sending DataPoint) -> Void>>.fromOpaque(boxPtr).takeUnretainedValue().closure
+    closure(DataPoint.bridgeJSLiftParameter())
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
 #if arch(wasm32)
-@_extern(wasm, module: "bjs", name: "invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_13DataProcessorP")
-fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_13DataProcessorP_extern(_ callback: Int32) -> Int32
+@_extern(wasm, module: "bjs", name: "invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSS_y")
+fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSS_y_extern(_ callback: Int32, _ param0Bytes: Int32, _ param0Length: Int32) -> Void
 #else
-fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_13DataProcessorP_extern(_ callback: Int32) -> Int32 {
+fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSS_y_extern(_ callback: Int32, _ param0Bytes: Int32, _ param0Length: Int32) -> Void {
     fatalError("Only available on WebAssembly")
 }
 #endif
-@inline(never) fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_13DataProcessorP(_ callback: Int32) -> Int32 {
-    return invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_13DataProcessorP_extern(callback)
+@inline(never) fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSS_y(_ callback: Int32, _ param0Bytes: Int32, _ param0Length: Int32) -> Void {
+    return invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSS_y_extern(callback, param0Bytes, param0Length)
 }
 
 #if arch(wasm32)
-@_extern(wasm, module: "bjs", name: "make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_13DataProcessorP")
-fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_13DataProcessorP_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer<UInt8>, _ line: UInt32) -> Int32
+@_extern(wasm, module: "bjs", name: "make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSS_y")
+fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSS_y_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer<UInt8>, _ line: UInt32) -> Int32
 #else
-fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_13DataProcessorP_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer<UInt8>, _ line: UInt32) -> Int32 {
+fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSS_y_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer<UInt8>, _ line: UInt32) -> Int32 {
     fatalError("Only available on WebAssembly")
 }
 #endif
-@inline(never) fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_13DataProcessorP(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer<UInt8>, _ line: UInt32) -> Int32 {
-    return make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_13DataProcessorP_extern(boxPtr, file, line)
+@inline(never) fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSS_y(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer<UInt8>, _ line: UInt32) -> Int32 {
+    return make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSS_y_extern(boxPtr, file, line)
 }
 
-private enum _BJS_Closure_20BridgeJSRuntimeTestsy_13DataProcessorP {
-    static func bridgeJSLift(_ callbackId: Int32) -> () -> any DataProcessor {
+private enum _BJS_Closure_20BridgeJSRuntimeTestssSS_y {
+    static func bridgeJSLift(_ callbackId: Int32) -> (sending String) -> Void {
         let callback = JSObject.bridgeJSLiftParameter(callbackId)
-        return { [callback] in
+        return { [callback] param0 in
             #if arch(wasm32)
-            let callbackValue = callback.bridgeJSLowerParameter()
-            let ret = invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_13DataProcessorP(callbackValue)
-            return AnyDataProcessor.bridgeJSLiftReturn(ret)
+            param0.bridgeJSWithLoweredParameter { (param0Bytes, param0Length) in
+                let callbackValue = callback.bridgeJSLowerParameter()
+                invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSS_y(callbackValue, param0Bytes, param0Length)
+            }
             #else
             fatalError("Only available on WebAssembly")
             #endif
@@ -2514,10 +2913,10 @@ private enum _BJS_Closure_20BridgeJSRuntimeTestsy_13DataProcessorP {
     }
 }
 
-extension JSTypedClosure where Signature == () -> any DataProcessor {
-    init(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping () -> any DataProcessor) {
+extension JSTypedClosure where Signature == (sending String) -> Void {
+    init(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping (sending String) -> Void) {
         self.init(
-            makeClosure: make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_13DataProcessorP,
+            makeClosure: make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSS_y,
             body: body,
             fileID: fileID,
             line: line
@@ -2525,50 +2924,49 @@ extension JSTypedClosure where Signature == () -> any DataProcessor {
     }
 }
 
-@_expose(wasm, "invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_13DataProcessorP")
-@_cdecl("invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_13DataProcessorP")
-public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_13DataProcessorP(_ boxPtr: UnsafeMutableRawPointer) -> Int32 {
+@_expose(wasm, "invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSS_y")
+@_cdecl("invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSS_y")
+public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSS_y(_ boxPtr: UnsafeMutableRawPointer, _ param0Bytes: Int32, _ param0Length: Int32) -> Void {
     #if arch(wasm32)
-    let closure = Unmanaged<_BridgeJSTypedClosureBox<() -> any DataProcessor>>.fromOpaque(boxPtr).takeUnretainedValue().closure
-    let result = closure()
-    return (result as! _BridgedSwiftProtocolExportable).bridgeJSLowerAsProtocolReturn()
+    let closure = Unmanaged<_BridgeJSTypedClosureBox<(sending String) -> Void>>.fromOpaque(boxPtr).takeUnretainedValue().closure
+    closure(String.bridgeJSLiftParameter(param0Bytes, param0Length))
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
 #if arch(wasm32)
-@_extern(wasm, module: "bjs", name: "invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_Sb")
-fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_Sb_extern(_ callback: Int32) -> Int32
+@_extern(wasm, module: "bjs", name: "invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSaSS_y")
+fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSaSS_y_extern(_ callback: Int32) -> Void
 #else
-fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_Sb_extern(_ callback: Int32) -> Int32 {
+fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSaSS_y_extern(_ callback: Int32) -> Void {
     fatalError("Only available on WebAssembly")
 }
 #endif
-@inline(never) fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_Sb(_ callback: Int32) -> Int32 {
-    return invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_Sb_extern(callback)
+@inline(never) fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSaSS_y(_ callback: Int32) -> Void {
+    return invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSaSS_y_extern(callback)
 }
 
 #if arch(wasm32)
-@_extern(wasm, module: "bjs", name: "make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_Sb")
-fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_Sb_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer<UInt8>, _ line: UInt32) -> Int32
+@_extern(wasm, module: "bjs", name: "make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSaSS_y")
+fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSaSS_y_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer<UInt8>, _ line: UInt32) -> Int32
 #else
-fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_Sb_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer<UInt8>, _ line: UInt32) -> Int32 {
+fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSaSS_y_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer<UInt8>, _ line: UInt32) -> Int32 {
     fatalError("Only available on WebAssembly")
 }
 #endif
-@inline(never) fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_Sb(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer<UInt8>, _ line: UInt32) -> Int32 {
-    return make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_Sb_extern(boxPtr, file, line)
+@inline(never) fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSaSS_y(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer<UInt8>, _ line: UInt32) -> Int32 {
+    return make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSaSS_y_extern(boxPtr, file, line)
 }
 
-private enum _BJS_Closure_20BridgeJSRuntimeTestsy_Sb {
-    static func bridgeJSLift(_ callbackId: Int32) -> () -> Bool {
+private enum _BJS_Closure_20BridgeJSRuntimeTestssSaSS_y {
+    static func bridgeJSLift(_ callbackId: Int32) -> (sending [String]) -> Void {
         let callback = JSObject.bridgeJSLiftParameter(callbackId)
-        return { [callback] in
+        return { [callback] param0 in
             #if arch(wasm32)
+            let _ = param0.bridgeJSLowerParameter()
             let callbackValue = callback.bridgeJSLowerParameter()
-            let ret = invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_Sb(callbackValue)
-            return Bool.bridgeJSLiftReturn(ret)
+            invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSaSS_y(callbackValue)
             #else
             fatalError("Only available on WebAssembly")
             #endif
@@ -2576,10 +2974,10 @@ private enum _BJS_Closure_20BridgeJSRuntimeTestsy_Sb {
     }
 }
 
-extension JSTypedClosure where Signature == () -> Bool {
-    init(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping () -> Bool) {
+extension JSTypedClosure where Signature == (sending [String]) -> Void {
+    init(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping (sending [String]) -> Void) {
         self.init(
-            makeClosure: make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_Sb,
+            makeClosure: make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSaSS_y,
             body: body,
             fileID: fileID,
             line: line
@@ -2587,50 +2985,49 @@ extension JSTypedClosure where Signature == () -> Bool {
     }
 }
 
-@_expose(wasm, "invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_Sb")
-@_cdecl("invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_Sb")
-public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_Sb(_ boxPtr: UnsafeMutableRawPointer) -> Int32 {
+@_expose(wasm, "invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSaSS_y")
+@_cdecl("invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSaSS_y")
+public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSaSS_y(_ boxPtr: UnsafeMutableRawPointer) -> Void {
     #if arch(wasm32)
-    let closure = Unmanaged<_BridgeJSTypedClosureBox<() -> Bool>>.fromOpaque(boxPtr).takeUnretainedValue().closure
-    let result = closure()
-    return result.bridgeJSLowerReturn()
+    let closure = Unmanaged<_BridgeJSTypedClosureBox<(sending [String]) -> Void>>.fromOpaque(boxPtr).takeUnretainedValue().closure
+    closure([String].bridgeJSLiftParameter())
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
 #if arch(wasm32)
-@_extern(wasm, module: "bjs", name: "invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_Sq7GreeterC")
-fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_Sq7GreeterC_extern(_ callback: Int32) -> UnsafeMutableRawPointer
+@_extern(wasm, module: "bjs", name: "invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSaSb_y")
+fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSaSb_y_extern(_ callback: Int32) -> Void
 #else
-fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_Sq7GreeterC_extern(_ callback: Int32) -> UnsafeMutableRawPointer {
+fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSaSb_y_extern(_ callback: Int32) -> Void {
     fatalError("Only available on WebAssembly")
 }
 #endif
-@inline(never) fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_Sq7GreeterC(_ callback: Int32) -> UnsafeMutableRawPointer {
-    return invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_Sq7GreeterC_extern(callback)
+@inline(never) fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSaSb_y(_ callback: Int32) -> Void {
+    return invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSaSb_y_extern(callback)
 }
 
 #if arch(wasm32)
-@_extern(wasm, module: "bjs", name: "make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_Sq7GreeterC")
-fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_Sq7GreeterC_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer<UInt8>, _ line: UInt32) -> Int32
+@_extern(wasm, module: "bjs", name: "make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSaSb_y")
+fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSaSb_y_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer<UInt8>, _ line: UInt32) -> Int32
 #else
-fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_Sq7GreeterC_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer<UInt8>, _ line: UInt32) -> Int32 {
+fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSaSb_y_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer<UInt8>, _ line: UInt32) -> Int32 {
     fatalError("Only available on WebAssembly")
 }
 #endif
-@inline(never) fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_Sq7GreeterC(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer<UInt8>, _ line: UInt32) -> Int32 {
-    return make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_Sq7GreeterC_extern(boxPtr, file, line)
+@inline(never) fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSaSb_y(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer<UInt8>, _ line: UInt32) -> Int32 {
+    return make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSaSb_y_extern(boxPtr, file, line)
 }
 
-private enum _BJS_Closure_20BridgeJSRuntimeTestsy_Sq7GreeterC {
-    static func bridgeJSLift(_ callbackId: Int32) -> () -> Optional<Greeter> {
+private enum _BJS_Closure_20BridgeJSRuntimeTestssSaSb_y {
+    static func bridgeJSLift(_ callbackId: Int32) -> (sending [Bool]) -> Void {
         let callback = JSObject.bridgeJSLiftParameter(callbackId)
-        return { [callback] in
+        return { [callback] param0 in
             #if arch(wasm32)
+            let _ = param0.bridgeJSLowerParameter()
             let callbackValue = callback.bridgeJSLowerParameter()
-            let ret = invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_Sq7GreeterC(callbackValue)
-            return Optional<Greeter>.bridgeJSLiftReturn(ret)
+            invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSaSb_y(callbackValue)
             #else
             fatalError("Only available on WebAssembly")
             #endif
@@ -2638,10 +3035,10 @@ private enum _BJS_Closure_20BridgeJSRuntimeTestsy_Sq7GreeterC {
     }
 }
 
-extension JSTypedClosure where Signature == () -> Optional<Greeter> {
-    init(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping () -> Optional<Greeter>) {
+extension JSTypedClosure where Signature == (sending [Bool]) -> Void {
+    init(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping (sending [Bool]) -> Void) {
         self.init(
-            makeClosure: make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_Sq7GreeterC,
+            makeClosure: make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSaSb_y,
             body: body,
             fileID: fileID,
             line: line
@@ -2649,49 +3046,49 @@ extension JSTypedClosure where Signature == () -> Optional<Greeter> {
     }
 }
 
-@_expose(wasm, "invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_Sq7GreeterC")
-@_cdecl("invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_Sq7GreeterC")
-public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_Sq7GreeterC(_ boxPtr: UnsafeMutableRawPointer) -> Void {
+@_expose(wasm, "invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSaSb_y")
+@_cdecl("invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSaSb_y")
+public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSaSb_y(_ boxPtr: UnsafeMutableRawPointer) -> Void {
     #if arch(wasm32)
-    let closure = Unmanaged<_BridgeJSTypedClosureBox<() -> Optional<Greeter>>>.fromOpaque(boxPtr).takeUnretainedValue().closure
-    let result = closure()
-    return result.bridgeJSLowerReturn()
+    let closure = Unmanaged<_BridgeJSTypedClosureBox<(sending [Bool]) -> Void>>.fromOpaque(boxPtr).takeUnretainedValue().closure
+    closure([Bool].bridgeJSLiftParameter())
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
 #if arch(wasm32)
-@_extern(wasm, module: "bjs", name: "invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_y")
-fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_y_extern(_ callback: Int32) -> Void
+@_extern(wasm, module: "bjs", name: "invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSaSd_y")
+fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSaSd_y_extern(_ callback: Int32) -> Void
 #else
-fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_y_extern(_ callback: Int32) -> Void {
+fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSaSd_y_extern(_ callback: Int32) -> Void {
     fatalError("Only available on WebAssembly")
 }
 #endif
-@inline(never) fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_y(_ callback: Int32) -> Void {
-    return invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_y_extern(callback)
+@inline(never) fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSaSd_y(_ callback: Int32) -> Void {
+    return invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSaSd_y_extern(callback)
 }
 
 #if arch(wasm32)
-@_extern(wasm, module: "bjs", name: "make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_y")
-fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_y_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer<UInt8>, _ line: UInt32) -> Int32
+@_extern(wasm, module: "bjs", name: "make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSaSd_y")
+fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSaSd_y_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer<UInt8>, _ line: UInt32) -> Int32
 #else
-fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_y_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer<UInt8>, _ line: UInt32) -> Int32 {
+fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSaSd_y_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer<UInt8>, _ line: UInt32) -> Int32 {
     fatalError("Only available on WebAssembly")
 }
 #endif
-@inline(never) fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_y(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer<UInt8>, _ line: UInt32) -> Int32 {
-    return make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_y_extern(boxPtr, file, line)
+@inline(never) fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSaSd_y(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer<UInt8>, _ line: UInt32) -> Int32 {
+    return make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSaSd_y_extern(boxPtr, file, line)
 }
 
-private enum _BJS_Closure_20BridgeJSRuntimeTestsy_y {
-    static func bridgeJSLift(_ callbackId: Int32) -> () -> Void {
+private enum _BJS_Closure_20BridgeJSRuntimeTestssSaSd_y {
+    static func bridgeJSLift(_ callbackId: Int32) -> (sending [Double]) -> Void {
         let callback = JSObject.bridgeJSLiftParameter(callbackId)
-        return { [callback] in
+        return { [callback] param0 in
             #if arch(wasm32)
+            let _ = param0.bridgeJSLowerParameter()
             let callbackValue = callback.bridgeJSLowerParameter()
-            invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_y(callbackValue)
+            invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSaSd_y(callbackValue)
             #else
             fatalError("Only available on WebAssembly")
             #endif
@@ -2699,10 +3096,10 @@ private enum _BJS_Closure_20BridgeJSRuntimeTestsy_y {
     }
 }
 
-extension JSTypedClosure where Signature == () -> Void {
-    init(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping () -> Void) {
+extension JSTypedClosure where Signature == (sending [Double]) -> Void {
+    init(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping (sending [Double]) -> Void) {
         self.init(
-            makeClosure: make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_y,
+            makeClosure: make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSaSd_y,
             body: body,
             fileID: fileID,
             line: line
@@ -2710,1469 +3107,1969 @@ extension JSTypedClosure where Signature == () -> Void {
     }
 }
 
-@_expose(wasm, "invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_y")
-@_cdecl("invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_y")
-public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_y(_ boxPtr: UnsafeMutableRawPointer) -> Void {
+@_expose(wasm, "invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSaSd_y")
+@_cdecl("invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSaSd_y")
+public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSaSd_y(_ boxPtr: UnsafeMutableRawPointer) -> Void {
     #if arch(wasm32)
-    let closure = Unmanaged<_BridgeJSTypedClosureBox<() -> Void>>.fromOpaque(boxPtr).takeUnretainedValue().closure
-    closure()
+    let closure = Unmanaged<_BridgeJSTypedClosureBox<(sending [Double]) -> Void>>.fromOpaque(boxPtr).takeUnretainedValue().closure
+    closure([Double].bridgeJSLiftParameter())
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-struct AnyArrayElementProtocol: ArrayElementProtocol, _BridgedSwiftProtocolWrapper {
-    let jsObject: JSObject
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSb_y")
+fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSb_y_extern(_ callback: Int32, _ param0: Int32) -> Void
+#else
+fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSb_y_extern(_ callback: Int32, _ param0: Int32) -> Void {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSb_y(_ callback: Int32, _ param0: Int32) -> Void {
+    return invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSb_y_extern(callback, param0)
+}
 
-    var value: Int {
-        get {
-            let jsObjectValue = jsObject.bridgeJSLowerParameter()
-            let ret = bjs_ArrayElementProtocol_value_get(jsObjectValue)
-            return Int.bridgeJSLiftReturn(ret)
-        }
-        set {
-            let jsObjectValue = jsObject.bridgeJSLowerParameter()
-            let newValueValue = newValue.bridgeJSLowerParameter()
-            bjs_ArrayElementProtocol_value_set(jsObjectValue, newValueValue)
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSb_y")
+fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSb_y_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer<UInt8>, _ line: UInt32) -> Int32
+#else
+fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSb_y_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer<UInt8>, _ line: UInt32) -> Int32 {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSb_y(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer<UInt8>, _ line: UInt32) -> Int32 {
+    return make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSb_y_extern(boxPtr, file, line)
+}
+
+private enum _BJS_Closure_20BridgeJSRuntimeTestssSb_y {
+    static func bridgeJSLift(_ callbackId: Int32) -> (sending Bool) -> Void {
+        let callback = JSObject.bridgeJSLiftParameter(callbackId)
+        return { [callback] param0 in
+            #if arch(wasm32)
+            let param0Value = param0.bridgeJSLowerParameter()
+            let callbackValue = callback.bridgeJSLowerParameter()
+            invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSb_y(callbackValue, param0Value)
+            #else
+            fatalError("Only available on WebAssembly")
+            #endif
         }
     }
+}
 
-    static func bridgeJSLiftParameter(_ value: Int32) -> Self {
-        return AnyArrayElementProtocol(jsObject: JSObject(id: UInt32(bitPattern: value)))
+extension JSTypedClosure where Signature == (sending Bool) -> Void {
+    init(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping (sending Bool) -> Void) {
+        self.init(
+            makeClosure: make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSb_y,
+            body: body,
+            fileID: fileID,
+            line: line
+        )
     }
 }
 
+@_expose(wasm, "invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSb_y")
+@_cdecl("invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSb_y")
+public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSb_y(_ boxPtr: UnsafeMutableRawPointer, _ param0: Int32) -> Void {
+    #if arch(wasm32)
+    let closure = Unmanaged<_BridgeJSTypedClosureBox<(sending Bool) -> Void>>.fromOpaque(boxPtr).takeUnretainedValue().closure
+    closure(Bool.bridgeJSLiftParameter(param0))
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
 #if arch(wasm32)
-@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_ArrayElementProtocol_value_get")
-fileprivate func bjs_ArrayElementProtocol_value_get_extern(_ jsObject: Int32) -> Int32
+@_extern(wasm, module: "bjs", name: "invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSd_y")
+fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSd_y_extern(_ callback: Int32, _ param0: Float64) -> Void
 #else
-fileprivate func bjs_ArrayElementProtocol_value_get_extern(_ jsObject: Int32) -> Int32 {
+fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSd_y_extern(_ callback: Int32, _ param0: Float64) -> Void {
     fatalError("Only available on WebAssembly")
 }
 #endif
-@inline(never) fileprivate func bjs_ArrayElementProtocol_value_get(_ jsObject: Int32) -> Int32 {
-    return bjs_ArrayElementProtocol_value_get_extern(jsObject)
+@inline(never) fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSd_y(_ callback: Int32, _ param0: Float64) -> Void {
+    return invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSd_y_extern(callback, param0)
 }
 
 #if arch(wasm32)
-@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_ArrayElementProtocol_value_set")
-fileprivate func bjs_ArrayElementProtocol_value_set_extern(_ jsObject: Int32, _ newValue: Int32) -> Void
+@_extern(wasm, module: "bjs", name: "make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSd_y")
+fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSd_y_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer<UInt8>, _ line: UInt32) -> Int32
 #else
-fileprivate func bjs_ArrayElementProtocol_value_set_extern(_ jsObject: Int32, _ newValue: Int32) -> Void {
+fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSd_y_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer<UInt8>, _ line: UInt32) -> Int32 {
     fatalError("Only available on WebAssembly")
 }
 #endif
-@inline(never) fileprivate func bjs_ArrayElementProtocol_value_set(_ jsObject: Int32, _ newValue: Int32) -> Void {
-    return bjs_ArrayElementProtocol_value_set_extern(jsObject, newValue)
+@inline(never) fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSd_y(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer<UInt8>, _ line: UInt32) -> Int32 {
+    return make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSd_y_extern(boxPtr, file, line)
 }
 
-struct AnyDataProcessor: DataProcessor, _BridgedSwiftProtocolWrapper {
-    let jsObject: JSObject
-
-    func increment(by amount: Int) -> Void {
-        let jsObjectValue = jsObject.bridgeJSLowerParameter()
-        let amountValue = amount.bridgeJSLowerParameter()
-        _extern_increment(jsObjectValue, amountValue)
-    }
-
-    func getValue() -> Int {
-        let jsObjectValue = jsObject.bridgeJSLowerParameter()
-        let ret = _extern_getValue(jsObjectValue)
-        return Int.bridgeJSLiftReturn(ret)
-    }
-
-    func setLabelElements(_ labelPrefix: String, _ labelSuffix: String) -> Void {
-        let jsObjectValue = jsObject.bridgeJSLowerParameter()
-        labelPrefix.bridgeJSWithLoweredParameter { (labelPrefixBytes, labelPrefixLength) in
-            labelSuffix.bridgeJSWithLoweredParameter { (labelSuffixBytes, labelSuffixLength) in
-                _extern_setLabelElements(jsObjectValue, labelPrefixBytes, labelPrefixLength, labelSuffixBytes, labelSuffixLength)
-            }
+private enum _BJS_Closure_20BridgeJSRuntimeTestssSd_y {
+    static func bridgeJSLift(_ callbackId: Int32) -> (sending Double) -> Void {
+        let callback = JSObject.bridgeJSLiftParameter(callbackId)
+        return { [callback] param0 in
+            #if arch(wasm32)
+            let param0Value = param0.bridgeJSLowerParameter()
+            let callbackValue = callback.bridgeJSLowerParameter()
+            invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSd_y(callbackValue, param0Value)
+            #else
+            fatalError("Only available on WebAssembly")
+            #endif
         }
     }
+}
 
-    func getLabel() -> String {
-        let jsObjectValue = jsObject.bridgeJSLowerParameter()
-        let ret = _extern_getLabel(jsObjectValue)
-        return String.bridgeJSLiftReturn(ret)
+extension JSTypedClosure where Signature == (sending Double) -> Void {
+    init(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping (sending Double) -> Void) {
+        self.init(
+            makeClosure: make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSd_y,
+            body: body,
+            fileID: fileID,
+            line: line
+        )
     }
+}
 
-    func isEven() -> Bool {
-        let jsObjectValue = jsObject.bridgeJSLowerParameter()
-        let ret = _extern_isEven(jsObjectValue)
-        return Bool.bridgeJSLiftReturn(ret)
-    }
+@_expose(wasm, "invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSd_y")
+@_cdecl("invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSd_y")
+public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSd_y(_ boxPtr: UnsafeMutableRawPointer, _ param0: Float64) -> Void {
+    #if arch(wasm32)
+    let closure = Unmanaged<_BridgeJSTypedClosureBox<(sending Double) -> Void>>.fromOpaque(boxPtr).takeUnretainedValue().closure
+    closure(Double.bridgeJSLiftParameter(param0))
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
 
-    func processGreeter(_ greeter: Greeter) -> String {
-        let jsObjectValue = jsObject.bridgeJSLowerParameter()
-        let greeterPointer = greeter.bridgeJSLowerParameter()
-        let ret = _extern_processGreeter(jsObjectValue, greeterPointer)
-        return String.bridgeJSLiftReturn(ret)
-    }
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSq26AsyncImportedPayloadResultO_y")
+fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSq26AsyncImportedPayloadResultO_y_extern(_ callback: Int32, _ param0IsSome: Int32, _ param0CaseId: Int32) -> Void
+#else
+fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSq26AsyncImportedPayloadResultO_y_extern(_ callback: Int32, _ param0IsSome: Int32, _ param0CaseId: Int32) -> Void {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSq26AsyncImportedPayloadResultO_y(_ callback: Int32, _ param0IsSome: Int32, _ param0CaseId: Int32) -> Void {
+    return invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSq26AsyncImportedPayloadResultO_y_extern(callback, param0IsSome, param0CaseId)
+}
 
-    func createGreeter() -> Greeter {
-        let jsObjectValue = jsObject.bridgeJSLowerParameter()
-        let ret = _extern_createGreeter(jsObjectValue)
-        return Greeter.bridgeJSLiftReturn(ret)
-    }
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSq26AsyncImportedPayloadResultO_y")
+fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSq26AsyncImportedPayloadResultO_y_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer<UInt8>, _ line: UInt32) -> Int32
+#else
+fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSq26AsyncImportedPayloadResultO_y_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer<UInt8>, _ line: UInt32) -> Int32 {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSq26AsyncImportedPayloadResultO_y(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer<UInt8>, _ line: UInt32) -> Int32 {
+    return make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSq26AsyncImportedPayloadResultO_y_extern(boxPtr, file, line)
+}
 
-    func processOptionalGreeter(_ greeter: Optional<Greeter>) -> String {
-        let jsObjectValue = jsObject.bridgeJSLowerParameter()
-        let (greeterIsSome, greeterPointer) = greeter.bridgeJSLowerParameter()
-        let ret = _extern_processOptionalGreeter(jsObjectValue, greeterIsSome, greeterPointer)
-        return String.bridgeJSLiftReturn(ret)
+private enum _BJS_Closure_20BridgeJSRuntimeTestssSq26AsyncImportedPayloadResultO_y {
+    static func bridgeJSLift(_ callbackId: Int32) -> (sending Optional<AsyncImportedPayloadResult>) -> Void {
+        let callback = JSObject.bridgeJSLiftParameter(callbackId)
+        return { [callback] param0 in
+            #if arch(wasm32)
+            let (param0IsSome, param0CaseId) = param0.bridgeJSLowerParameter()
+            let callbackValue = callback.bridgeJSLowerParameter()
+            invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSq26AsyncImportedPayloadResultO_y(callbackValue, param0IsSome, param0CaseId)
+            #else
+            fatalError("Only available on WebAssembly")
+            #endif
+        }
     }
+}
 
-    func createOptionalGreeter() -> Optional<Greeter> {
-        let jsObjectValue = jsObject.bridgeJSLowerParameter()
-        let ret = _extern_createOptionalGreeter(jsObjectValue)
-        return Optional<Greeter>.bridgeJSLiftReturn(ret)
+extension JSTypedClosure where Signature == (sending Optional<AsyncImportedPayloadResult>) -> Void {
+    init(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping (sending Optional<AsyncImportedPayloadResult>) -> Void) {
+        self.init(
+            makeClosure: make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSq26AsyncImportedPayloadResultO_y,
+            body: body,
+            fileID: fileID,
+            line: line
+        )
     }
+}
 
-    func handleAPIResult(_ result: Optional<APIResult>) -> Void {
-        let jsObjectValue = jsObject.bridgeJSLowerParameter()
-        let (resultIsSome, resultCaseId) = result.bridgeJSLowerParameter()
-        _extern_handleAPIResult(jsObjectValue, resultIsSome, resultCaseId)
-    }
+@_expose(wasm, "invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSq26AsyncImportedPayloadResultO_y")
+@_cdecl("invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSq26AsyncImportedPayloadResultO_y")
+public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSq26AsyncImportedPayloadResultO_y(_ boxPtr: UnsafeMutableRawPointer, _ param0IsSome: Int32, _ param0CaseId: Int32) -> Void {
+    #if arch(wasm32)
+    let closure = Unmanaged<_BridgeJSTypedClosureBox<(sending Optional<AsyncImportedPayloadResult>) -> Void>>.fromOpaque(boxPtr).takeUnretainedValue().closure
+    closure(Optional<AsyncImportedPayloadResult>.bridgeJSLiftParameter(param0IsSome, param0CaseId))
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
 
-    func getAPIResult() -> Optional<APIResult> {
-        let jsObjectValue = jsObject.bridgeJSLowerParameter()
-        let ret = _extern_getAPIResult(jsObjectValue)
-        return Optional<APIResult>.bridgeJSLiftReturn(ret)
-    }
-
-    var count: Int {
-        get {
-            let jsObjectValue = jsObject.bridgeJSLowerParameter()
-            let ret = bjs_DataProcessor_count_get(jsObjectValue)
-            return Int.bridgeJSLiftReturn(ret)
-        }
-        set {
-            let jsObjectValue = jsObject.bridgeJSLowerParameter()
-            let newValueValue = newValue.bridgeJSLowerParameter()
-            bjs_DataProcessor_count_set(jsObjectValue, newValueValue)
-        }
-    }
-
-    var name: String {
-        get {
-            let jsObjectValue = jsObject.bridgeJSLowerParameter()
-            let ret = bjs_DataProcessor_name_get(jsObjectValue)
-            return String.bridgeJSLiftReturn(ret)
-        }
-    }
-
-    var optionalTag: Optional<String> {
-        get {
-            let jsObjectValue = jsObject.bridgeJSLowerParameter()
-            bjs_DataProcessor_optionalTag_get(jsObjectValue)
-            return Optional<String>.bridgeJSLiftReturnFromSideChannel()
-        }
-        set {
-            let jsObjectValue = jsObject.bridgeJSLowerParameter()
-            newValue.bridgeJSWithLoweredParameter { (newValueIsSome, newValueBytes, newValueLength) in
-                bjs_DataProcessor_optionalTag_set(jsObjectValue, newValueIsSome, newValueBytes, newValueLength)
-            }
-        }
-    }
-
-    var optionalCount: Optional<Int> {
-        get {
-            let jsObjectValue = jsObject.bridgeJSLowerParameter()
-            bjs_DataProcessor_optionalCount_get(jsObjectValue)
-            return Optional<Int>.bridgeJSLiftReturnFromSideChannel()
-        }
-        set {
-            let jsObjectValue = jsObject.bridgeJSLowerParameter()
-            let (newValueIsSome, newValueValue) = newValue.bridgeJSLowerParameter()
-            bjs_DataProcessor_optionalCount_set(jsObjectValue, newValueIsSome, newValueValue)
-        }
-    }
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSqSS_y")
+fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSqSS_y_extern(_ callback: Int32, _ param0IsSome: Int32, _ param0Bytes: Int32, _ param0Length: Int32) -> Void
+#else
+fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSqSS_y_extern(_ callback: Int32, _ param0IsSome: Int32, _ param0Bytes: Int32, _ param0Length: Int32) -> Void {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSqSS_y(_ callback: Int32, _ param0IsSome: Int32, _ param0Bytes: Int32, _ param0Length: Int32) -> Void {
+    return invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSqSS_y_extern(callback, param0IsSome, param0Bytes, param0Length)
+}
 
-    var direction: Optional<Direction> {
-        get {
-            let jsObjectValue = jsObject.bridgeJSLowerParameter()
-            let ret = bjs_DataProcessor_direction_get(jsObjectValue)
-            return Optional<Direction>.bridgeJSLiftReturn(ret)
-        }
-        set {
-            let jsObjectValue = jsObject.bridgeJSLowerParameter()
-            let (newValueIsSome, newValueValue) = newValue.bridgeJSLowerParameter()
-            bjs_DataProcessor_direction_set(jsObjectValue, newValueIsSome, newValueValue)
-        }
-    }
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSqSS_y")
+fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSqSS_y_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer<UInt8>, _ line: UInt32) -> Int32
+#else
+fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSqSS_y_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer<UInt8>, _ line: UInt32) -> Int32 {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSqSS_y(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer<UInt8>, _ line: UInt32) -> Int32 {
+    return make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSqSS_y_extern(boxPtr, file, line)
+}
 
-    var optionalTheme: Optional<Theme> {
-        get {
-            let jsObjectValue = jsObject.bridgeJSLowerParameter()
-            bjs_DataProcessor_optionalTheme_get(jsObjectValue)
-            return Optional<Theme>.bridgeJSLiftReturnFromSideChannel()
-        }
-        set {
-            let jsObjectValue = jsObject.bridgeJSLowerParameter()
-            newValue.bridgeJSWithLoweredParameter { (newValueIsSome, newValueBytes, newValueLength) in
-                bjs_DataProcessor_optionalTheme_set(jsObjectValue, newValueIsSome, newValueBytes, newValueLength)
+private enum _BJS_Closure_20BridgeJSRuntimeTestssSqSS_y {
+    static func bridgeJSLift(_ callbackId: Int32) -> (sending Optional<String>) -> Void {
+        let callback = JSObject.bridgeJSLiftParameter(callbackId)
+        return { [callback] param0 in
+            #if arch(wasm32)
+            param0.bridgeJSWithLoweredParameter { (param0IsSome, param0Bytes, param0Length) in
+                let callbackValue = callback.bridgeJSLowerParameter()
+                invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSqSS_y(callbackValue, param0IsSome, param0Bytes, param0Length)
             }
+            #else
+            fatalError("Only available on WebAssembly")
+            #endif
         }
     }
+}
 
-    var httpStatus: Optional<HttpStatus> {
-        get {
-            let jsObjectValue = jsObject.bridgeJSLowerParameter()
-            bjs_DataProcessor_httpStatus_get(jsObjectValue)
-            return Optional<HttpStatus>.bridgeJSLiftReturnFromSideChannel()
-        }
-        set {
-            let jsObjectValue = jsObject.bridgeJSLowerParameter()
-            let (newValueIsSome, newValueValue) = newValue.bridgeJSLowerParameter()
-            bjs_DataProcessor_httpStatus_set(jsObjectValue, newValueIsSome, newValueValue)
-        }
-    }
-
-    var apiResult: Optional<APIResult> {
-        get {
-            let jsObjectValue = jsObject.bridgeJSLowerParameter()
-            let ret = bjs_DataProcessor_apiResult_get(jsObjectValue)
-            return Optional<APIResult>.bridgeJSLiftReturn(ret)
-        }
-        set {
-            let jsObjectValue = jsObject.bridgeJSLowerParameter()
-            let (newValueIsSome, newValueCaseId) = newValue.bridgeJSLowerParameter()
-            bjs_DataProcessor_apiResult_set(jsObjectValue, newValueIsSome, newValueCaseId)
-        }
-    }
-
-    var helper: Greeter {
-        get {
-            let jsObjectValue = jsObject.bridgeJSLowerParameter()
-            let ret = bjs_DataProcessor_helper_get(jsObjectValue)
-            return Greeter.bridgeJSLiftReturn(ret)
-        }
-        set {
-            let jsObjectValue = jsObject.bridgeJSLowerParameter()
-            let newValuePointer = newValue.bridgeJSLowerParameter()
-            bjs_DataProcessor_helper_set(jsObjectValue, newValuePointer)
-        }
-    }
-
-    var optionalHelper: Optional<Greeter> {
-        get {
-            let jsObjectValue = jsObject.bridgeJSLowerParameter()
-            let ret = bjs_DataProcessor_optionalHelper_get(jsObjectValue)
-            return Optional<Greeter>.bridgeJSLiftReturn(ret)
-        }
-        set {
-            let jsObjectValue = jsObject.bridgeJSLowerParameter()
-            let (newValueIsSome, newValuePointer) = newValue.bridgeJSLowerParameter()
-            bjs_DataProcessor_optionalHelper_set(jsObjectValue, newValueIsSome, newValuePointer)
-        }
+extension JSTypedClosure where Signature == (sending Optional<String>) -> Void {
+    init(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping (sending Optional<String>) -> Void) {
+        self.init(
+            makeClosure: make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSqSS_y,
+            body: body,
+            fileID: fileID,
+            line: line
+        )
     }
+}
 
-    static func bridgeJSLiftParameter(_ value: Int32) -> Self {
-        return AnyDataProcessor(jsObject: JSObject(id: UInt32(bitPattern: value)))
-    }
+@_expose(wasm, "invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSqSS_y")
+@_cdecl("invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSqSS_y")
+public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSqSS_y(_ boxPtr: UnsafeMutableRawPointer, _ param0IsSome: Int32, _ param0Bytes: Int32, _ param0Length: Int32) -> Void {
+    #if arch(wasm32)
+    let closure = Unmanaged<_BridgeJSTypedClosureBox<(sending Optional<String>) -> Void>>.fromOpaque(boxPtr).takeUnretainedValue().closure
+    closure(Optional<String>.bridgeJSLiftParameter(param0IsSome, param0Bytes, param0Length))
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
 }
 
 #if arch(wasm32)
-@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_increment")
-fileprivate func _extern_increment_extern(_ jsObject: Int32, _ amount: Int32) -> Void
+@_extern(wasm, module: "bjs", name: "invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSqSd_y")
+fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSqSd_y_extern(_ callback: Int32, _ param0IsSome: Int32, _ param0Value: Float64) -> Void
 #else
-fileprivate func _extern_increment_extern(_ jsObject: Int32, _ amount: Int32) -> Void {
+fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSqSd_y_extern(_ callback: Int32, _ param0IsSome: Int32, _ param0Value: Float64) -> Void {
     fatalError("Only available on WebAssembly")
 }
 #endif
-@inline(never) fileprivate func _extern_increment(_ jsObject: Int32, _ amount: Int32) -> Void {
-    return _extern_increment_extern(jsObject, amount)
+@inline(never) fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSqSd_y(_ callback: Int32, _ param0IsSome: Int32, _ param0Value: Float64) -> Void {
+    return invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSqSd_y_extern(callback, param0IsSome, param0Value)
 }
 
 #if arch(wasm32)
-@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_getValue")
-fileprivate func _extern_getValue_extern(_ jsObject: Int32) -> Int32
+@_extern(wasm, module: "bjs", name: "make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSqSd_y")
+fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSqSd_y_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer<UInt8>, _ line: UInt32) -> Int32
 #else
-fileprivate func _extern_getValue_extern(_ jsObject: Int32) -> Int32 {
+fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSqSd_y_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer<UInt8>, _ line: UInt32) -> Int32 {
     fatalError("Only available on WebAssembly")
 }
 #endif
-@inline(never) fileprivate func _extern_getValue(_ jsObject: Int32) -> Int32 {
-    return _extern_getValue_extern(jsObject)
+@inline(never) fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSqSd_y(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer<UInt8>, _ line: UInt32) -> Int32 {
+    return make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSqSd_y_extern(boxPtr, file, line)
 }
 
-#if arch(wasm32)
-@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_setLabelElements")
-fileprivate func _extern_setLabelElements_extern(_ jsObject: Int32, _ labelPrefixBytes: Int32, _ labelPrefixLength: Int32, _ labelSuffixBytes: Int32, _ labelSuffixLength: Int32) -> Void
-#else
-fileprivate func _extern_setLabelElements_extern(_ jsObject: Int32, _ labelPrefixBytes: Int32, _ labelPrefixLength: Int32, _ labelSuffixBytes: Int32, _ labelSuffixLength: Int32) -> Void {
-    fatalError("Only available on WebAssembly")
+private enum _BJS_Closure_20BridgeJSRuntimeTestssSqSd_y {
+    static func bridgeJSLift(_ callbackId: Int32) -> (sending Optional<Double>) -> Void {
+        let callback = JSObject.bridgeJSLiftParameter(callbackId)
+        return { [callback] param0 in
+            #if arch(wasm32)
+            let (param0IsSome, param0Value) = param0.bridgeJSLowerParameter()
+            let callbackValue = callback.bridgeJSLowerParameter()
+            invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSqSd_y(callbackValue, param0IsSome, param0Value)
+            #else
+            fatalError("Only available on WebAssembly")
+            #endif
+        }
+    }
 }
-#endif
-@inline(never) fileprivate func _extern_setLabelElements(_ jsObject: Int32, _ labelPrefixBytes: Int32, _ labelPrefixLength: Int32, _ labelSuffixBytes: Int32, _ labelSuffixLength: Int32) -> Void {
-    return _extern_setLabelElements_extern(jsObject, labelPrefixBytes, labelPrefixLength, labelSuffixBytes, labelSuffixLength)
+
+extension JSTypedClosure where Signature == (sending Optional<Double>) -> Void {
+    init(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping (sending Optional<Double>) -> Void) {
+        self.init(
+            makeClosure: make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSqSd_y,
+            body: body,
+            fileID: fileID,
+            line: line
+        )
+    }
+}
+
+@_expose(wasm, "invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSqSd_y")
+@_cdecl("invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSqSd_y")
+public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSqSd_y(_ boxPtr: UnsafeMutableRawPointer, _ param0IsSome: Int32, _ param0Value: Float64) -> Void {
+    #if arch(wasm32)
+    let closure = Unmanaged<_BridgeJSTypedClosureBox<(sending Optional<Double>) -> Void>>.fromOpaque(boxPtr).takeUnretainedValue().closure
+    closure(Optional<Double>.bridgeJSLiftParameter(param0IsSome, param0Value))
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
 }
 
 #if arch(wasm32)
-@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_getLabel")
-fileprivate func _extern_getLabel_extern(_ jsObject: Int32) -> Int32
+@_extern(wasm, module: "bjs", name: "invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_13DataProcessorP")
+fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_13DataProcessorP_extern(_ callback: Int32) -> Int32
 #else
-fileprivate func _extern_getLabel_extern(_ jsObject: Int32) -> Int32 {
+fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_13DataProcessorP_extern(_ callback: Int32) -> Int32 {
     fatalError("Only available on WebAssembly")
 }
 #endif
-@inline(never) fileprivate func _extern_getLabel(_ jsObject: Int32) -> Int32 {
-    return _extern_getLabel_extern(jsObject)
+@inline(never) fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_13DataProcessorP(_ callback: Int32) -> Int32 {
+    return invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_13DataProcessorP_extern(callback)
 }
 
 #if arch(wasm32)
-@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_isEven")
-fileprivate func _extern_isEven_extern(_ jsObject: Int32) -> Int32
+@_extern(wasm, module: "bjs", name: "make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_13DataProcessorP")
+fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_13DataProcessorP_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer<UInt8>, _ line: UInt32) -> Int32
 #else
-fileprivate func _extern_isEven_extern(_ jsObject: Int32) -> Int32 {
+fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_13DataProcessorP_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer<UInt8>, _ line: UInt32) -> Int32 {
     fatalError("Only available on WebAssembly")
 }
 #endif
-@inline(never) fileprivate func _extern_isEven(_ jsObject: Int32) -> Int32 {
-    return _extern_isEven_extern(jsObject)
-}
-
-#if arch(wasm32)
-@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_processGreeter")
-fileprivate func _extern_processGreeter_extern(_ jsObject: Int32, _ greeter: UnsafeMutableRawPointer) -> Int32
-#else
-fileprivate func _extern_processGreeter_extern(_ jsObject: Int32, _ greeter: UnsafeMutableRawPointer) -> Int32 {
-    fatalError("Only available on WebAssembly")
-}
-#endif
-@inline(never) fileprivate func _extern_processGreeter(_ jsObject: Int32, _ greeter: UnsafeMutableRawPointer) -> Int32 {
-    return _extern_processGreeter_extern(jsObject, greeter)
+@inline(never) fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_13DataProcessorP(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer<UInt8>, _ line: UInt32) -> Int32 {
+    return make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_13DataProcessorP_extern(boxPtr, file, line)
 }
 
-#if arch(wasm32)
-@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_createGreeter")
-fileprivate func _extern_createGreeter_extern(_ jsObject: Int32) -> UnsafeMutableRawPointer
-#else
-fileprivate func _extern_createGreeter_extern(_ jsObject: Int32) -> UnsafeMutableRawPointer {
-    fatalError("Only available on WebAssembly")
-}
-#endif
-@inline(never) fileprivate func _extern_createGreeter(_ jsObject: Int32) -> UnsafeMutableRawPointer {
-    return _extern_createGreeter_extern(jsObject)
+private enum _BJS_Closure_20BridgeJSRuntimeTestsy_13DataProcessorP {
+    static func bridgeJSLift(_ callbackId: Int32) -> () -> any DataProcessor {
+        let callback = JSObject.bridgeJSLiftParameter(callbackId)
+        return { [callback] in
+            #if arch(wasm32)
+            let callbackValue = callback.bridgeJSLowerParameter()
+            let ret = invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_13DataProcessorP(callbackValue)
+            return AnyDataProcessor.bridgeJSLiftReturn(ret)
+            #else
+            fatalError("Only available on WebAssembly")
+            #endif
+        }
+    }
 }
 
-#if arch(wasm32)
-@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_processOptionalGreeter")
-fileprivate func _extern_processOptionalGreeter_extern(_ jsObject: Int32, _ greeterIsSome: Int32, _ greeterPointer: UnsafeMutableRawPointer) -> Int32
-#else
-fileprivate func _extern_processOptionalGreeter_extern(_ jsObject: Int32, _ greeterIsSome: Int32, _ greeterPointer: UnsafeMutableRawPointer) -> Int32 {
-    fatalError("Only available on WebAssembly")
-}
-#endif
-@inline(never) fileprivate func _extern_processOptionalGreeter(_ jsObject: Int32, _ greeterIsSome: Int32, _ greeterPointer: UnsafeMutableRawPointer) -> Int32 {
-    return _extern_processOptionalGreeter_extern(jsObject, greeterIsSome, greeterPointer)
+extension JSTypedClosure where Signature == () -> any DataProcessor {
+    init(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping () -> any DataProcessor) {
+        self.init(
+            makeClosure: make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_13DataProcessorP,
+            body: body,
+            fileID: fileID,
+            line: line
+        )
+    }
 }
 
-#if arch(wasm32)
-@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_createOptionalGreeter")
-fileprivate func _extern_createOptionalGreeter_extern(_ jsObject: Int32) -> UnsafeMutableRawPointer
-#else
-fileprivate func _extern_createOptionalGreeter_extern(_ jsObject: Int32) -> UnsafeMutableRawPointer {
+@_expose(wasm, "invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_13DataProcessorP")
+@_cdecl("invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_13DataProcessorP")
+public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_13DataProcessorP(_ boxPtr: UnsafeMutableRawPointer) -> Int32 {
+    #if arch(wasm32)
+    let closure = Unmanaged<_BridgeJSTypedClosureBox<() -> any DataProcessor>>.fromOpaque(boxPtr).takeUnretainedValue().closure
+    let result = closure()
+    return (result as! _BridgedSwiftProtocolExportable).bridgeJSLowerAsProtocolReturn()
+    #else
     fatalError("Only available on WebAssembly")
-}
-#endif
-@inline(never) fileprivate func _extern_createOptionalGreeter(_ jsObject: Int32) -> UnsafeMutableRawPointer {
-    return _extern_createOptionalGreeter_extern(jsObject)
+    #endif
 }
 
 #if arch(wasm32)
-@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_handleAPIResult")
-fileprivate func _extern_handleAPIResult_extern(_ jsObject: Int32, _ resultIsSome: Int32, _ resultCaseId: Int32) -> Void
+@_extern(wasm, module: "bjs", name: "invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_Sb")
+fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_Sb_extern(_ callback: Int32) -> Int32
 #else
-fileprivate func _extern_handleAPIResult_extern(_ jsObject: Int32, _ resultIsSome: Int32, _ resultCaseId: Int32) -> Void {
+fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_Sb_extern(_ callback: Int32) -> Int32 {
     fatalError("Only available on WebAssembly")
 }
 #endif
-@inline(never) fileprivate func _extern_handleAPIResult(_ jsObject: Int32, _ resultIsSome: Int32, _ resultCaseId: Int32) -> Void {
-    return _extern_handleAPIResult_extern(jsObject, resultIsSome, resultCaseId)
+@inline(never) fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_Sb(_ callback: Int32) -> Int32 {
+    return invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_Sb_extern(callback)
 }
 
 #if arch(wasm32)
-@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_getAPIResult")
-fileprivate func _extern_getAPIResult_extern(_ jsObject: Int32) -> Int32
+@_extern(wasm, module: "bjs", name: "make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_Sb")
+fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_Sb_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer<UInt8>, _ line: UInt32) -> Int32
 #else
-fileprivate func _extern_getAPIResult_extern(_ jsObject: Int32) -> Int32 {
+fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_Sb_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer<UInt8>, _ line: UInt32) -> Int32 {
     fatalError("Only available on WebAssembly")
 }
 #endif
-@inline(never) fileprivate func _extern_getAPIResult(_ jsObject: Int32) -> Int32 {
-    return _extern_getAPIResult_extern(jsObject)
+@inline(never) fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_Sb(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer<UInt8>, _ line: UInt32) -> Int32 {
+    return make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_Sb_extern(boxPtr, file, line)
 }
 
-#if arch(wasm32)
-@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_count_get")
-fileprivate func bjs_DataProcessor_count_get_extern(_ jsObject: Int32) -> Int32
-#else
-fileprivate func bjs_DataProcessor_count_get_extern(_ jsObject: Int32) -> Int32 {
-    fatalError("Only available on WebAssembly")
-}
-#endif
-@inline(never) fileprivate func bjs_DataProcessor_count_get(_ jsObject: Int32) -> Int32 {
-    return bjs_DataProcessor_count_get_extern(jsObject)
+private enum _BJS_Closure_20BridgeJSRuntimeTestsy_Sb {
+    static func bridgeJSLift(_ callbackId: Int32) -> () -> Bool {
+        let callback = JSObject.bridgeJSLiftParameter(callbackId)
+        return { [callback] in
+            #if arch(wasm32)
+            let callbackValue = callback.bridgeJSLowerParameter()
+            let ret = invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_Sb(callbackValue)
+            return Bool.bridgeJSLiftReturn(ret)
+            #else
+            fatalError("Only available on WebAssembly")
+            #endif
+        }
+    }
 }
 
-#if arch(wasm32)
-@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_count_set")
-fileprivate func bjs_DataProcessor_count_set_extern(_ jsObject: Int32, _ newValue: Int32) -> Void
-#else
-fileprivate func bjs_DataProcessor_count_set_extern(_ jsObject: Int32, _ newValue: Int32) -> Void {
-    fatalError("Only available on WebAssembly")
-}
-#endif
-@inline(never) fileprivate func bjs_DataProcessor_count_set(_ jsObject: Int32, _ newValue: Int32) -> Void {
-    return bjs_DataProcessor_count_set_extern(jsObject, newValue)
+extension JSTypedClosure where Signature == () -> Bool {
+    init(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping () -> Bool) {
+        self.init(
+            makeClosure: make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_Sb,
+            body: body,
+            fileID: fileID,
+            line: line
+        )
+    }
 }
 
-#if arch(wasm32)
-@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_name_get")
-fileprivate func bjs_DataProcessor_name_get_extern(_ jsObject: Int32) -> Int32
-#else
-fileprivate func bjs_DataProcessor_name_get_extern(_ jsObject: Int32) -> Int32 {
+@_expose(wasm, "invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_Sb")
+@_cdecl("invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_Sb")
+public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_Sb(_ boxPtr: UnsafeMutableRawPointer) -> Int32 {
+    #if arch(wasm32)
+    let closure = Unmanaged<_BridgeJSTypedClosureBox<() -> Bool>>.fromOpaque(boxPtr).takeUnretainedValue().closure
+    let result = closure()
+    return result.bridgeJSLowerReturn()
+    #else
     fatalError("Only available on WebAssembly")
-}
-#endif
-@inline(never) fileprivate func bjs_DataProcessor_name_get(_ jsObject: Int32) -> Int32 {
-    return bjs_DataProcessor_name_get_extern(jsObject)
+    #endif
 }
 
 #if arch(wasm32)
-@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_optionalTag_get")
-fileprivate func bjs_DataProcessor_optionalTag_get_extern(_ jsObject: Int32) -> Void
+@_extern(wasm, module: "bjs", name: "invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_Sq7GreeterC")
+fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_Sq7GreeterC_extern(_ callback: Int32) -> UnsafeMutableRawPointer
 #else
-fileprivate func bjs_DataProcessor_optionalTag_get_extern(_ jsObject: Int32) -> Void {
+fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_Sq7GreeterC_extern(_ callback: Int32) -> UnsafeMutableRawPointer {
     fatalError("Only available on WebAssembly")
 }
 #endif
-@inline(never) fileprivate func bjs_DataProcessor_optionalTag_get(_ jsObject: Int32) -> Void {
-    return bjs_DataProcessor_optionalTag_get_extern(jsObject)
+@inline(never) fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_Sq7GreeterC(_ callback: Int32) -> UnsafeMutableRawPointer {
+    return invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_Sq7GreeterC_extern(callback)
 }
 
 #if arch(wasm32)
-@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_optionalTag_set")
-fileprivate func bjs_DataProcessor_optionalTag_set_extern(_ jsObject: Int32, _ newValueIsSome: Int32, _ newValueBytes: Int32, _ newValueLength: Int32) -> Void
+@_extern(wasm, module: "bjs", name: "make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_Sq7GreeterC")
+fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_Sq7GreeterC_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer<UInt8>, _ line: UInt32) -> Int32
 #else
-fileprivate func bjs_DataProcessor_optionalTag_set_extern(_ jsObject: Int32, _ newValueIsSome: Int32, _ newValueBytes: Int32, _ newValueLength: Int32) -> Void {
+fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_Sq7GreeterC_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer<UInt8>, _ line: UInt32) -> Int32 {
     fatalError("Only available on WebAssembly")
 }
 #endif
-@inline(never) fileprivate func bjs_DataProcessor_optionalTag_set(_ jsObject: Int32, _ newValueIsSome: Int32, _ newValueBytes: Int32, _ newValueLength: Int32) -> Void {
-    return bjs_DataProcessor_optionalTag_set_extern(jsObject, newValueIsSome, newValueBytes, newValueLength)
+@inline(never) fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_Sq7GreeterC(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer<UInt8>, _ line: UInt32) -> Int32 {
+    return make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_Sq7GreeterC_extern(boxPtr, file, line)
 }
 
-#if arch(wasm32)
-@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_optionalCount_get")
-fileprivate func bjs_DataProcessor_optionalCount_get_extern(_ jsObject: Int32) -> Void
-#else
-fileprivate func bjs_DataProcessor_optionalCount_get_extern(_ jsObject: Int32) -> Void {
-    fatalError("Only available on WebAssembly")
-}
-#endif
-@inline(never) fileprivate func bjs_DataProcessor_optionalCount_get(_ jsObject: Int32) -> Void {
-    return bjs_DataProcessor_optionalCount_get_extern(jsObject)
+private enum _BJS_Closure_20BridgeJSRuntimeTestsy_Sq7GreeterC {
+    static func bridgeJSLift(_ callbackId: Int32) -> () -> Optional<Greeter> {
+        let callback = JSObject.bridgeJSLiftParameter(callbackId)
+        return { [callback] in
+            #if arch(wasm32)
+            let callbackValue = callback.bridgeJSLowerParameter()
+            let ret = invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_Sq7GreeterC(callbackValue)
+            return Optional<Greeter>.bridgeJSLiftReturn(ret)
+            #else
+            fatalError("Only available on WebAssembly")
+            #endif
+        }
+    }
 }
 
-#if arch(wasm32)
-@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_optionalCount_set")
-fileprivate func bjs_DataProcessor_optionalCount_set_extern(_ jsObject: Int32, _ newValueIsSome: Int32, _ newValueValue: Int32) -> Void
-#else
-fileprivate func bjs_DataProcessor_optionalCount_set_extern(_ jsObject: Int32, _ newValueIsSome: Int32, _ newValueValue: Int32) -> Void {
-    fatalError("Only available on WebAssembly")
-}
-#endif
-@inline(never) fileprivate func bjs_DataProcessor_optionalCount_set(_ jsObject: Int32, _ newValueIsSome: Int32, _ newValueValue: Int32) -> Void {
-    return bjs_DataProcessor_optionalCount_set_extern(jsObject, newValueIsSome, newValueValue)
+extension JSTypedClosure where Signature == () -> Optional<Greeter> {
+    init(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping () -> Optional<Greeter>) {
+        self.init(
+            makeClosure: make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_Sq7GreeterC,
+            body: body,
+            fileID: fileID,
+            line: line
+        )
+    }
 }
 
-#if arch(wasm32)
-@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_direction_get")
-fileprivate func bjs_DataProcessor_direction_get_extern(_ jsObject: Int32) -> Int32
-#else
-fileprivate func bjs_DataProcessor_direction_get_extern(_ jsObject: Int32) -> Int32 {
+@_expose(wasm, "invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_Sq7GreeterC")
+@_cdecl("invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_Sq7GreeterC")
+public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_Sq7GreeterC(_ boxPtr: UnsafeMutableRawPointer) -> Void {
+    #if arch(wasm32)
+    let closure = Unmanaged<_BridgeJSTypedClosureBox<() -> Optional<Greeter>>>.fromOpaque(boxPtr).takeUnretainedValue().closure
+    let result = closure()
+    return result.bridgeJSLowerReturn()
+    #else
     fatalError("Only available on WebAssembly")
-}
-#endif
-@inline(never) fileprivate func bjs_DataProcessor_direction_get(_ jsObject: Int32) -> Int32 {
-    return bjs_DataProcessor_direction_get_extern(jsObject)
+    #endif
 }
 
 #if arch(wasm32)
-@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_direction_set")
-fileprivate func bjs_DataProcessor_direction_set_extern(_ jsObject: Int32, _ newValueIsSome: Int32, _ newValueValue: Int32) -> Void
+@_extern(wasm, module: "bjs", name: "invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_y")
+fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_y_extern(_ callback: Int32) -> Void
 #else
-fileprivate func bjs_DataProcessor_direction_set_extern(_ jsObject: Int32, _ newValueIsSome: Int32, _ newValueValue: Int32) -> Void {
+fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_y_extern(_ callback: Int32) -> Void {
     fatalError("Only available on WebAssembly")
 }
 #endif
-@inline(never) fileprivate func bjs_DataProcessor_direction_set(_ jsObject: Int32, _ newValueIsSome: Int32, _ newValueValue: Int32) -> Void {
-    return bjs_DataProcessor_direction_set_extern(jsObject, newValueIsSome, newValueValue)
+@inline(never) fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_y(_ callback: Int32) -> Void {
+    return invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_y_extern(callback)
 }
 
 #if arch(wasm32)
-@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_optionalTheme_get")
-fileprivate func bjs_DataProcessor_optionalTheme_get_extern(_ jsObject: Int32) -> Void
+@_extern(wasm, module: "bjs", name: "make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_y")
+fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_y_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer<UInt8>, _ line: UInt32) -> Int32
 #else
-fileprivate func bjs_DataProcessor_optionalTheme_get_extern(_ jsObject: Int32) -> Void {
+fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_y_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer<UInt8>, _ line: UInt32) -> Int32 {
     fatalError("Only available on WebAssembly")
 }
 #endif
-@inline(never) fileprivate func bjs_DataProcessor_optionalTheme_get(_ jsObject: Int32) -> Void {
-    return bjs_DataProcessor_optionalTheme_get_extern(jsObject)
+@inline(never) fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_y(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer<UInt8>, _ line: UInt32) -> Int32 {
+    return make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_y_extern(boxPtr, file, line)
 }
 
-#if arch(wasm32)
-@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_optionalTheme_set")
-fileprivate func bjs_DataProcessor_optionalTheme_set_extern(_ jsObject: Int32, _ newValueIsSome: Int32, _ newValueBytes: Int32, _ newValueLength: Int32) -> Void
-#else
-fileprivate func bjs_DataProcessor_optionalTheme_set_extern(_ jsObject: Int32, _ newValueIsSome: Int32, _ newValueBytes: Int32, _ newValueLength: Int32) -> Void {
-    fatalError("Only available on WebAssembly")
-}
-#endif
-@inline(never) fileprivate func bjs_DataProcessor_optionalTheme_set(_ jsObject: Int32, _ newValueIsSome: Int32, _ newValueBytes: Int32, _ newValueLength: Int32) -> Void {
-    return bjs_DataProcessor_optionalTheme_set_extern(jsObject, newValueIsSome, newValueBytes, newValueLength)
-}
-
-#if arch(wasm32)
-@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_httpStatus_get")
-fileprivate func bjs_DataProcessor_httpStatus_get_extern(_ jsObject: Int32) -> Void
-#else
-fileprivate func bjs_DataProcessor_httpStatus_get_extern(_ jsObject: Int32) -> Void {
-    fatalError("Only available on WebAssembly")
-}
-#endif
-@inline(never) fileprivate func bjs_DataProcessor_httpStatus_get(_ jsObject: Int32) -> Void {
-    return bjs_DataProcessor_httpStatus_get_extern(jsObject)
+private enum _BJS_Closure_20BridgeJSRuntimeTestsy_y {
+    static func bridgeJSLift(_ callbackId: Int32) -> () -> Void {
+        let callback = JSObject.bridgeJSLiftParameter(callbackId)
+        return { [callback] in
+            #if arch(wasm32)
+            let callbackValue = callback.bridgeJSLowerParameter()
+            invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_y(callbackValue)
+            #else
+            fatalError("Only available on WebAssembly")
+            #endif
+        }
+    }
 }
 
-#if arch(wasm32)
-@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_httpStatus_set")
-fileprivate func bjs_DataProcessor_httpStatus_set_extern(_ jsObject: Int32, _ newValueIsSome: Int32, _ newValueValue: Int32) -> Void
-#else
-fileprivate func bjs_DataProcessor_httpStatus_set_extern(_ jsObject: Int32, _ newValueIsSome: Int32, _ newValueValue: Int32) -> Void {
-    fatalError("Only available on WebAssembly")
-}
-#endif
-@inline(never) fileprivate func bjs_DataProcessor_httpStatus_set(_ jsObject: Int32, _ newValueIsSome: Int32, _ newValueValue: Int32) -> Void {
-    return bjs_DataProcessor_httpStatus_set_extern(jsObject, newValueIsSome, newValueValue)
+extension JSTypedClosure where Signature == () -> Void {
+    init(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping () -> Void) {
+        self.init(
+            makeClosure: make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_y,
+            body: body,
+            fileID: fileID,
+            line: line
+        )
+    }
 }
 
-#if arch(wasm32)
-@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_apiResult_get")
-fileprivate func bjs_DataProcessor_apiResult_get_extern(_ jsObject: Int32) -> Int32
-#else
-fileprivate func bjs_DataProcessor_apiResult_get_extern(_ jsObject: Int32) -> Int32 {
+@_expose(wasm, "invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_y")
+@_cdecl("invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_y")
+public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_y(_ boxPtr: UnsafeMutableRawPointer) -> Void {
+    #if arch(wasm32)
+    let closure = Unmanaged<_BridgeJSTypedClosureBox<() -> Void>>.fromOpaque(boxPtr).takeUnretainedValue().closure
+    closure()
+    #else
     fatalError("Only available on WebAssembly")
-}
-#endif
-@inline(never) fileprivate func bjs_DataProcessor_apiResult_get(_ jsObject: Int32) -> Int32 {
-    return bjs_DataProcessor_apiResult_get_extern(jsObject)
+    #endif
 }
 
-#if arch(wasm32)
-@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_apiResult_set")
-fileprivate func bjs_DataProcessor_apiResult_set_extern(_ jsObject: Int32, _ newValueIsSome: Int32, _ newValueCaseId: Int32) -> Void
-#else
-fileprivate func bjs_DataProcessor_apiResult_set_extern(_ jsObject: Int32, _ newValueIsSome: Int32, _ newValueCaseId: Int32) -> Void {
-    fatalError("Only available on WebAssembly")
-}
-#endif
-@inline(never) fileprivate func bjs_DataProcessor_apiResult_set(_ jsObject: Int32, _ newValueIsSome: Int32, _ newValueCaseId: Int32) -> Void {
-    return bjs_DataProcessor_apiResult_set_extern(jsObject, newValueIsSome, newValueCaseId)
-}
+struct AnyArrayElementProtocol: ArrayElementProtocol, _BridgedSwiftProtocolWrapper {
+    let jsObject: JSObject
 
-#if arch(wasm32)
-@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_helper_get")
-fileprivate func bjs_DataProcessor_helper_get_extern(_ jsObject: Int32) -> UnsafeMutableRawPointer
-#else
-fileprivate func bjs_DataProcessor_helper_get_extern(_ jsObject: Int32) -> UnsafeMutableRawPointer {
-    fatalError("Only available on WebAssembly")
-}
-#endif
-@inline(never) fileprivate func bjs_DataProcessor_helper_get(_ jsObject: Int32) -> UnsafeMutableRawPointer {
-    return bjs_DataProcessor_helper_get_extern(jsObject)
-}
+    var value: Int {
+        get {
+            let jsObjectValue = jsObject.bridgeJSLowerParameter()
+            let ret = bjs_ArrayElementProtocol_value_get(jsObjectValue)
+            return Int.bridgeJSLiftReturn(ret)
+        }
+        set {
+            let newValueValue = newValue.bridgeJSLowerParameter()
+            let jsObjectValue = jsObject.bridgeJSLowerParameter()
+            bjs_ArrayElementProtocol_value_set(jsObjectValue, newValueValue)
+        }
+    }
 
-#if arch(wasm32)
-@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_helper_set")
-fileprivate func bjs_DataProcessor_helper_set_extern(_ jsObject: Int32, _ newValue: UnsafeMutableRawPointer) -> Void
-#else
-fileprivate func bjs_DataProcessor_helper_set_extern(_ jsObject: Int32, _ newValue: UnsafeMutableRawPointer) -> Void {
-    fatalError("Only available on WebAssembly")
-}
-#endif
-@inline(never) fileprivate func bjs_DataProcessor_helper_set(_ jsObject: Int32, _ newValue: UnsafeMutableRawPointer) -> Void {
-    return bjs_DataProcessor_helper_set_extern(jsObject, newValue)
+    static func bridgeJSLiftParameter(_ value: Int32) -> Self {
+        return AnyArrayElementProtocol(jsObject: JSObject(id: UInt32(bitPattern: value)))
+    }
 }
 
 #if arch(wasm32)
-@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_optionalHelper_get")
-fileprivate func bjs_DataProcessor_optionalHelper_get_extern(_ jsObject: Int32) -> UnsafeMutableRawPointer
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_ArrayElementProtocol_value_get")
+fileprivate func bjs_ArrayElementProtocol_value_get_extern(_ jsObject: Int32) -> Int32
 #else
-fileprivate func bjs_DataProcessor_optionalHelper_get_extern(_ jsObject: Int32) -> UnsafeMutableRawPointer {
+fileprivate func bjs_ArrayElementProtocol_value_get_extern(_ jsObject: Int32) -> Int32 {
     fatalError("Only available on WebAssembly")
 }
 #endif
-@inline(never) fileprivate func bjs_DataProcessor_optionalHelper_get(_ jsObject: Int32) -> UnsafeMutableRawPointer {
-    return bjs_DataProcessor_optionalHelper_get_extern(jsObject)
+@inline(never) fileprivate func bjs_ArrayElementProtocol_value_get(_ jsObject: Int32) -> Int32 {
+    return bjs_ArrayElementProtocol_value_get_extern(jsObject)
 }
 
 #if arch(wasm32)
-@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_optionalHelper_set")
-fileprivate func bjs_DataProcessor_optionalHelper_set_extern(_ jsObject: Int32, _ newValueIsSome: Int32, _ newValuePointer: UnsafeMutableRawPointer) -> Void
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_ArrayElementProtocol_value_set")
+fileprivate func bjs_ArrayElementProtocol_value_set_extern(_ jsObject: Int32, _ newValue: Int32) -> Void
 #else
-fileprivate func bjs_DataProcessor_optionalHelper_set_extern(_ jsObject: Int32, _ newValueIsSome: Int32, _ newValuePointer: UnsafeMutableRawPointer) -> Void {
+fileprivate func bjs_ArrayElementProtocol_value_set_extern(_ jsObject: Int32, _ newValue: Int32) -> Void {
     fatalError("Only available on WebAssembly")
 }
 #endif
-@inline(never) fileprivate func bjs_DataProcessor_optionalHelper_set(_ jsObject: Int32, _ newValueIsSome: Int32, _ newValuePointer: UnsafeMutableRawPointer) -> Void {
-    return bjs_DataProcessor_optionalHelper_set_extern(jsObject, newValueIsSome, newValuePointer)
+@inline(never) fileprivate func bjs_ArrayElementProtocol_value_set(_ jsObject: Int32, _ newValue: Int32) -> Void {
+    return bjs_ArrayElementProtocol_value_set_extern(jsObject, newValue)
 }
 
-@_expose(wasm, "bjs_ArraySupportExports_static_roundTripIntArray")
-@_cdecl("bjs_ArraySupportExports_static_roundTripIntArray")
-public func _bjs_ArraySupportExports_static_roundTripIntArray() -> Void {
-    #if arch(wasm32)
-    let ret = ArraySupportExports.roundTripIntArray(_: [Int].bridgeJSStackPop())
-    ret.bridgeJSStackPush()
-    #else
-    fatalError("Only available on WebAssembly")
-    #endif
-}
+struct AnyDataProcessor: DataProcessor, _BridgedSwiftProtocolWrapper {
+    let jsObject: JSObject
 
-@_expose(wasm, "bjs_ArraySupportExports_static_roundTripStringArray")
-@_cdecl("bjs_ArraySupportExports_static_roundTripStringArray")
-public func _bjs_ArraySupportExports_static_roundTripStringArray() -> Void {
-    #if arch(wasm32)
-    let ret = ArraySupportExports.roundTripStringArray(_: [String].bridgeJSStackPop())
-    ret.bridgeJSStackPush()
-    #else
-    fatalError("Only available on WebAssembly")
-    #endif
-}
+    func increment(by amount: Int) -> Void {
+        let amountValue = amount.bridgeJSLowerParameter()
+        let jsObjectValue = jsObject.bridgeJSLowerParameter()
+        _extern_increment(jsObjectValue, amountValue)
+    }
 
-@_expose(wasm, "bjs_ArraySupportExports_static_roundTripDoubleArray")
-@_cdecl("bjs_ArraySupportExports_static_roundTripDoubleArray")
-public func _bjs_ArraySupportExports_static_roundTripDoubleArray() -> Void {
-    #if arch(wasm32)
-    let ret = ArraySupportExports.roundTripDoubleArray(_: [Double].bridgeJSStackPop())
-    ret.bridgeJSStackPush()
-    #else
-    fatalError("Only available on WebAssembly")
-    #endif
-}
+    func getValue() -> Int {
+        let jsObjectValue = jsObject.bridgeJSLowerParameter()
+        let ret = _extern_getValue(jsObjectValue)
+        return Int.bridgeJSLiftReturn(ret)
+    }
 
-@_expose(wasm, "bjs_ArraySupportExports_static_roundTripBoolArray")
-@_cdecl("bjs_ArraySupportExports_static_roundTripBoolArray")
-public func _bjs_ArraySupportExports_static_roundTripBoolArray() -> Void {
-    #if arch(wasm32)
-    let ret = ArraySupportExports.roundTripBoolArray(_: [Bool].bridgeJSStackPop())
-    ret.bridgeJSStackPush()
-    #else
-    fatalError("Only available on WebAssembly")
-    #endif
-}
+    func setLabelElements(_ labelPrefix: String, _ labelSuffix: String) -> Void {
+        labelPrefix.bridgeJSWithLoweredParameter { (labelPrefixBytes, labelPrefixLength) in
+            labelSuffix.bridgeJSWithLoweredParameter { (labelSuffixBytes, labelSuffixLength) in
+                let jsObjectValue = jsObject.bridgeJSLowerParameter()
+                _extern_setLabelElements(jsObjectValue, labelPrefixBytes, labelPrefixLength, labelSuffixBytes, labelSuffixLength)
+            }
+        }
+    }
 
-@_expose(wasm, "bjs_ArraySupportExports_static_roundTripUnsafeRawPointerArray")
-@_cdecl("bjs_ArraySupportExports_static_roundTripUnsafeRawPointerArray")
-public func _bjs_ArraySupportExports_static_roundTripUnsafeRawPointerArray() -> Void {
-    #if arch(wasm32)
-    let ret = ArraySupportExports.roundTripUnsafeRawPointerArray(_: [UnsafeRawPointer].bridgeJSStackPop())
-    ret.bridgeJSStackPush()
-    #else
-    fatalError("Only available on WebAssembly")
-    #endif
-}
+    func getLabel() -> String {
+        let jsObjectValue = jsObject.bridgeJSLowerParameter()
+        let ret = _extern_getLabel(jsObjectValue)
+        return String.bridgeJSLiftReturn(ret)
+    }
 
-@_expose(wasm, "bjs_ArraySupportExports_static_roundTripUnsafeMutableRawPointerArray")
-@_cdecl("bjs_ArraySupportExports_static_roundTripUnsafeMutableRawPointerArray")
-public func _bjs_ArraySupportExports_static_roundTripUnsafeMutableRawPointerArray() -> Void {
-    #if arch(wasm32)
-    let ret = ArraySupportExports.roundTripUnsafeMutableRawPointerArray(_: [UnsafeMutableRawPointer].bridgeJSStackPop())
-    ret.bridgeJSStackPush()
-    #else
-    fatalError("Only available on WebAssembly")
-    #endif
-}
+    func isEven() -> Bool {
+        let jsObjectValue = jsObject.bridgeJSLowerParameter()
+        let ret = _extern_isEven(jsObjectValue)
+        return Bool.bridgeJSLiftReturn(ret)
+    }
 
-@_expose(wasm, "bjs_ArraySupportExports_static_roundTripOpaquePointerArray")
-@_cdecl("bjs_ArraySupportExports_static_roundTripOpaquePointerArray")
-public func _bjs_ArraySupportExports_static_roundTripOpaquePointerArray() -> Void {
-    #if arch(wasm32)
-    let ret = ArraySupportExports.roundTripOpaquePointerArray(_: [OpaquePointer].bridgeJSStackPop())
-    ret.bridgeJSStackPush()
-    #else
-    fatalError("Only available on WebAssembly")
-    #endif
-}
+    func processGreeter(_ greeter: Greeter) -> String {
+        let greeterPointer = greeter.bridgeJSLowerParameter()
+        let jsObjectValue = jsObject.bridgeJSLowerParameter()
+        let ret = _extern_processGreeter(jsObjectValue, greeterPointer)
+        return String.bridgeJSLiftReturn(ret)
+    }
 
-@_expose(wasm, "bjs_ArraySupportExports_static_roundTripUnsafePointerArray")
-@_cdecl("bjs_ArraySupportExports_static_roundTripUnsafePointerArray")
-public func _bjs_ArraySupportExports_static_roundTripUnsafePointerArray() -> Void {
-    #if arch(wasm32)
-    let ret = ArraySupportExports.roundTripUnsafePointerArray(_: [UnsafePointer<UInt8>].bridgeJSStackPop())
-    ret.bridgeJSStackPush()
-    #else
-    fatalError("Only available on WebAssembly")
-    #endif
-}
+    func createGreeter() -> Greeter {
+        let jsObjectValue = jsObject.bridgeJSLowerParameter()
+        let ret = _extern_createGreeter(jsObjectValue)
+        return Greeter.bridgeJSLiftReturn(ret)
+    }
 
-@_expose(wasm, "bjs_ArraySupportExports_static_roundTripUnsafeMutablePointerArray")
-@_cdecl("bjs_ArraySupportExports_static_roundTripUnsafeMutablePointerArray")
-public func _bjs_ArraySupportExports_static_roundTripUnsafeMutablePointerArray() -> Void {
-    #if arch(wasm32)
-    let ret = ArraySupportExports.roundTripUnsafeMutablePointerArray(_: [UnsafeMutablePointer<UInt8>].bridgeJSStackPop())
-    ret.bridgeJSStackPush()
-    #else
-    fatalError("Only available on WebAssembly")
-    #endif
-}
+    func processOptionalGreeter(_ greeter: Optional<Greeter>) -> String {
+        let (greeterIsSome, greeterPointer) = greeter.bridgeJSLowerParameter()
+        let jsObjectValue = jsObject.bridgeJSLowerParameter()
+        let ret = _extern_processOptionalGreeter(jsObjectValue, greeterIsSome, greeterPointer)
+        return String.bridgeJSLiftReturn(ret)
+    }
 
-@_expose(wasm, "bjs_ArraySupportExports_static_roundTripJSValueArray")
-@_cdecl("bjs_ArraySupportExports_static_roundTripJSValueArray")
-public func _bjs_ArraySupportExports_static_roundTripJSValueArray() -> Void {
-    #if arch(wasm32)
-    let ret = ArraySupportExports.roundTripJSValueArray(_: [JSValue].bridgeJSStackPop())
-    ret.bridgeJSStackPush()
-    #else
-    fatalError("Only available on WebAssembly")
-    #endif
+    func createOptionalGreeter() -> Optional<Greeter> {
+        let jsObjectValue = jsObject.bridgeJSLowerParameter()
+        let ret = _extern_createOptionalGreeter(jsObjectValue)
+        return Optional<Greeter>.bridgeJSLiftReturn(ret)
+    }
+
+    func handleAPIResult(_ result: Optional<APIResult>) -> Void {
+        let (resultIsSome, resultCaseId) = result.bridgeJSLowerParameter()
+        let jsObjectValue = jsObject.bridgeJSLowerParameter()
+        _extern_handleAPIResult(jsObjectValue, resultIsSome, resultCaseId)
+    }
+
+    func getAPIResult() -> Optional<APIResult> {
+        let jsObjectValue = jsObject.bridgeJSLowerParameter()
+        let ret = _extern_getAPIResult(jsObjectValue)
+        return Optional<APIResult>.bridgeJSLiftReturn(ret)
+    }
+
+    var count: Int {
+        get {
+            let jsObjectValue = jsObject.bridgeJSLowerParameter()
+            let ret = bjs_DataProcessor_count_get(jsObjectValue)
+            return Int.bridgeJSLiftReturn(ret)
+        }
+        set {
+            let newValueValue = newValue.bridgeJSLowerParameter()
+            let jsObjectValue = jsObject.bridgeJSLowerParameter()
+            bjs_DataProcessor_count_set(jsObjectValue, newValueValue)
+        }
+    }
+
+    var name: String {
+        get {
+            let jsObjectValue = jsObject.bridgeJSLowerParameter()
+            let ret = bjs_DataProcessor_name_get(jsObjectValue)
+            return String.bridgeJSLiftReturn(ret)
+        }
+    }
+
+    var optionalTag: Optional<String> {
+        get {
+            let jsObjectValue = jsObject.bridgeJSLowerParameter()
+            bjs_DataProcessor_optionalTag_get(jsObjectValue)
+            return Optional<String>.bridgeJSLiftReturnFromSideChannel()
+        }
+        set {
+            newValue.bridgeJSWithLoweredParameter { (newValueIsSome, newValueBytes, newValueLength) in
+                let jsObjectValue = jsObject.bridgeJSLowerParameter()
+                bjs_DataProcessor_optionalTag_set(jsObjectValue, newValueIsSome, newValueBytes, newValueLength)
+            }
+        }
+    }
+
+    var optionalCount: Optional<Int> {
+        get {
+            let jsObjectValue = jsObject.bridgeJSLowerParameter()
+            bjs_DataProcessor_optionalCount_get(jsObjectValue)
+            return Optional<Int>.bridgeJSLiftReturnFromSideChannel()
+        }
+        set {
+            let (newValueIsSome, newValueValue) = newValue.bridgeJSLowerParameter()
+            let jsObjectValue = jsObject.bridgeJSLowerParameter()
+            bjs_DataProcessor_optionalCount_set(jsObjectValue, newValueIsSome, newValueValue)
+        }
+    }
+
+    var direction: Optional<Direction> {
+        get {
+            let jsObjectValue = jsObject.bridgeJSLowerParameter()
+            let ret = bjs_DataProcessor_direction_get(jsObjectValue)
+            return Optional<Direction>.bridgeJSLiftReturn(ret)
+        }
+        set {
+            let (newValueIsSome, newValueValue) = newValue.bridgeJSLowerParameter()
+            let jsObjectValue = jsObject.bridgeJSLowerParameter()
+            bjs_DataProcessor_direction_set(jsObjectValue, newValueIsSome, newValueValue)
+        }
+    }
+
+    var optionalTheme: Optional<Theme> {
+        get {
+            let jsObjectValue = jsObject.bridgeJSLowerParameter()
+            bjs_DataProcessor_optionalTheme_get(jsObjectValue)
+            return Optional<Theme>.bridgeJSLiftReturnFromSideChannel()
+        }
+        set {
+            newValue.bridgeJSWithLoweredParameter { (newValueIsSome, newValueBytes, newValueLength) in
+                let jsObjectValue = jsObject.bridgeJSLowerParameter()
+                bjs_DataProcessor_optionalTheme_set(jsObjectValue, newValueIsSome, newValueBytes, newValueLength)
+            }
+        }
+    }
+
+    var httpStatus: Optional<HttpStatus> {
+        get {
+            let jsObjectValue = jsObject.bridgeJSLowerParameter()
+            bjs_DataProcessor_httpStatus_get(jsObjectValue)
+            return Optional<HttpStatus>.bridgeJSLiftReturnFromSideChannel()
+        }
+        set {
+            let (newValueIsSome, newValueValue) = newValue.bridgeJSLowerParameter()
+            let jsObjectValue = jsObject.bridgeJSLowerParameter()
+            bjs_DataProcessor_httpStatus_set(jsObjectValue, newValueIsSome, newValueValue)
+        }
+    }
+
+    var apiResult: Optional<APIResult> {
+        get {
+            let jsObjectValue = jsObject.bridgeJSLowerParameter()
+            let ret = bjs_DataProcessor_apiResult_get(jsObjectValue)
+            return Optional<APIResult>.bridgeJSLiftReturn(ret)
+        }
+        set {
+            let (newValueIsSome, newValueCaseId) = newValue.bridgeJSLowerParameter()
+            let jsObjectValue = jsObject.bridgeJSLowerParameter()
+            bjs_DataProcessor_apiResult_set(jsObjectValue, newValueIsSome, newValueCaseId)
+        }
+    }
+
+    var helper: Greeter {
+        get {
+            let jsObjectValue = jsObject.bridgeJSLowerParameter()
+            let ret = bjs_DataProcessor_helper_get(jsObjectValue)
+            return Greeter.bridgeJSLiftReturn(ret)
+        }
+        set {
+            let newValuePointer = newValue.bridgeJSLowerParameter()
+            let jsObjectValue = jsObject.bridgeJSLowerParameter()
+            bjs_DataProcessor_helper_set(jsObjectValue, newValuePointer)
+        }
+    }
+
+    var optionalHelper: Optional<Greeter> {
+        get {
+            let jsObjectValue = jsObject.bridgeJSLowerParameter()
+            let ret = bjs_DataProcessor_optionalHelper_get(jsObjectValue)
+            return Optional<Greeter>.bridgeJSLiftReturn(ret)
+        }
+        set {
+            let (newValueIsSome, newValuePointer) = newValue.bridgeJSLowerParameter()
+            let jsObjectValue = jsObject.bridgeJSLowerParameter()
+            bjs_DataProcessor_optionalHelper_set(jsObjectValue, newValueIsSome, newValuePointer)
+        }
+    }
+
+    static func bridgeJSLiftParameter(_ value: Int32) -> Self {
+        return AnyDataProcessor(jsObject: JSObject(id: UInt32(bitPattern: value)))
+    }
 }
 
-@_expose(wasm, "bjs_ArraySupportExports_static_roundTripJSObjectArray")
-@_cdecl("bjs_ArraySupportExports_static_roundTripJSObjectArray")
-public func _bjs_ArraySupportExports_static_roundTripJSObjectArray() -> Void {
-    #if arch(wasm32)
-    let ret = ArraySupportExports.roundTripJSObjectArray(_: [JSObject].bridgeJSStackPop())
-    ret.bridgeJSStackPush()
-    #else
+#if arch(wasm32)
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_increment")
+fileprivate func _extern_increment_extern(_ jsObject: Int32, _ amount: Int32) -> Void
+#else
+fileprivate func _extern_increment_extern(_ jsObject: Int32, _ amount: Int32) -> Void {
     fatalError("Only available on WebAssembly")
-    #endif
+}
+#endif
+@inline(never) fileprivate func _extern_increment(_ jsObject: Int32, _ amount: Int32) -> Void {
+    return _extern_increment_extern(jsObject, amount)
 }
 
-@_expose(wasm, "bjs_ArraySupportExports_static_roundTripCaseEnumArray")
-@_cdecl("bjs_ArraySupportExports_static_roundTripCaseEnumArray")
-public func _bjs_ArraySupportExports_static_roundTripCaseEnumArray() -> Void {
-    #if arch(wasm32)
-    let ret = ArraySupportExports.roundTripCaseEnumArray(_: [Direction].bridgeJSStackPop())
-    ret.bridgeJSStackPush()
-    #else
+#if arch(wasm32)
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_getValue")
+fileprivate func _extern_getValue_extern(_ jsObject: Int32) -> Int32
+#else
+fileprivate func _extern_getValue_extern(_ jsObject: Int32) -> Int32 {
     fatalError("Only available on WebAssembly")
-    #endif
+}
+#endif
+@inline(never) fileprivate func _extern_getValue(_ jsObject: Int32) -> Int32 {
+    return _extern_getValue_extern(jsObject)
 }
 
-@_expose(wasm, "bjs_ArraySupportExports_static_roundTripStringRawValueEnumArray")
-@_cdecl("bjs_ArraySupportExports_static_roundTripStringRawValueEnumArray")
-public func _bjs_ArraySupportExports_static_roundTripStringRawValueEnumArray() -> Void {
-    #if arch(wasm32)
-    let ret = ArraySupportExports.roundTripStringRawValueEnumArray(_: [Theme].bridgeJSStackPop())
-    ret.bridgeJSStackPush()
-    #else
+#if arch(wasm32)
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_setLabelElements")
+fileprivate func _extern_setLabelElements_extern(_ jsObject: Int32, _ labelPrefixBytes: Int32, _ labelPrefixLength: Int32, _ labelSuffixBytes: Int32, _ labelSuffixLength: Int32) -> Void
+#else
+fileprivate func _extern_setLabelElements_extern(_ jsObject: Int32, _ labelPrefixBytes: Int32, _ labelPrefixLength: Int32, _ labelSuffixBytes: Int32, _ labelSuffixLength: Int32) -> Void {
     fatalError("Only available on WebAssembly")
-    #endif
+}
+#endif
+@inline(never) fileprivate func _extern_setLabelElements(_ jsObject: Int32, _ labelPrefixBytes: Int32, _ labelPrefixLength: Int32, _ labelSuffixBytes: Int32, _ labelSuffixLength: Int32) -> Void {
+    return _extern_setLabelElements_extern(jsObject, labelPrefixBytes, labelPrefixLength, labelSuffixBytes, labelSuffixLength)
 }
 
-@_expose(wasm, "bjs_ArraySupportExports_static_roundTripIntRawValueEnumArray")
-@_cdecl("bjs_ArraySupportExports_static_roundTripIntRawValueEnumArray")
-public func _bjs_ArraySupportExports_static_roundTripIntRawValueEnumArray() -> Void {
-    #if arch(wasm32)
-    let ret = ArraySupportExports.roundTripIntRawValueEnumArray(_: [HttpStatus].bridgeJSStackPop())
-    ret.bridgeJSStackPush()
-    #else
+#if arch(wasm32)
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_getLabel")
+fileprivate func _extern_getLabel_extern(_ jsObject: Int32) -> Int32
+#else
+fileprivate func _extern_getLabel_extern(_ jsObject: Int32) -> Int32 {
     fatalError("Only available on WebAssembly")
-    #endif
+}
+#endif
+@inline(never) fileprivate func _extern_getLabel(_ jsObject: Int32) -> Int32 {
+    return _extern_getLabel_extern(jsObject)
 }
 
-@_expose(wasm, "bjs_ArraySupportExports_static_roundTripInt64RawValueEnumArray")
-@_cdecl("bjs_ArraySupportExports_static_roundTripInt64RawValueEnumArray")
-public func _bjs_ArraySupportExports_static_roundTripInt64RawValueEnumArray() -> Void {
-    #if arch(wasm32)
-    let ret = ArraySupportExports.roundTripInt64RawValueEnumArray(_: [FileSize].bridgeJSStackPop())
-    ret.bridgeJSStackPush()
-    #else
+#if arch(wasm32)
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_isEven")
+fileprivate func _extern_isEven_extern(_ jsObject: Int32) -> Int32
+#else
+fileprivate func _extern_isEven_extern(_ jsObject: Int32) -> Int32 {
     fatalError("Only available on WebAssembly")
-    #endif
+}
+#endif
+@inline(never) fileprivate func _extern_isEven(_ jsObject: Int32) -> Int32 {
+    return _extern_isEven_extern(jsObject)
 }
 
-@_expose(wasm, "bjs_ArraySupportExports_static_roundTripUInt64RawValueEnumArray")
-@_cdecl("bjs_ArraySupportExports_static_roundTripUInt64RawValueEnumArray")
-public func _bjs_ArraySupportExports_static_roundTripUInt64RawValueEnumArray() -> Void {
-    #if arch(wasm32)
-    let ret = ArraySupportExports.roundTripUInt64RawValueEnumArray(_: [SessionId].bridgeJSStackPop())
-    ret.bridgeJSStackPush()
-    #else
+#if arch(wasm32)
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_processGreeter")
+fileprivate func _extern_processGreeter_extern(_ jsObject: Int32, _ greeter: UnsafeMutableRawPointer) -> Int32
+#else
+fileprivate func _extern_processGreeter_extern(_ jsObject: Int32, _ greeter: UnsafeMutableRawPointer) -> Int32 {
     fatalError("Only available on WebAssembly")
-    #endif
+}
+#endif
+@inline(never) fileprivate func _extern_processGreeter(_ jsObject: Int32, _ greeter: UnsafeMutableRawPointer) -> Int32 {
+    return _extern_processGreeter_extern(jsObject, greeter)
 }
 
-@_expose(wasm, "bjs_ArraySupportExports_static_roundTripStructArray")
-@_cdecl("bjs_ArraySupportExports_static_roundTripStructArray")
-public func _bjs_ArraySupportExports_static_roundTripStructArray() -> Void {
-    #if arch(wasm32)
-    let ret = ArraySupportExports.roundTripStructArray(_: [DataPoint].bridgeJSStackPop())
-    ret.bridgeJSStackPush()
-    #else
+#if arch(wasm32)
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_createGreeter")
+fileprivate func _extern_createGreeter_extern(_ jsObject: Int32) -> UnsafeMutableRawPointer
+#else
+fileprivate func _extern_createGreeter_extern(_ jsObject: Int32) -> UnsafeMutableRawPointer {
     fatalError("Only available on WebAssembly")
-    #endif
+}
+#endif
+@inline(never) fileprivate func _extern_createGreeter(_ jsObject: Int32) -> UnsafeMutableRawPointer {
+    return _extern_createGreeter_extern(jsObject)
 }
 
-@_expose(wasm, "bjs_ArraySupportExports_static_roundTripSwiftClassArray")
-@_cdecl("bjs_ArraySupportExports_static_roundTripSwiftClassArray")
-public func _bjs_ArraySupportExports_static_roundTripSwiftClassArray() -> Void {
-    #if arch(wasm32)
-    let ret = ArraySupportExports.roundTripSwiftClassArray(_: [Greeter].bridgeJSStackPop())
-    ret.bridgeJSStackPush()
-    #else
+#if arch(wasm32)
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_processOptionalGreeter")
+fileprivate func _extern_processOptionalGreeter_extern(_ jsObject: Int32, _ greeterIsSome: Int32, _ greeterPointer: UnsafeMutableRawPointer) -> Int32
+#else
+fileprivate func _extern_processOptionalGreeter_extern(_ jsObject: Int32, _ greeterIsSome: Int32, _ greeterPointer: UnsafeMutableRawPointer) -> Int32 {
     fatalError("Only available on WebAssembly")
-    #endif
+}
+#endif
+@inline(never) fileprivate func _extern_processOptionalGreeter(_ jsObject: Int32, _ greeterIsSome: Int32, _ greeterPointer: UnsafeMutableRawPointer) -> Int32 {
+    return _extern_processOptionalGreeter_extern(jsObject, greeterIsSome, greeterPointer)
 }
 
-@_expose(wasm, "bjs_ArraySupportExports_static_roundTripNamespacedSwiftClassArray")
-@_cdecl("bjs_ArraySupportExports_static_roundTripNamespacedSwiftClassArray")
-public func _bjs_ArraySupportExports_static_roundTripNamespacedSwiftClassArray() -> Void {
-    #if arch(wasm32)
-    let ret = ArraySupportExports.roundTripNamespacedSwiftClassArray(_: [Utils.Converter].bridgeJSStackPop())
-    ret.bridgeJSStackPush()
-    #else
+#if arch(wasm32)
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_createOptionalGreeter")
+fileprivate func _extern_createOptionalGreeter_extern(_ jsObject: Int32) -> UnsafeMutableRawPointer
+#else
+fileprivate func _extern_createOptionalGreeter_extern(_ jsObject: Int32) -> UnsafeMutableRawPointer {
     fatalError("Only available on WebAssembly")
-    #endif
+}
+#endif
+@inline(never) fileprivate func _extern_createOptionalGreeter(_ jsObject: Int32) -> UnsafeMutableRawPointer {
+    return _extern_createOptionalGreeter_extern(jsObject)
 }
 
-@_expose(wasm, "bjs_ArraySupportExports_static_roundTripProtocolArray")
-@_cdecl("bjs_ArraySupportExports_static_roundTripProtocolArray")
-public func _bjs_ArraySupportExports_static_roundTripProtocolArray() -> Void {
-    #if arch(wasm32)
-    let ret = ArraySupportExports.roundTripProtocolArray(_: [AnyArrayElementProtocol].bridgeJSStackPop())
-    for __bjs_elem_ret in ret {
-        _swift_js_push_i32((__bjs_elem_ret as! _BridgedSwiftProtocolExportable).bridgeJSLowerAsProtocolReturn())
-    }
-    _swift_js_push_i32(Int32(ret.count))
-    #else
+#if arch(wasm32)
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_handleAPIResult")
+fileprivate func _extern_handleAPIResult_extern(_ jsObject: Int32, _ resultIsSome: Int32, _ resultCaseId: Int32) -> Void
+#else
+fileprivate func _extern_handleAPIResult_extern(_ jsObject: Int32, _ resultIsSome: Int32, _ resultCaseId: Int32) -> Void {
     fatalError("Only available on WebAssembly")
-    #endif
+}
+#endif
+@inline(never) fileprivate func _extern_handleAPIResult(_ jsObject: Int32, _ resultIsSome: Int32, _ resultCaseId: Int32) -> Void {
+    return _extern_handleAPIResult_extern(jsObject, resultIsSome, resultCaseId)
 }
 
-@_expose(wasm, "bjs_ArraySupportExports_static_roundTripJSClassArray")
-@_cdecl("bjs_ArraySupportExports_static_roundTripJSClassArray")
-public func _bjs_ArraySupportExports_static_roundTripJSClassArray() -> Void {
-    #if arch(wasm32)
-    let ret = ArraySupportExports.roundTripJSClassArray(_: [ArrayElementObject].bridgeJSStackPop())
-    ret.bridgeJSStackPush()
-    #else
+#if arch(wasm32)
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_getAPIResult")
+fileprivate func _extern_getAPIResult_extern(_ jsObject: Int32) -> Int32
+#else
+fileprivate func _extern_getAPIResult_extern(_ jsObject: Int32) -> Int32 {
     fatalError("Only available on WebAssembly")
-    #endif
+}
+#endif
+@inline(never) fileprivate func _extern_getAPIResult(_ jsObject: Int32) -> Int32 {
+    return _extern_getAPIResult_extern(jsObject)
 }
 
-@_expose(wasm, "bjs_ArraySupportExports_static_roundTripOptionalIntArray")
-@_cdecl("bjs_ArraySupportExports_static_roundTripOptionalIntArray")
-public func _bjs_ArraySupportExports_static_roundTripOptionalIntArray() -> Void {
-    #if arch(wasm32)
-    let ret = ArraySupportExports.roundTripOptionalIntArray(_: [Optional<Int>].bridgeJSStackPop())
-    ret.bridgeJSStackPush()
-    #else
+#if arch(wasm32)
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_count_get")
+fileprivate func bjs_DataProcessor_count_get_extern(_ jsObject: Int32) -> Int32
+#else
+fileprivate func bjs_DataProcessor_count_get_extern(_ jsObject: Int32) -> Int32 {
     fatalError("Only available on WebAssembly")
-    #endif
+}
+#endif
+@inline(never) fileprivate func bjs_DataProcessor_count_get(_ jsObject: Int32) -> Int32 {
+    return bjs_DataProcessor_count_get_extern(jsObject)
 }
 
-@_expose(wasm, "bjs_ArraySupportExports_static_roundTripOptionalStringArray")
-@_cdecl("bjs_ArraySupportExports_static_roundTripOptionalStringArray")
-public func _bjs_ArraySupportExports_static_roundTripOptionalStringArray() -> Void {
-    #if arch(wasm32)
-    let ret = ArraySupportExports.roundTripOptionalStringArray(_: [Optional<String>].bridgeJSStackPop())
-    ret.bridgeJSStackPush()
-    #else
+#if arch(wasm32)
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_count_set")
+fileprivate func bjs_DataProcessor_count_set_extern(_ jsObject: Int32, _ newValue: Int32) -> Void
+#else
+fileprivate func bjs_DataProcessor_count_set_extern(_ jsObject: Int32, _ newValue: Int32) -> Void {
     fatalError("Only available on WebAssembly")
-    #endif
+}
+#endif
+@inline(never) fileprivate func bjs_DataProcessor_count_set(_ jsObject: Int32, _ newValue: Int32) -> Void {
+    return bjs_DataProcessor_count_set_extern(jsObject, newValue)
 }
 
-@_expose(wasm, "bjs_ArraySupportExports_static_roundTripOptionalJSObjectArray")
-@_cdecl("bjs_ArraySupportExports_static_roundTripOptionalJSObjectArray")
-public func _bjs_ArraySupportExports_static_roundTripOptionalJSObjectArray() -> Void {
-    #if arch(wasm32)
-    let ret = ArraySupportExports.roundTripOptionalJSObjectArray(_: [Optional<JSObject>].bridgeJSStackPop())
-    ret.bridgeJSStackPush()
-    #else
+#if arch(wasm32)
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_name_get")
+fileprivate func bjs_DataProcessor_name_get_extern(_ jsObject: Int32) -> Int32
+#else
+fileprivate func bjs_DataProcessor_name_get_extern(_ jsObject: Int32) -> Int32 {
     fatalError("Only available on WebAssembly")
-    #endif
+}
+#endif
+@inline(never) fileprivate func bjs_DataProcessor_name_get(_ jsObject: Int32) -> Int32 {
+    return bjs_DataProcessor_name_get_extern(jsObject)
 }
 
-@_expose(wasm, "bjs_ArraySupportExports_static_roundTripOptionalCaseEnumArray")
-@_cdecl("bjs_ArraySupportExports_static_roundTripOptionalCaseEnumArray")
-public func _bjs_ArraySupportExports_static_roundTripOptionalCaseEnumArray() -> Void {
-    #if arch(wasm32)
-    let ret = ArraySupportExports.roundTripOptionalCaseEnumArray(_: [Optional<Direction>].bridgeJSStackPop())
-    ret.bridgeJSStackPush()
-    #else
+#if arch(wasm32)
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_optionalTag_get")
+fileprivate func bjs_DataProcessor_optionalTag_get_extern(_ jsObject: Int32) -> Void
+#else
+fileprivate func bjs_DataProcessor_optionalTag_get_extern(_ jsObject: Int32) -> Void {
     fatalError("Only available on WebAssembly")
-    #endif
+}
+#endif
+@inline(never) fileprivate func bjs_DataProcessor_optionalTag_get(_ jsObject: Int32) -> Void {
+    return bjs_DataProcessor_optionalTag_get_extern(jsObject)
 }
 
-@_expose(wasm, "bjs_ArraySupportExports_static_roundTripOptionalStringRawValueEnumArray")
-@_cdecl("bjs_ArraySupportExports_static_roundTripOptionalStringRawValueEnumArray")
-public func _bjs_ArraySupportExports_static_roundTripOptionalStringRawValueEnumArray() -> Void {
-    #if arch(wasm32)
-    let ret = ArraySupportExports.roundTripOptionalStringRawValueEnumArray(_: [Optional<Theme>].bridgeJSStackPop())
-    ret.bridgeJSStackPush()
-    #else
+#if arch(wasm32)
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_optionalTag_set")
+fileprivate func bjs_DataProcessor_optionalTag_set_extern(_ jsObject: Int32, _ newValueIsSome: Int32, _ newValueBytes: Int32, _ newValueLength: Int32) -> Void
+#else
+fileprivate func bjs_DataProcessor_optionalTag_set_extern(_ jsObject: Int32, _ newValueIsSome: Int32, _ newValueBytes: Int32, _ newValueLength: Int32) -> Void {
     fatalError("Only available on WebAssembly")
-    #endif
+}
+#endif
+@inline(never) fileprivate func bjs_DataProcessor_optionalTag_set(_ jsObject: Int32, _ newValueIsSome: Int32, _ newValueBytes: Int32, _ newValueLength: Int32) -> Void {
+    return bjs_DataProcessor_optionalTag_set_extern(jsObject, newValueIsSome, newValueBytes, newValueLength)
 }
 
-@_expose(wasm, "bjs_ArraySupportExports_static_roundTripOptionalIntRawValueEnumArray")
-@_cdecl("bjs_ArraySupportExports_static_roundTripOptionalIntRawValueEnumArray")
-public func _bjs_ArraySupportExports_static_roundTripOptionalIntRawValueEnumArray() -> Void {
-    #if arch(wasm32)
-    let ret = ArraySupportExports.roundTripOptionalIntRawValueEnumArray(_: [Optional<HttpStatus>].bridgeJSStackPop())
-    ret.bridgeJSStackPush()
-    #else
+#if arch(wasm32)
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_optionalCount_get")
+fileprivate func bjs_DataProcessor_optionalCount_get_extern(_ jsObject: Int32) -> Void
+#else
+fileprivate func bjs_DataProcessor_optionalCount_get_extern(_ jsObject: Int32) -> Void {
     fatalError("Only available on WebAssembly")
-    #endif
+}
+#endif
+@inline(never) fileprivate func bjs_DataProcessor_optionalCount_get(_ jsObject: Int32) -> Void {
+    return bjs_DataProcessor_optionalCount_get_extern(jsObject)
 }
 
-@_expose(wasm, "bjs_ArraySupportExports_static_roundTripOptionalInt64RawValueEnumArray")
-@_cdecl("bjs_ArraySupportExports_static_roundTripOptionalInt64RawValueEnumArray")
-public func _bjs_ArraySupportExports_static_roundTripOptionalInt64RawValueEnumArray() -> Void {
-    #if arch(wasm32)
-    let ret = ArraySupportExports.roundTripOptionalInt64RawValueEnumArray(_: [Optional<FileSize>].bridgeJSStackPop())
-    ret.bridgeJSStackPush()
-    #else
+#if arch(wasm32)
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_optionalCount_set")
+fileprivate func bjs_DataProcessor_optionalCount_set_extern(_ jsObject: Int32, _ newValueIsSome: Int32, _ newValueValue: Int32) -> Void
+#else
+fileprivate func bjs_DataProcessor_optionalCount_set_extern(_ jsObject: Int32, _ newValueIsSome: Int32, _ newValueValue: Int32) -> Void {
     fatalError("Only available on WebAssembly")
-    #endif
+}
+#endif
+@inline(never) fileprivate func bjs_DataProcessor_optionalCount_set(_ jsObject: Int32, _ newValueIsSome: Int32, _ newValueValue: Int32) -> Void {
+    return bjs_DataProcessor_optionalCount_set_extern(jsObject, newValueIsSome, newValueValue)
 }
 
-@_expose(wasm, "bjs_ArraySupportExports_static_roundTripOptionalUInt64RawValueEnumArray")
-@_cdecl("bjs_ArraySupportExports_static_roundTripOptionalUInt64RawValueEnumArray")
-public func _bjs_ArraySupportExports_static_roundTripOptionalUInt64RawValueEnumArray() -> Void {
-    #if arch(wasm32)
-    let ret = ArraySupportExports.roundTripOptionalUInt64RawValueEnumArray(_: [Optional<SessionId>].bridgeJSStackPop())
-    ret.bridgeJSStackPush()
-    #else
+#if arch(wasm32)
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_direction_get")
+fileprivate func bjs_DataProcessor_direction_get_extern(_ jsObject: Int32) -> Int32
+#else
+fileprivate func bjs_DataProcessor_direction_get_extern(_ jsObject: Int32) -> Int32 {
     fatalError("Only available on WebAssembly")
-    #endif
+}
+#endif
+@inline(never) fileprivate func bjs_DataProcessor_direction_get(_ jsObject: Int32) -> Int32 {
+    return bjs_DataProcessor_direction_get_extern(jsObject)
 }
 
-@_expose(wasm, "bjs_ArraySupportExports_static_roundTripOptionalStructArray")
-@_cdecl("bjs_ArraySupportExports_static_roundTripOptionalStructArray")
-public func _bjs_ArraySupportExports_static_roundTripOptionalStructArray() -> Void {
-    #if arch(wasm32)
-    let ret = ArraySupportExports.roundTripOptionalStructArray(_: [Optional<DataPoint>].bridgeJSStackPop())
-    ret.bridgeJSStackPush()
-    #else
+#if arch(wasm32)
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_direction_set")
+fileprivate func bjs_DataProcessor_direction_set_extern(_ jsObject: Int32, _ newValueIsSome: Int32, _ newValueValue: Int32) -> Void
+#else
+fileprivate func bjs_DataProcessor_direction_set_extern(_ jsObject: Int32, _ newValueIsSome: Int32, _ newValueValue: Int32) -> Void {
     fatalError("Only available on WebAssembly")
-    #endif
 }
-
-@_expose(wasm, "bjs_ArraySupportExports_static_roundTripOptionalSwiftClassArray")
-@_cdecl("bjs_ArraySupportExports_static_roundTripOptionalSwiftClassArray")
-public func _bjs_ArraySupportExports_static_roundTripOptionalSwiftClassArray() -> Void {
+#endif
+@inline(never) fileprivate func bjs_DataProcessor_direction_set(_ jsObject: Int32, _ newValueIsSome: Int32, _ newValueValue: Int32) -> Void {
+    return bjs_DataProcessor_direction_set_extern(jsObject, newValueIsSome, newValueValue)
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_optionalTheme_get")
+fileprivate func bjs_DataProcessor_optionalTheme_get_extern(_ jsObject: Int32) -> Void
+#else
+fileprivate func bjs_DataProcessor_optionalTheme_get_extern(_ jsObject: Int32) -> Void {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func bjs_DataProcessor_optionalTheme_get(_ jsObject: Int32) -> Void {
+    return bjs_DataProcessor_optionalTheme_get_extern(jsObject)
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_optionalTheme_set")
+fileprivate func bjs_DataProcessor_optionalTheme_set_extern(_ jsObject: Int32, _ newValueIsSome: Int32, _ newValueBytes: Int32, _ newValueLength: Int32) -> Void
+#else
+fileprivate func bjs_DataProcessor_optionalTheme_set_extern(_ jsObject: Int32, _ newValueIsSome: Int32, _ newValueBytes: Int32, _ newValueLength: Int32) -> Void {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func bjs_DataProcessor_optionalTheme_set(_ jsObject: Int32, _ newValueIsSome: Int32, _ newValueBytes: Int32, _ newValueLength: Int32) -> Void {
+    return bjs_DataProcessor_optionalTheme_set_extern(jsObject, newValueIsSome, newValueBytes, newValueLength)
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_httpStatus_get")
+fileprivate func bjs_DataProcessor_httpStatus_get_extern(_ jsObject: Int32) -> Void
+#else
+fileprivate func bjs_DataProcessor_httpStatus_get_extern(_ jsObject: Int32) -> Void {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func bjs_DataProcessor_httpStatus_get(_ jsObject: Int32) -> Void {
+    return bjs_DataProcessor_httpStatus_get_extern(jsObject)
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_httpStatus_set")
+fileprivate func bjs_DataProcessor_httpStatus_set_extern(_ jsObject: Int32, _ newValueIsSome: Int32, _ newValueValue: Int32) -> Void
+#else
+fileprivate func bjs_DataProcessor_httpStatus_set_extern(_ jsObject: Int32, _ newValueIsSome: Int32, _ newValueValue: Int32) -> Void {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func bjs_DataProcessor_httpStatus_set(_ jsObject: Int32, _ newValueIsSome: Int32, _ newValueValue: Int32) -> Void {
+    return bjs_DataProcessor_httpStatus_set_extern(jsObject, newValueIsSome, newValueValue)
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_apiResult_get")
+fileprivate func bjs_DataProcessor_apiResult_get_extern(_ jsObject: Int32) -> Int32
+#else
+fileprivate func bjs_DataProcessor_apiResult_get_extern(_ jsObject: Int32) -> Int32 {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func bjs_DataProcessor_apiResult_get(_ jsObject: Int32) -> Int32 {
+    return bjs_DataProcessor_apiResult_get_extern(jsObject)
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_apiResult_set")
+fileprivate func bjs_DataProcessor_apiResult_set_extern(_ jsObject: Int32, _ newValueIsSome: Int32, _ newValueCaseId: Int32) -> Void
+#else
+fileprivate func bjs_DataProcessor_apiResult_set_extern(_ jsObject: Int32, _ newValueIsSome: Int32, _ newValueCaseId: Int32) -> Void {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func bjs_DataProcessor_apiResult_set(_ jsObject: Int32, _ newValueIsSome: Int32, _ newValueCaseId: Int32) -> Void {
+    return bjs_DataProcessor_apiResult_set_extern(jsObject, newValueIsSome, newValueCaseId)
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_helper_get")
+fileprivate func bjs_DataProcessor_helper_get_extern(_ jsObject: Int32) -> UnsafeMutableRawPointer
+#else
+fileprivate func bjs_DataProcessor_helper_get_extern(_ jsObject: Int32) -> UnsafeMutableRawPointer {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func bjs_DataProcessor_helper_get(_ jsObject: Int32) -> UnsafeMutableRawPointer {
+    return bjs_DataProcessor_helper_get_extern(jsObject)
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_helper_set")
+fileprivate func bjs_DataProcessor_helper_set_extern(_ jsObject: Int32, _ newValue: UnsafeMutableRawPointer) -> Void
+#else
+fileprivate func bjs_DataProcessor_helper_set_extern(_ jsObject: Int32, _ newValue: UnsafeMutableRawPointer) -> Void {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func bjs_DataProcessor_helper_set(_ jsObject: Int32, _ newValue: UnsafeMutableRawPointer) -> Void {
+    return bjs_DataProcessor_helper_set_extern(jsObject, newValue)
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_optionalHelper_get")
+fileprivate func bjs_DataProcessor_optionalHelper_get_extern(_ jsObject: Int32) -> UnsafeMutableRawPointer
+#else
+fileprivate func bjs_DataProcessor_optionalHelper_get_extern(_ jsObject: Int32) -> UnsafeMutableRawPointer {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func bjs_DataProcessor_optionalHelper_get(_ jsObject: Int32) -> UnsafeMutableRawPointer {
+    return bjs_DataProcessor_optionalHelper_get_extern(jsObject)
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_optionalHelper_set")
+fileprivate func bjs_DataProcessor_optionalHelper_set_extern(_ jsObject: Int32, _ newValueIsSome: Int32, _ newValuePointer: UnsafeMutableRawPointer) -> Void
+#else
+fileprivate func bjs_DataProcessor_optionalHelper_set_extern(_ jsObject: Int32, _ newValueIsSome: Int32, _ newValuePointer: UnsafeMutableRawPointer) -> Void {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func bjs_DataProcessor_optionalHelper_set(_ jsObject: Int32, _ newValueIsSome: Int32, _ newValuePointer: UnsafeMutableRawPointer) -> Void {
+    return bjs_DataProcessor_optionalHelper_set_extern(jsObject, newValueIsSome, newValuePointer)
+}
+
+extension Severity: _BridgedSwiftCaseEnum {
+    @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameter() -> Int32 {
+        return bridgeJSRawValue
+    }
+    @_spi(BridgeJS) @_transparent public static func bridgeJSLiftReturn(_ value: Int32) -> Severity {
+        return bridgeJSLiftParameter(value)
+    }
+    @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter(_ value: Int32) -> Severity {
+        return Severity(bridgeJSRawValue: value)!
+    }
+    @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() -> Int32 {
+        return bridgeJSLowerParameter()
+    }
+
+    @_spi(BridgeJS) @usableFromInline init?(bridgeJSRawValue: Int32) {
+        switch bridgeJSRawValue {
+        case 0:
+            self = .notice
+        case 1:
+            self = .warning
+        case 2:
+            self = .error
+        default:
+            return nil
+        }
+    }
+
+    @_spi(BridgeJS) @usableFromInline var bridgeJSRawValue: Int32 {
+        switch self {
+        case .notice:
+            return 0
+        case .warning:
+            return 1
+        case .error:
+            return 2
+        }
+    }
+}
+
+extension Shape: _BridgedSwiftAssociatedValueEnum {
+    @_spi(BridgeJS) @_transparent public static func bridgeJSStackPopPayload(_ caseId: Int32) -> Shape {
+        switch caseId {
+        case 0:
+            return .polygon(Polygon.bridgeJSStackPop())
+        case 1:
+            return .empty
+        default:
+            fatalError("Unknown Shape case ID: \(caseId)")
+        }
+    }
+
+    @_spi(BridgeJS) @_transparent public consuming func bridgeJSStackPushPayload() -> Int32 {
+        switch self {
+        case .polygon(let param0):
+            param0.bridgeJSStackPush()
+            return Int32(0)
+        case .empty:
+            return Int32(1)
+        }
+    }
+}
+
+extension InnerTag: _BridgedSwiftAssociatedValueEnum {
+    @_spi(BridgeJS) @_transparent public static func bridgeJSStackPopPayload(_ caseId: Int32) -> InnerTag {
+        switch caseId {
+        case 0:
+            return .payload(Int.bridgeJSStackPop())
+        case 1:
+            return .empty
+        default:
+            fatalError("Unknown InnerTag case ID: \(caseId)")
+        }
+    }
+
+    @_spi(BridgeJS) @_transparent public consuming func bridgeJSStackPushPayload() -> Int32 {
+        switch self {
+        case .payload(let param0):
+            param0.bridgeJSStackPush()
+            return Int32(0)
+        case .empty:
+            return Int32(1)
+        }
+    }
+}
+
+@_expose(wasm, "bjs_ArraySupportExports_static_roundTripIntArray")
+@_cdecl("bjs_ArraySupportExports_static_roundTripIntArray")
+public func _bjs_ArraySupportExports_static_roundTripIntArray() -> Void {
     #if arch(wasm32)
-    let ret = ArraySupportExports.roundTripOptionalSwiftClassArray(_: [Optional<Greeter>].bridgeJSStackPop())
+    let ret = ArraySupportExports.roundTripIntArray(_: [Int].bridgeJSStackPop())
     ret.bridgeJSStackPush()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_ArraySupportExports_static_roundTripOptionalJSClassArray")
-@_cdecl("bjs_ArraySupportExports_static_roundTripOptionalJSClassArray")
-public func _bjs_ArraySupportExports_static_roundTripOptionalJSClassArray() -> Void {
+@_expose(wasm, "bjs_ArraySupportExports_static_roundTripStringArray")
+@_cdecl("bjs_ArraySupportExports_static_roundTripStringArray")
+public func _bjs_ArraySupportExports_static_roundTripStringArray() -> Void {
     #if arch(wasm32)
-    let ret = ArraySupportExports.roundTripOptionalJSClassArray(_: [Optional<ArrayElementObject>].bridgeJSStackPop())
+    let ret = ArraySupportExports.roundTripStringArray(_: [String].bridgeJSStackPop())
     ret.bridgeJSStackPush()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_ArraySupportExports_static_roundTripNestedIntArray")
-@_cdecl("bjs_ArraySupportExports_static_roundTripNestedIntArray")
-public func _bjs_ArraySupportExports_static_roundTripNestedIntArray() -> Void {
+@_expose(wasm, "bjs_ArraySupportExports_static_roundTripDoubleArray")
+@_cdecl("bjs_ArraySupportExports_static_roundTripDoubleArray")
+public func _bjs_ArraySupportExports_static_roundTripDoubleArray() -> Void {
     #if arch(wasm32)
-    let ret = ArraySupportExports.roundTripNestedIntArray(_: [[Int]].bridgeJSStackPop())
+    let ret = ArraySupportExports.roundTripDoubleArray(_: [Double].bridgeJSStackPop())
     ret.bridgeJSStackPush()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_ArraySupportExports_static_roundTripNestedStringArray")
-@_cdecl("bjs_ArraySupportExports_static_roundTripNestedStringArray")
-public func _bjs_ArraySupportExports_static_roundTripNestedStringArray() -> Void {
+@_expose(wasm, "bjs_ArraySupportExports_static_roundTripBoolArray")
+@_cdecl("bjs_ArraySupportExports_static_roundTripBoolArray")
+public func _bjs_ArraySupportExports_static_roundTripBoolArray() -> Void {
     #if arch(wasm32)
-    let ret = ArraySupportExports.roundTripNestedStringArray(_: [[String]].bridgeJSStackPop())
+    let ret = ArraySupportExports.roundTripBoolArray(_: [Bool].bridgeJSStackPop())
     ret.bridgeJSStackPush()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_ArraySupportExports_static_roundTripNestedDoubleArray")
-@_cdecl("bjs_ArraySupportExports_static_roundTripNestedDoubleArray")
-public func _bjs_ArraySupportExports_static_roundTripNestedDoubleArray() -> Void {
+@_expose(wasm, "bjs_ArraySupportExports_static_roundTripUnsafeRawPointerArray")
+@_cdecl("bjs_ArraySupportExports_static_roundTripUnsafeRawPointerArray")
+public func _bjs_ArraySupportExports_static_roundTripUnsafeRawPointerArray() -> Void {
     #if arch(wasm32)
-    let ret = ArraySupportExports.roundTripNestedDoubleArray(_: [[Double]].bridgeJSStackPop())
+    let ret = ArraySupportExports.roundTripUnsafeRawPointerArray(_: [UnsafeRawPointer].bridgeJSStackPop())
     ret.bridgeJSStackPush()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_ArraySupportExports_static_roundTripNestedBoolArray")
-@_cdecl("bjs_ArraySupportExports_static_roundTripNestedBoolArray")
-public func _bjs_ArraySupportExports_static_roundTripNestedBoolArray() -> Void {
+@_expose(wasm, "bjs_ArraySupportExports_static_roundTripUnsafeMutableRawPointerArray")
+@_cdecl("bjs_ArraySupportExports_static_roundTripUnsafeMutableRawPointerArray")
+public func _bjs_ArraySupportExports_static_roundTripUnsafeMutableRawPointerArray() -> Void {
     #if arch(wasm32)
-    let ret = ArraySupportExports.roundTripNestedBoolArray(_: [[Bool]].bridgeJSStackPop())
+    let ret = ArraySupportExports.roundTripUnsafeMutableRawPointerArray(_: [UnsafeMutableRawPointer].bridgeJSStackPop())
     ret.bridgeJSStackPush()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_ArraySupportExports_static_roundTripNestedStructArray")
-@_cdecl("bjs_ArraySupportExports_static_roundTripNestedStructArray")
-public func _bjs_ArraySupportExports_static_roundTripNestedStructArray() -> Void {
+@_expose(wasm, "bjs_ArraySupportExports_static_roundTripOpaquePointerArray")
+@_cdecl("bjs_ArraySupportExports_static_roundTripOpaquePointerArray")
+public func _bjs_ArraySupportExports_static_roundTripOpaquePointerArray() -> Void {
     #if arch(wasm32)
-    let ret = ArraySupportExports.roundTripNestedStructArray(_: [[DataPoint]].bridgeJSStackPop())
+    let ret = ArraySupportExports.roundTripOpaquePointerArray(_: [OpaquePointer].bridgeJSStackPop())
     ret.bridgeJSStackPush()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_ArraySupportExports_static_roundTripNestedCaseEnumArray")
-@_cdecl("bjs_ArraySupportExports_static_roundTripNestedCaseEnumArray")
-public func _bjs_ArraySupportExports_static_roundTripNestedCaseEnumArray() -> Void {
+@_expose(wasm, "bjs_ArraySupportExports_static_roundTripUnsafePointerArray")
+@_cdecl("bjs_ArraySupportExports_static_roundTripUnsafePointerArray")
+public func _bjs_ArraySupportExports_static_roundTripUnsafePointerArray() -> Void {
     #if arch(wasm32)
-    let ret = ArraySupportExports.roundTripNestedCaseEnumArray(_: [[Direction]].bridgeJSStackPop())
+    let ret = ArraySupportExports.roundTripUnsafePointerArray(_: [UnsafePointer<UInt8>].bridgeJSStackPop())
     ret.bridgeJSStackPush()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_ArraySupportExports_static_roundTripNestedSwiftClassArray")
-@_cdecl("bjs_ArraySupportExports_static_roundTripNestedSwiftClassArray")
-public func _bjs_ArraySupportExports_static_roundTripNestedSwiftClassArray() -> Void {
+@_expose(wasm, "bjs_ArraySupportExports_static_roundTripUnsafeMutablePointerArray")
+@_cdecl("bjs_ArraySupportExports_static_roundTripUnsafeMutablePointerArray")
+public func _bjs_ArraySupportExports_static_roundTripUnsafeMutablePointerArray() -> Void {
     #if arch(wasm32)
-    let ret = ArraySupportExports.roundTripNestedSwiftClassArray(_: [[Greeter]].bridgeJSStackPop())
+    let ret = ArraySupportExports.roundTripUnsafeMutablePointerArray(_: [UnsafeMutablePointer<UInt8>].bridgeJSStackPop())
     ret.bridgeJSStackPush()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_ArraySupportExports_static_multiArrayFirst")
-@_cdecl("bjs_ArraySupportExports_static_multiArrayFirst")
-public func _bjs_ArraySupportExports_static_multiArrayFirst() -> Void {
+@_expose(wasm, "bjs_ArraySupportExports_static_roundTripJSValueArray")
+@_cdecl("bjs_ArraySupportExports_static_roundTripJSValueArray")
+public func _bjs_ArraySupportExports_static_roundTripJSValueArray() -> Void {
     #if arch(wasm32)
-    let _tmp_b = [String].bridgeJSStackPop()
-    let _tmp_a = [Int].bridgeJSStackPop()
-    let ret = ArraySupportExports.multiArrayFirst(_: _tmp_a, _: _tmp_b)
+    let ret = ArraySupportExports.roundTripJSValueArray(_: [JSValue].bridgeJSStackPop())
     ret.bridgeJSStackPush()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_ArraySupportExports_static_multiArraySecond")
-@_cdecl("bjs_ArraySupportExports_static_multiArraySecond")
-public func _bjs_ArraySupportExports_static_multiArraySecond() -> Void {
+@_expose(wasm, "bjs_ArraySupportExports_static_roundTripJSObjectArray")
+@_cdecl("bjs_ArraySupportExports_static_roundTripJSObjectArray")
+public func _bjs_ArraySupportExports_static_roundTripJSObjectArray() -> Void {
     #if arch(wasm32)
-    let _tmp_b = [String].bridgeJSStackPop()
-    let _tmp_a = [Int].bridgeJSStackPop()
-    let ret = ArraySupportExports.multiArraySecond(_: _tmp_a, _: _tmp_b)
+    let ret = ArraySupportExports.roundTripJSObjectArray(_: [JSObject].bridgeJSStackPop())
     ret.bridgeJSStackPush()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_ArraySupportExports_static_multiOptionalArrayFirst")
-@_cdecl("bjs_ArraySupportExports_static_multiOptionalArrayFirst")
-public func _bjs_ArraySupportExports_static_multiOptionalArrayFirst() -> Void {
+@_expose(wasm, "bjs_ArraySupportExports_static_roundTripCaseEnumArray")
+@_cdecl("bjs_ArraySupportExports_static_roundTripCaseEnumArray")
+public func _bjs_ArraySupportExports_static_roundTripCaseEnumArray() -> Void {
     #if arch(wasm32)
-    let _tmp_b = Optional<[String]>.bridgeJSLiftParameter()
-    let _tmp_a = Optional<[Int]>.bridgeJSLiftParameter()
-    let ret = ArraySupportExports.multiOptionalArrayFirst(_: _tmp_a, _: _tmp_b)
+    let ret = ArraySupportExports.roundTripCaseEnumArray(_: [Direction].bridgeJSStackPop())
     ret.bridgeJSStackPush()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_ArraySupportExports_static_multiOptionalArraySecond")
-@_cdecl("bjs_ArraySupportExports_static_multiOptionalArraySecond")
-public func _bjs_ArraySupportExports_static_multiOptionalArraySecond() -> Void {
+@_expose(wasm, "bjs_ArraySupportExports_static_roundTripStringRawValueEnumArray")
+@_cdecl("bjs_ArraySupportExports_static_roundTripStringRawValueEnumArray")
+public func _bjs_ArraySupportExports_static_roundTripStringRawValueEnumArray() -> Void {
     #if arch(wasm32)
-    let _tmp_b = Optional<[String]>.bridgeJSLiftParameter()
-    let _tmp_a = Optional<[Int]>.bridgeJSLiftParameter()
-    let ret = ArraySupportExports.multiOptionalArraySecond(_: _tmp_a, _: _tmp_b)
+    let ret = ArraySupportExports.roundTripStringRawValueEnumArray(_: [Theme].bridgeJSStackPop())
     ret.bridgeJSStackPush()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_DefaultArgumentExports_static_testStringDefault")
-@_cdecl("bjs_DefaultArgumentExports_static_testStringDefault")
-public func _bjs_DefaultArgumentExports_static_testStringDefault(_ messageBytes: Int32, _ messageLength: Int32) -> Void {
+@_expose(wasm, "bjs_ArraySupportExports_static_roundTripIntRawValueEnumArray")
+@_cdecl("bjs_ArraySupportExports_static_roundTripIntRawValueEnumArray")
+public func _bjs_ArraySupportExports_static_roundTripIntRawValueEnumArray() -> Void {
     #if arch(wasm32)
-    let ret = DefaultArgumentExports.testStringDefault(message: String.bridgeJSLiftParameter(messageBytes, messageLength))
-    return ret.bridgeJSLowerReturn()
+    let ret = ArraySupportExports.roundTripIntRawValueEnumArray(_: [HttpStatus].bridgeJSStackPop())
+    ret.bridgeJSStackPush()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_DefaultArgumentExports_static_testIntDefault")
-@_cdecl("bjs_DefaultArgumentExports_static_testIntDefault")
-public func _bjs_DefaultArgumentExports_static_testIntDefault(_ count: Int32) -> Int32 {
+@_expose(wasm, "bjs_ArraySupportExports_static_roundTripInt64RawValueEnumArray")
+@_cdecl("bjs_ArraySupportExports_static_roundTripInt64RawValueEnumArray")
+public func _bjs_ArraySupportExports_static_roundTripInt64RawValueEnumArray() -> Void {
     #if arch(wasm32)
-    let ret = DefaultArgumentExports.testIntDefault(count: Int.bridgeJSLiftParameter(count))
-    return ret.bridgeJSLowerReturn()
+    let ret = ArraySupportExports.roundTripInt64RawValueEnumArray(_: [FileSize].bridgeJSStackPop())
+    ret.bridgeJSStackPush()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_DefaultArgumentExports_static_testBoolDefault")
-@_cdecl("bjs_DefaultArgumentExports_static_testBoolDefault")
-public func _bjs_DefaultArgumentExports_static_testBoolDefault(_ flag: Int32) -> Int32 {
+@_expose(wasm, "bjs_ArraySupportExports_static_roundTripUInt64RawValueEnumArray")
+@_cdecl("bjs_ArraySupportExports_static_roundTripUInt64RawValueEnumArray")
+public func _bjs_ArraySupportExports_static_roundTripUInt64RawValueEnumArray() -> Void {
     #if arch(wasm32)
-    let ret = DefaultArgumentExports.testBoolDefault(flag: Bool.bridgeJSLiftParameter(flag))
-    return ret.bridgeJSLowerReturn()
+    let ret = ArraySupportExports.roundTripUInt64RawValueEnumArray(_: [SessionId].bridgeJSStackPop())
+    ret.bridgeJSStackPush()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_DefaultArgumentExports_static_testOptionalDefault")
-@_cdecl("bjs_DefaultArgumentExports_static_testOptionalDefault")
-public func _bjs_DefaultArgumentExports_static_testOptionalDefault(_ nameIsSome: Int32, _ nameBytes: Int32, _ nameLength: Int32) -> Void {
+@_expose(wasm, "bjs_ArraySupportExports_static_roundTripStructArray")
+@_cdecl("bjs_ArraySupportExports_static_roundTripStructArray")
+public func _bjs_ArraySupportExports_static_roundTripStructArray() -> Void {
     #if arch(wasm32)
-    let ret = DefaultArgumentExports.testOptionalDefault(name: Optional<String>.bridgeJSLiftParameter(nameIsSome, nameBytes, nameLength))
-    return ret.bridgeJSLowerReturn()
+    let ret = ArraySupportExports.roundTripStructArray(_: [DataPoint].bridgeJSStackPop())
+    ret.bridgeJSStackPush()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_DefaultArgumentExports_static_testMultipleDefaults")
-@_cdecl("bjs_DefaultArgumentExports_static_testMultipleDefaults")
-public func _bjs_DefaultArgumentExports_static_testMultipleDefaults(_ titleBytes: Int32, _ titleLength: Int32, _ count: Int32, _ enabled: Int32) -> Void {
+@_expose(wasm, "bjs_ArraySupportExports_static_roundTripSwiftClassArray")
+@_cdecl("bjs_ArraySupportExports_static_roundTripSwiftClassArray")
+public func _bjs_ArraySupportExports_static_roundTripSwiftClassArray() -> Void {
     #if arch(wasm32)
-    let ret = DefaultArgumentExports.testMultipleDefaults(title: String.bridgeJSLiftParameter(titleBytes, titleLength), count: Int.bridgeJSLiftParameter(count), enabled: Bool.bridgeJSLiftParameter(enabled))
-    return ret.bridgeJSLowerReturn()
+    let ret = ArraySupportExports.roundTripSwiftClassArray(_: [Greeter].bridgeJSStackPop())
+    ret.bridgeJSStackPush()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_DefaultArgumentExports_static_testSimpleEnumDefault")
-@_cdecl("bjs_DefaultArgumentExports_static_testSimpleEnumDefault")
-public func _bjs_DefaultArgumentExports_static_testSimpleEnumDefault(_ status: Int32) -> Int32 {
+@_expose(wasm, "bjs_ArraySupportExports_static_roundTripNamespacedSwiftClassArray")
+@_cdecl("bjs_ArraySupportExports_static_roundTripNamespacedSwiftClassArray")
+public func _bjs_ArraySupportExports_static_roundTripNamespacedSwiftClassArray() -> Void {
     #if arch(wasm32)
-    let ret = DefaultArgumentExports.testSimpleEnumDefault(status: Status.bridgeJSLiftParameter(status))
-    return ret.bridgeJSLowerReturn()
+    let ret = ArraySupportExports.roundTripNamespacedSwiftClassArray(_: [Utils.Converter].bridgeJSStackPop())
+    ret.bridgeJSStackPush()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_DefaultArgumentExports_static_testDirectionDefault")
-@_cdecl("bjs_DefaultArgumentExports_static_testDirectionDefault")
-public func _bjs_DefaultArgumentExports_static_testDirectionDefault(_ direction: Int32) -> Int32 {
+@_expose(wasm, "bjs_ArraySupportExports_static_roundTripProtocolArray")
+@_cdecl("bjs_ArraySupportExports_static_roundTripProtocolArray")
+public func _bjs_ArraySupportExports_static_roundTripProtocolArray() -> Void {
     #if arch(wasm32)
-    let ret = DefaultArgumentExports.testDirectionDefault(direction: Direction.bridgeJSLiftParameter(direction))
-    return ret.bridgeJSLowerReturn()
+    let ret = ArraySupportExports.roundTripProtocolArray(_: [AnyArrayElementProtocol].bridgeJSStackPop())
+    for __bjs_elem_ret in ret {
+        _swift_js_push_i32((__bjs_elem_ret as! _BridgedSwiftProtocolExportable).bridgeJSLowerAsProtocolReturn())
+    }
+    _swift_js_push_i32(Int32(ret.count))
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_DefaultArgumentExports_static_testRawStringEnumDefault")
-@_cdecl("bjs_DefaultArgumentExports_static_testRawStringEnumDefault")
-public func _bjs_DefaultArgumentExports_static_testRawStringEnumDefault(_ themeBytes: Int32, _ themeLength: Int32) -> Void {
+@_expose(wasm, "bjs_ArraySupportExports_static_roundTripJSClassArray")
+@_cdecl("bjs_ArraySupportExports_static_roundTripJSClassArray")
+public func _bjs_ArraySupportExports_static_roundTripJSClassArray() -> Void {
     #if arch(wasm32)
-    let ret = DefaultArgumentExports.testRawStringEnumDefault(theme: Theme.bridgeJSLiftParameter(themeBytes, themeLength))
-    return ret.bridgeJSLowerReturn()
+    let ret = ArraySupportExports.roundTripJSClassArray(_: [ArrayElementObject].bridgeJSStackPop())
+    ret.bridgeJSStackPush()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_DefaultArgumentExports_static_testComplexInit")
-@_cdecl("bjs_DefaultArgumentExports_static_testComplexInit")
-public func _bjs_DefaultArgumentExports_static_testComplexInit(_ greeter: UnsafeMutableRawPointer) -> Void {
+@_expose(wasm, "bjs_ArraySupportExports_static_roundTripOptionalIntArray")
+@_cdecl("bjs_ArraySupportExports_static_roundTripOptionalIntArray")
+public func _bjs_ArraySupportExports_static_roundTripOptionalIntArray() -> Void {
     #if arch(wasm32)
-    let ret = DefaultArgumentExports.testComplexInit(greeter: Greeter.bridgeJSLiftParameter(greeter))
-    return ret.bridgeJSLowerReturn()
+    let ret = ArraySupportExports.roundTripOptionalIntArray(_: [Optional<Int>].bridgeJSStackPop())
+    ret.bridgeJSStackPush()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_DefaultArgumentExports_static_testEmptyInit")
-@_cdecl("bjs_DefaultArgumentExports_static_testEmptyInit")
-public func _bjs_DefaultArgumentExports_static_testEmptyInit(_ object: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer {
+@_expose(wasm, "bjs_ArraySupportExports_static_roundTripOptionalStringArray")
+@_cdecl("bjs_ArraySupportExports_static_roundTripOptionalStringArray")
+public func _bjs_ArraySupportExports_static_roundTripOptionalStringArray() -> Void {
     #if arch(wasm32)
-    let ret = DefaultArgumentExports.testEmptyInit(_: StaticPropertyHolder.bridgeJSLiftParameter(object))
-    return ret.bridgeJSLowerReturn()
+    let ret = ArraySupportExports.roundTripOptionalStringArray(_: [Optional<String>].bridgeJSStackPop())
+    ret.bridgeJSStackPush()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_DefaultArgumentExports_static_createConstructorDefaults")
-@_cdecl("bjs_DefaultArgumentExports_static_createConstructorDefaults")
-public func _bjs_DefaultArgumentExports_static_createConstructorDefaults(_ nameBytes: Int32, _ nameLength: Int32, _ count: Int32, _ enabled: Int32, _ status: Int32, _ tagIsSome: Int32, _ tagBytes: Int32, _ tagLength: Int32) -> UnsafeMutableRawPointer {
+@_expose(wasm, "bjs_ArraySupportExports_static_roundTripOptionalJSObjectArray")
+@_cdecl("bjs_ArraySupportExports_static_roundTripOptionalJSObjectArray")
+public func _bjs_ArraySupportExports_static_roundTripOptionalJSObjectArray() -> Void {
     #if arch(wasm32)
-    let ret = DefaultArgumentExports.createConstructorDefaults(name: String.bridgeJSLiftParameter(nameBytes, nameLength), count: Int.bridgeJSLiftParameter(count), enabled: Bool.bridgeJSLiftParameter(enabled), status: Status.bridgeJSLiftParameter(status), tag: Optional<String>.bridgeJSLiftParameter(tagIsSome, tagBytes, tagLength))
-    return ret.bridgeJSLowerReturn()
+    let ret = ArraySupportExports.roundTripOptionalJSObjectArray(_: [Optional<JSObject>].bridgeJSStackPop())
+    ret.bridgeJSStackPush()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_DefaultArgumentExports_static_describeConstructorDefaults")
-@_cdecl("bjs_DefaultArgumentExports_static_describeConstructorDefaults")
-public func _bjs_DefaultArgumentExports_static_describeConstructorDefaults(_ value: UnsafeMutableRawPointer) -> Void {
+@_expose(wasm, "bjs_ArraySupportExports_static_roundTripOptionalCaseEnumArray")
+@_cdecl("bjs_ArraySupportExports_static_roundTripOptionalCaseEnumArray")
+public func _bjs_ArraySupportExports_static_roundTripOptionalCaseEnumArray() -> Void {
     #if arch(wasm32)
-    let ret = DefaultArgumentExports.describeConstructorDefaults(_: DefaultArgumentConstructorDefaults.bridgeJSLiftParameter(value))
-    return ret.bridgeJSLowerReturn()
+    let ret = ArraySupportExports.roundTripOptionalCaseEnumArray(_: [Optional<Direction>].bridgeJSStackPop())
+    ret.bridgeJSStackPush()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_DefaultArgumentExports_static_arrayWithDefault")
-@_cdecl("bjs_DefaultArgumentExports_static_arrayWithDefault")
-public func _bjs_DefaultArgumentExports_static_arrayWithDefault() -> Int32 {
+@_expose(wasm, "bjs_ArraySupportExports_static_roundTripOptionalStringRawValueEnumArray")
+@_cdecl("bjs_ArraySupportExports_static_roundTripOptionalStringRawValueEnumArray")
+public func _bjs_ArraySupportExports_static_roundTripOptionalStringRawValueEnumArray() -> Void {
     #if arch(wasm32)
-    let ret = DefaultArgumentExports.arrayWithDefault(_: [Int].bridgeJSStackPop())
-    return ret.bridgeJSLowerReturn()
+    let ret = ArraySupportExports.roundTripOptionalStringRawValueEnumArray(_: [Optional<Theme>].bridgeJSStackPop())
+    ret.bridgeJSStackPush()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_DefaultArgumentExports_static_arrayWithOptionalDefault")
-@_cdecl("bjs_DefaultArgumentExports_static_arrayWithOptionalDefault")
-public func _bjs_DefaultArgumentExports_static_arrayWithOptionalDefault() -> Int32 {
+@_expose(wasm, "bjs_ArraySupportExports_static_roundTripOptionalIntRawValueEnumArray")
+@_cdecl("bjs_ArraySupportExports_static_roundTripOptionalIntRawValueEnumArray")
+public func _bjs_ArraySupportExports_static_roundTripOptionalIntRawValueEnumArray() -> Void {
     #if arch(wasm32)
-    let ret = DefaultArgumentExports.arrayWithOptionalDefault(_: Optional<[Int]>.bridgeJSLiftParameter())
-    return ret.bridgeJSLowerReturn()
+    let ret = ArraySupportExports.roundTripOptionalIntRawValueEnumArray(_: [Optional<HttpStatus>].bridgeJSStackPop())
+    ret.bridgeJSStackPush()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_DefaultArgumentExports_static_arrayMixedDefaults")
-@_cdecl("bjs_DefaultArgumentExports_static_arrayMixedDefaults")
-public func _bjs_DefaultArgumentExports_static_arrayMixedDefaults(_ prefixBytes: Int32, _ prefixLength: Int32, _ suffixBytes: Int32, _ suffixLength: Int32) -> Void {
+@_expose(wasm, "bjs_ArraySupportExports_static_roundTripOptionalInt64RawValueEnumArray")
+@_cdecl("bjs_ArraySupportExports_static_roundTripOptionalInt64RawValueEnumArray")
+public func _bjs_ArraySupportExports_static_roundTripOptionalInt64RawValueEnumArray() -> Void {
     #if arch(wasm32)
-    let ret = DefaultArgumentExports.arrayMixedDefaults(prefix: String.bridgeJSLiftParameter(prefixBytes, prefixLength), values: [Int].bridgeJSStackPop(), suffix: String.bridgeJSLiftParameter(suffixBytes, suffixLength))
-    return ret.bridgeJSLowerReturn()
+    let ret = ArraySupportExports.roundTripOptionalInt64RawValueEnumArray(_: [Optional<FileSize>].bridgeJSStackPop())
+    ret.bridgeJSStackPush()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-extension Direction: _BridgedSwiftCaseEnum {
-    @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameter() -> Int32 {
-        return bridgeJSRawValue
-    }
-    @_spi(BridgeJS) @_transparent public static func bridgeJSLiftReturn(_ value: Int32) -> Direction {
-        return bridgeJSLiftParameter(value)
-    }
-    @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter(_ value: Int32) -> Direction {
-        return Direction(bridgeJSRawValue: value)!
-    }
-    @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() -> Int32 {
-        return bridgeJSLowerParameter()
-    }
-
-    @_spi(BridgeJS) @usableFromInline init?(bridgeJSRawValue: Int32) {
-        switch bridgeJSRawValue {
-        case 0:
-            self = .north
-        case 1:
-            self = .south
-        case 2:
-            self = .east
-        case 3:
-            self = .west
-        default:
-            return nil
-        }
-    }
-
-    @_spi(BridgeJS) @usableFromInline var bridgeJSRawValue: Int32 {
-        switch self {
-        case .north:
-            return 0
-        case .south:
-            return 1
-        case .east:
-            return 2
-        case .west:
-            return 3
-        }
-    }
+@_expose(wasm, "bjs_ArraySupportExports_static_roundTripOptionalUInt64RawValueEnumArray")
+@_cdecl("bjs_ArraySupportExports_static_roundTripOptionalUInt64RawValueEnumArray")
+public func _bjs_ArraySupportExports_static_roundTripOptionalUInt64RawValueEnumArray() -> Void {
+    #if arch(wasm32)
+    let ret = ArraySupportExports.roundTripOptionalUInt64RawValueEnumArray(_: [Optional<SessionId>].bridgeJSStackPop())
+    ret.bridgeJSStackPush()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
 }
 
-extension Status: _BridgedSwiftCaseEnum {
-    @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameter() -> Int32 {
-        return bridgeJSRawValue
-    }
-    @_spi(BridgeJS) @_transparent public static func bridgeJSLiftReturn(_ value: Int32) -> Status {
-        return bridgeJSLiftParameter(value)
-    }
-    @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter(_ value: Int32) -> Status {
-        return Status(bridgeJSRawValue: value)!
-    }
-    @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() -> Int32 {
-        return bridgeJSLowerParameter()
-    }
+@_expose(wasm, "bjs_ArraySupportExports_static_roundTripOptionalStructArray")
+@_cdecl("bjs_ArraySupportExports_static_roundTripOptionalStructArray")
+public func _bjs_ArraySupportExports_static_roundTripOptionalStructArray() -> Void {
+    #if arch(wasm32)
+    let ret = ArraySupportExports.roundTripOptionalStructArray(_: [Optional<DataPoint>].bridgeJSStackPop())
+    ret.bridgeJSStackPush()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
 
-    @_spi(BridgeJS) @usableFromInline init?(bridgeJSRawValue: Int32) {
-        switch bridgeJSRawValue {
-        case 0:
-            self = .loading
-        case 1:
-            self = .success
-        case 2:
-            self = .error
-        default:
-            return nil
-        }
-    }
+@_expose(wasm, "bjs_ArraySupportExports_static_roundTripOptionalSwiftClassArray")
+@_cdecl("bjs_ArraySupportExports_static_roundTripOptionalSwiftClassArray")
+public func _bjs_ArraySupportExports_static_roundTripOptionalSwiftClassArray() -> Void {
+    #if arch(wasm32)
+    let ret = ArraySupportExports.roundTripOptionalSwiftClassArray(_: [Optional<Greeter>].bridgeJSStackPop())
+    ret.bridgeJSStackPush()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
 
-    @_spi(BridgeJS) @usableFromInline var bridgeJSRawValue: Int32 {
-        switch self {
-        case .loading:
-            return 0
-        case .success:
-            return 1
-        case .error:
-            return 2
-        }
-    }
+@_expose(wasm, "bjs_ArraySupportExports_static_roundTripOptionalJSClassArray")
+@_cdecl("bjs_ArraySupportExports_static_roundTripOptionalJSClassArray")
+public func _bjs_ArraySupportExports_static_roundTripOptionalJSClassArray() -> Void {
+    #if arch(wasm32)
+    let ret = ArraySupportExports.roundTripOptionalJSClassArray(_: [Optional<ArrayElementObject>].bridgeJSStackPop())
+    ret.bridgeJSStackPush()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
 }
 
-extension Theme: _BridgedSwiftEnumNoPayload, _BridgedSwiftRawValueEnum {
+@_expose(wasm, "bjs_ArraySupportExports_static_roundTripNestedIntArray")
+@_cdecl("bjs_ArraySupportExports_static_roundTripNestedIntArray")
+public func _bjs_ArraySupportExports_static_roundTripNestedIntArray() -> Void {
+    #if arch(wasm32)
+    let ret = ArraySupportExports.roundTripNestedIntArray(_: [[Int]].bridgeJSStackPop())
+    ret.bridgeJSStackPush()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
 }
 
-extension HttpStatus: _BridgedSwiftEnumNoPayload, _BridgedSwiftRawValueEnum {
+@_expose(wasm, "bjs_ArraySupportExports_static_roundTripNestedStringArray")
+@_cdecl("bjs_ArraySupportExports_static_roundTripNestedStringArray")
+public func _bjs_ArraySupportExports_static_roundTripNestedStringArray() -> Void {
+    #if arch(wasm32)
+    let ret = ArraySupportExports.roundTripNestedStringArray(_: [[String]].bridgeJSStackPop())
+    ret.bridgeJSStackPush()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
 }
 
-extension FileSize: _BridgedSwiftEnumNoPayload, _BridgedSwiftRawValueEnum {
+@_expose(wasm, "bjs_ArraySupportExports_static_roundTripNestedDoubleArray")
+@_cdecl("bjs_ArraySupportExports_static_roundTripNestedDoubleArray")
+public func _bjs_ArraySupportExports_static_roundTripNestedDoubleArray() -> Void {
+    #if arch(wasm32)
+    let ret = ArraySupportExports.roundTripNestedDoubleArray(_: [[Double]].bridgeJSStackPop())
+    ret.bridgeJSStackPush()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
 }
 
-extension SessionId: _BridgedSwiftEnumNoPayload, _BridgedSwiftRawValueEnum {
+@_expose(wasm, "bjs_ArraySupportExports_static_roundTripNestedBoolArray")
+@_cdecl("bjs_ArraySupportExports_static_roundTripNestedBoolArray")
+public func _bjs_ArraySupportExports_static_roundTripNestedBoolArray() -> Void {
+    #if arch(wasm32)
+    let ret = ArraySupportExports.roundTripNestedBoolArray(_: [[Bool]].bridgeJSStackPop())
+    ret.bridgeJSStackPush()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
 }
 
-extension Precision: _BridgedSwiftEnumNoPayload, _BridgedSwiftRawValueEnum {
+@_expose(wasm, "bjs_ArraySupportExports_static_roundTripNestedStructArray")
+@_cdecl("bjs_ArraySupportExports_static_roundTripNestedStructArray")
+public func _bjs_ArraySupportExports_static_roundTripNestedStructArray() -> Void {
+    #if arch(wasm32)
+    let ret = ArraySupportExports.roundTripNestedStructArray(_: [[DataPoint]].bridgeJSStackPop())
+    ret.bridgeJSStackPush()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
 }
 
-extension Ratio: _BridgedSwiftEnumNoPayload, _BridgedSwiftRawValueEnum {
+@_expose(wasm, "bjs_ArraySupportExports_static_roundTripNestedCaseEnumArray")
+@_cdecl("bjs_ArraySupportExports_static_roundTripNestedCaseEnumArray")
+public func _bjs_ArraySupportExports_static_roundTripNestedCaseEnumArray() -> Void {
+    #if arch(wasm32)
+    let ret = ArraySupportExports.roundTripNestedCaseEnumArray(_: [[Direction]].bridgeJSStackPop())
+    ret.bridgeJSStackPush()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
 }
 
-extension TSDirection: _BridgedSwiftCaseEnum {
-    @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameter() -> Int32 {
-        return bridgeJSRawValue
-    }
-    @_spi(BridgeJS) @_transparent public static func bridgeJSLiftReturn(_ value: Int32) -> TSDirection {
-        return bridgeJSLiftParameter(value)
-    }
-    @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter(_ value: Int32) -> TSDirection {
-        return TSDirection(bridgeJSRawValue: value)!
-    }
-    @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() -> Int32 {
-        return bridgeJSLowerParameter()
-    }
+@_expose(wasm, "bjs_ArraySupportExports_static_roundTripNestedSwiftClassArray")
+@_cdecl("bjs_ArraySupportExports_static_roundTripNestedSwiftClassArray")
+public func _bjs_ArraySupportExports_static_roundTripNestedSwiftClassArray() -> Void {
+    #if arch(wasm32)
+    let ret = ArraySupportExports.roundTripNestedSwiftClassArray(_: [[Greeter]].bridgeJSStackPop())
+    ret.bridgeJSStackPush()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
 
-    @_spi(BridgeJS) @usableFromInline init?(bridgeJSRawValue: Int32) {
-        switch bridgeJSRawValue {
+@_expose(wasm, "bjs_ArraySupportExports_static_multiArrayFirst")
+@_cdecl("bjs_ArraySupportExports_static_multiArrayFirst")
+public func _bjs_ArraySupportExports_static_multiArrayFirst() -> Void {
+    #if arch(wasm32)
+    let _tmp_b = [String].bridgeJSStackPop()
+    let _tmp_a = [Int].bridgeJSStackPop()
+    let ret = ArraySupportExports.multiArrayFirst(_: _tmp_a, _: _tmp_b)
+    ret.bridgeJSStackPush()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_ArraySupportExports_static_multiArraySecond")
+@_cdecl("bjs_ArraySupportExports_static_multiArraySecond")
+public func _bjs_ArraySupportExports_static_multiArraySecond() -> Void {
+    #if arch(wasm32)
+    let _tmp_b = [String].bridgeJSStackPop()
+    let _tmp_a = [Int].bridgeJSStackPop()
+    let ret = ArraySupportExports.multiArraySecond(_: _tmp_a, _: _tmp_b)
+    ret.bridgeJSStackPush()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_ArraySupportExports_static_multiOptionalArrayFirst")
+@_cdecl("bjs_ArraySupportExports_static_multiOptionalArrayFirst")
+public func _bjs_ArraySupportExports_static_multiOptionalArrayFirst() -> Void {
+    #if arch(wasm32)
+    let _tmp_b = Optional<[String]>.bridgeJSLiftParameter()
+    let _tmp_a = Optional<[Int]>.bridgeJSLiftParameter()
+    let ret = ArraySupportExports.multiOptionalArrayFirst(_: _tmp_a, _: _tmp_b)
+    ret.bridgeJSStackPush()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_ArraySupportExports_static_multiOptionalArraySecond")
+@_cdecl("bjs_ArraySupportExports_static_multiOptionalArraySecond")
+public func _bjs_ArraySupportExports_static_multiOptionalArraySecond() -> Void {
+    #if arch(wasm32)
+    let _tmp_b = Optional<[String]>.bridgeJSLiftParameter()
+    let _tmp_a = Optional<[Int]>.bridgeJSLiftParameter()
+    let ret = ArraySupportExports.multiOptionalArraySecond(_: _tmp_a, _: _tmp_b)
+    ret.bridgeJSStackPush()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+extension AsyncImportedPayloadResult: _BridgedSwiftAssociatedValueEnum {
+    @_spi(BridgeJS) @_transparent public static func bridgeJSStackPopPayload(_ caseId: Int32) -> AsyncImportedPayloadResult {
+        switch caseId {
         case 0:
-            self = .north
+            return .success(String.bridgeJSStackPop())
         case 1:
-            self = .south
+            return .failure(Int.bridgeJSStackPop())
         case 2:
-            self = .east
-        case 3:
-            self = .west
+            return .idle
         default:
-            return nil
+            fatalError("Unknown AsyncImportedPayloadResult case ID: \(caseId)")
         }
     }
 
-    @_spi(BridgeJS) @usableFromInline var bridgeJSRawValue: Int32 {
+    @_spi(BridgeJS) @_transparent public consuming func bridgeJSStackPushPayload() -> Int32 {
         switch self {
-        case .north:
-            return 0
-        case .south:
-            return 1
-        case .east:
-            return 2
-        case .west:
-            return 3
+        case .success(let param0):
+            param0.bridgeJSStackPush()
+            return Int32(0)
+        case .failure(let param0):
+            param0.bridgeJSStackPush()
+            return Int32(1)
+        case .idle:
+            return Int32(2)
         }
     }
 }
 
-extension TSTheme: _BridgedSwiftEnumNoPayload, _BridgedSwiftRawValueEnum {
+extension Workspace.Kind: _BridgedSwiftEnumNoPayload, _BridgedSwiftRawValueEnum {
 }
 
-@_expose(wasm, "bjs_Utils_StringUtils_static_uppercase")
-@_cdecl("bjs_Utils_StringUtils_static_uppercase")
-public func _bjs_Utils_StringUtils_static_uppercase(_ textBytes: Int32, _ textLength: Int32) -> Void {
+@_expose(wasm, "bjs_DefaultArgumentExports_static_testStringDefault")
+@_cdecl("bjs_DefaultArgumentExports_static_testStringDefault")
+public func _bjs_DefaultArgumentExports_static_testStringDefault(_ messageBytes: Int32, _ messageLength: Int32) -> Void {
     #if arch(wasm32)
-    let ret = Utils.StringUtils.uppercase(_: String.bridgeJSLiftParameter(textBytes, textLength))
+    let ret = DefaultArgumentExports.testStringDefault(message: String.bridgeJSLiftParameter(messageBytes, messageLength))
     return ret.bridgeJSLowerReturn()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_Utils_StringUtils_static_lowercase")
-@_cdecl("bjs_Utils_StringUtils_static_lowercase")
-public func _bjs_Utils_StringUtils_static_lowercase(_ textBytes: Int32, _ textLength: Int32) -> Void {
+@_expose(wasm, "bjs_DefaultArgumentExports_static_testIntDefault")
+@_cdecl("bjs_DefaultArgumentExports_static_testIntDefault")
+public func _bjs_DefaultArgumentExports_static_testIntDefault(_ count: Int32) -> Int32 {
     #if arch(wasm32)
-    let ret = Utils.StringUtils.lowercase(_: String.bridgeJSLiftParameter(textBytes, textLength))
+    let ret = DefaultArgumentExports.testIntDefault(count: Int.bridgeJSLiftParameter(count))
     return ret.bridgeJSLowerReturn()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-extension Networking.API.Method: _BridgedSwiftCaseEnum {
-    @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameter() -> Int32 {
-        return bridgeJSRawValue
-    }
-    @_spi(BridgeJS) @_transparent public static func bridgeJSLiftReturn(_ value: Int32) -> Networking.API.Method {
-        return bridgeJSLiftParameter(value)
-    }
-    @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter(_ value: Int32) -> Networking.API.Method {
-        return Networking.API.Method(bridgeJSRawValue: value)!
-    }
-    @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() -> Int32 {
-        return bridgeJSLowerParameter()
-    }
-
-    @_spi(BridgeJS) @usableFromInline init?(bridgeJSRawValue: Int32) {
-        switch bridgeJSRawValue {
-        case 0:
-            self = .get
+@_expose(wasm, "bjs_DefaultArgumentExports_static_testBoolDefault")
+@_cdecl("bjs_DefaultArgumentExports_static_testBoolDefault")
+public func _bjs_DefaultArgumentExports_static_testBoolDefault(_ flag: Int32) -> Int32 {
+    #if arch(wasm32)
+    let ret = DefaultArgumentExports.testBoolDefault(flag: Bool.bridgeJSLiftParameter(flag))
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_DefaultArgumentExports_static_testOptionalDefault")
+@_cdecl("bjs_DefaultArgumentExports_static_testOptionalDefault")
+public func _bjs_DefaultArgumentExports_static_testOptionalDefault(_ nameIsSome: Int32, _ nameBytes: Int32, _ nameLength: Int32) -> Void {
+    #if arch(wasm32)
+    let ret = DefaultArgumentExports.testOptionalDefault(name: Optional<String>.bridgeJSLiftParameter(nameIsSome, nameBytes, nameLength))
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_DefaultArgumentExports_static_testMultipleDefaults")
+@_cdecl("bjs_DefaultArgumentExports_static_testMultipleDefaults")
+public func _bjs_DefaultArgumentExports_static_testMultipleDefaults(_ titleBytes: Int32, _ titleLength: Int32, _ count: Int32, _ enabled: Int32) -> Void {
+    #if arch(wasm32)
+    let ret = DefaultArgumentExports.testMultipleDefaults(title: String.bridgeJSLiftParameter(titleBytes, titleLength), count: Int.bridgeJSLiftParameter(count), enabled: Bool.bridgeJSLiftParameter(enabled))
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_DefaultArgumentExports_static_testSimpleEnumDefault")
+@_cdecl("bjs_DefaultArgumentExports_static_testSimpleEnumDefault")
+public func _bjs_DefaultArgumentExports_static_testSimpleEnumDefault(_ status: Int32) -> Int32 {
+    #if arch(wasm32)
+    let ret = DefaultArgumentExports.testSimpleEnumDefault(status: Status.bridgeJSLiftParameter(status))
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_DefaultArgumentExports_static_testDirectionDefault")
+@_cdecl("bjs_DefaultArgumentExports_static_testDirectionDefault")
+public func _bjs_DefaultArgumentExports_static_testDirectionDefault(_ direction: Int32) -> Int32 {
+    #if arch(wasm32)
+    let ret = DefaultArgumentExports.testDirectionDefault(direction: Direction.bridgeJSLiftParameter(direction))
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_DefaultArgumentExports_static_testRawStringEnumDefault")
+@_cdecl("bjs_DefaultArgumentExports_static_testRawStringEnumDefault")
+public func _bjs_DefaultArgumentExports_static_testRawStringEnumDefault(_ themeBytes: Int32, _ themeLength: Int32) -> Void {
+    #if arch(wasm32)
+    let ret = DefaultArgumentExports.testRawStringEnumDefault(theme: Theme.bridgeJSLiftParameter(themeBytes, themeLength))
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_DefaultArgumentExports_static_testComplexInit")
+@_cdecl("bjs_DefaultArgumentExports_static_testComplexInit")
+public func _bjs_DefaultArgumentExports_static_testComplexInit(_ greeter: UnsafeMutableRawPointer) -> Void {
+    #if arch(wasm32)
+    let ret = DefaultArgumentExports.testComplexInit(greeter: Greeter.bridgeJSLiftParameter(greeter))
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_DefaultArgumentExports_static_testEmptyInit")
+@_cdecl("bjs_DefaultArgumentExports_static_testEmptyInit")
+public func _bjs_DefaultArgumentExports_static_testEmptyInit(_ object: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer {
+    #if arch(wasm32)
+    let ret = DefaultArgumentExports.testEmptyInit(_: StaticPropertyHolder.bridgeJSLiftParameter(object))
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_DefaultArgumentExports_static_createConstructorDefaults")
+@_cdecl("bjs_DefaultArgumentExports_static_createConstructorDefaults")
+public func _bjs_DefaultArgumentExports_static_createConstructorDefaults(_ nameBytes: Int32, _ nameLength: Int32, _ count: Int32, _ enabled: Int32, _ status: Int32, _ tagIsSome: Int32, _ tagBytes: Int32, _ tagLength: Int32) -> UnsafeMutableRawPointer {
+    #if arch(wasm32)
+    let ret = DefaultArgumentExports.createConstructorDefaults(name: String.bridgeJSLiftParameter(nameBytes, nameLength), count: Int.bridgeJSLiftParameter(count), enabled: Bool.bridgeJSLiftParameter(enabled), status: Status.bridgeJSLiftParameter(status), tag: Optional<String>.bridgeJSLiftParameter(tagIsSome, tagBytes, tagLength))
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_DefaultArgumentExports_static_describeConstructorDefaults")
+@_cdecl("bjs_DefaultArgumentExports_static_describeConstructorDefaults")
+public func _bjs_DefaultArgumentExports_static_describeConstructorDefaults(_ value: UnsafeMutableRawPointer) -> Void {
+    #if arch(wasm32)
+    let ret = DefaultArgumentExports.describeConstructorDefaults(_: DefaultArgumentConstructorDefaults.bridgeJSLiftParameter(value))
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_DefaultArgumentExports_static_arrayWithDefault")
+@_cdecl("bjs_DefaultArgumentExports_static_arrayWithDefault")
+public func _bjs_DefaultArgumentExports_static_arrayWithDefault() -> Int32 {
+    #if arch(wasm32)
+    let ret = DefaultArgumentExports.arrayWithDefault(_: [Int].bridgeJSStackPop())
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_DefaultArgumentExports_static_arrayWithOptionalDefault")
+@_cdecl("bjs_DefaultArgumentExports_static_arrayWithOptionalDefault")
+public func _bjs_DefaultArgumentExports_static_arrayWithOptionalDefault() -> Int32 {
+    #if arch(wasm32)
+    let ret = DefaultArgumentExports.arrayWithOptionalDefault(_: Optional<[Int]>.bridgeJSLiftParameter())
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_DefaultArgumentExports_static_arrayMixedDefaults")
+@_cdecl("bjs_DefaultArgumentExports_static_arrayMixedDefaults")
+public func _bjs_DefaultArgumentExports_static_arrayMixedDefaults(_ prefixBytes: Int32, _ prefixLength: Int32, _ suffixBytes: Int32, _ suffixLength: Int32) -> Void {
+    #if arch(wasm32)
+    let ret = DefaultArgumentExports.arrayMixedDefaults(prefix: String.bridgeJSLiftParameter(prefixBytes, prefixLength), values: [Int].bridgeJSStackPop(), suffix: String.bridgeJSLiftParameter(suffixBytes, suffixLength))
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+extension Direction: _BridgedSwiftCaseEnum {
+    @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameter() -> Int32 {
+        return bridgeJSRawValue
+    }
+    @_spi(BridgeJS) @_transparent public static func bridgeJSLiftReturn(_ value: Int32) -> Direction {
+        return bridgeJSLiftParameter(value)
+    }
+    @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter(_ value: Int32) -> Direction {
+        return Direction(bridgeJSRawValue: value)!
+    }
+    @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() -> Int32 {
+        return bridgeJSLowerParameter()
+    }
+
+    @_spi(BridgeJS) @usableFromInline init?(bridgeJSRawValue: Int32) {
+        switch bridgeJSRawValue {
+        case 0:
+            self = .north
         case 1:
-            self = .post
+            self = .south
         case 2:
-            self = .put
+            self = .east
         case 3:
-            self = .delete
+            self = .west
         default:
             return nil
         }
@@ -4180,33 +5077,27 @@ extension Networking.API.Method: _BridgedSwiftCaseEnum {
 
     @_spi(BridgeJS) @usableFromInline var bridgeJSRawValue: Int32 {
         switch self {
-        case .get:
+        case .north:
             return 0
-        case .post:
+        case .south:
             return 1
-        case .put:
+        case .east:
             return 2
-        case .delete:
+        case .west:
             return 3
         }
     }
 }
 
-extension Configuration.LogLevel: _BridgedSwiftEnumNoPayload, _BridgedSwiftRawValueEnum {
-}
-
-extension Configuration.Port: _BridgedSwiftEnumNoPayload, _BridgedSwiftRawValueEnum {
-}
-
-extension Internal.SupportedMethod: _BridgedSwiftCaseEnum {
+extension Status: _BridgedSwiftCaseEnum {
     @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameter() -> Int32 {
         return bridgeJSRawValue
     }
-    @_spi(BridgeJS) @_transparent public static func bridgeJSLiftReturn(_ value: Int32) -> Internal.SupportedMethod {
+    @_spi(BridgeJS) @_transparent public static func bridgeJSLiftReturn(_ value: Int32) -> Status {
         return bridgeJSLiftParameter(value)
     }
-    @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter(_ value: Int32) -> Internal.SupportedMethod {
-        return Internal.SupportedMethod(bridgeJSRawValue: value)!
+    @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter(_ value: Int32) -> Status {
+        return Status(bridgeJSRawValue: value)!
     }
     @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() -> Int32 {
         return bridgeJSLowerParameter()
@@ -4215,9 +5106,11 @@ extension Internal.SupportedMethod: _BridgedSwiftCaseEnum {
     @_spi(BridgeJS) @usableFromInline init?(bridgeJSRawValue: Int32) {
         switch bridgeJSRawValue {
         case 0:
-            self = .get
+            self = .loading
         case 1:
-            self = .post
+            self = .success
+        case 2:
+            self = .error
         default:
             return nil
         }
@@ -4225,38 +5118,238 @@ extension Internal.SupportedMethod: _BridgedSwiftCaseEnum {
 
     @_spi(BridgeJS) @usableFromInline var bridgeJSRawValue: Int32 {
         switch self {
-        case .get:
+        case .loading:
             return 0
-        case .post:
+        case .success:
             return 1
+        case .error:
+            return 2
         }
     }
 }
 
-extension APIResult: _BridgedSwiftAssociatedValueEnum {
-    @_spi(BridgeJS) @_transparent public static func bridgeJSStackPopPayload(_ caseId: Int32) -> APIResult {
-        switch caseId {
+extension Theme: _BridgedSwiftEnumNoPayload, _BridgedSwiftRawValueEnum {
+}
+
+extension HttpStatus: _BridgedSwiftEnumNoPayload, _BridgedSwiftRawValueEnum {
+}
+
+extension FileSize: _BridgedSwiftEnumNoPayload, _BridgedSwiftRawValueEnum {
+}
+
+extension SessionId: _BridgedSwiftEnumNoPayload, _BridgedSwiftRawValueEnum {
+}
+
+extension Precision: _BridgedSwiftEnumNoPayload, _BridgedSwiftRawValueEnum {
+}
+
+extension Ratio: _BridgedSwiftEnumNoPayload, _BridgedSwiftRawValueEnum {
+}
+
+extension TSDirection: _BridgedSwiftCaseEnum {
+    @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameter() -> Int32 {
+        return bridgeJSRawValue
+    }
+    @_spi(BridgeJS) @_transparent public static func bridgeJSLiftReturn(_ value: Int32) -> TSDirection {
+        return bridgeJSLiftParameter(value)
+    }
+    @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter(_ value: Int32) -> TSDirection {
+        return TSDirection(bridgeJSRawValue: value)!
+    }
+    @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() -> Int32 {
+        return bridgeJSLowerParameter()
+    }
+
+    @_spi(BridgeJS) @usableFromInline init?(bridgeJSRawValue: Int32) {
+        switch bridgeJSRawValue {
         case 0:
-            return .success(String.bridgeJSStackPop())
+            self = .north
         case 1:
-            return .failure(Int.bridgeJSStackPop())
+            self = .south
         case 2:
-            return .flag(Bool.bridgeJSStackPop())
+            self = .east
         case 3:
-            return .rate(Float.bridgeJSStackPop())
-        case 4:
-            return .precise(Double.bridgeJSStackPop())
-        case 5:
-            return .info
+            self = .west
         default:
-            fatalError("Unknown APIResult case ID: \(caseId)")
+            return nil
         }
     }
 
-    @_spi(BridgeJS) @_transparent public consuming func bridgeJSStackPushPayload() -> Int32 {
+    @_spi(BridgeJS) @usableFromInline var bridgeJSRawValue: Int32 {
         switch self {
-        case .success(let param0):
-            param0.bridgeJSStackPush()
+        case .north:
+            return 0
+        case .south:
+            return 1
+        case .east:
+            return 2
+        case .west:
+            return 3
+        }
+    }
+}
+
+extension TSTheme: _BridgedSwiftEnumNoPayload, _BridgedSwiftRawValueEnum {
+}
+
+extension AsyncPayloadResult: _BridgedSwiftAssociatedValueEnum {
+    @_spi(BridgeJS) @_transparent public static func bridgeJSStackPopPayload(_ caseId: Int32) -> AsyncPayloadResult {
+        switch caseId {
+        case 0:
+            return .success(String.bridgeJSStackPop())
+        case 1:
+            return .failure(Int.bridgeJSStackPop())
+        case 2:
+            return .idle
+        default:
+            fatalError("Unknown AsyncPayloadResult case ID: \(caseId)")
+        }
+    }
+
+    @_spi(BridgeJS) @_transparent public consuming func bridgeJSStackPushPayload() -> Int32 {
+        switch self {
+        case .success(let param0):
+            param0.bridgeJSStackPush()
+            return Int32(0)
+        case .failure(let param0):
+            param0.bridgeJSStackPush()
+            return Int32(1)
+        case .idle:
+            return Int32(2)
+        }
+    }
+}
+
+@_expose(wasm, "bjs_Utils_StringUtils_static_uppercase")
+@_cdecl("bjs_Utils_StringUtils_static_uppercase")
+public func _bjs_Utils_StringUtils_static_uppercase(_ textBytes: Int32, _ textLength: Int32) -> Void {
+    #if arch(wasm32)
+    let ret = Utils.StringUtils.uppercase(_: String.bridgeJSLiftParameter(textBytes, textLength))
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_Utils_StringUtils_static_lowercase")
+@_cdecl("bjs_Utils_StringUtils_static_lowercase")
+public func _bjs_Utils_StringUtils_static_lowercase(_ textBytes: Int32, _ textLength: Int32) -> Void {
+    #if arch(wasm32)
+    let ret = Utils.StringUtils.lowercase(_: String.bridgeJSLiftParameter(textBytes, textLength))
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+extension Networking.API.Method: _BridgedSwiftCaseEnum {
+    @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameter() -> Int32 {
+        return bridgeJSRawValue
+    }
+    @_spi(BridgeJS) @_transparent public static func bridgeJSLiftReturn(_ value: Int32) -> Networking.API.Method {
+        return bridgeJSLiftParameter(value)
+    }
+    @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter(_ value: Int32) -> Networking.API.Method {
+        return Networking.API.Method(bridgeJSRawValue: value)!
+    }
+    @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() -> Int32 {
+        return bridgeJSLowerParameter()
+    }
+
+    @_spi(BridgeJS) @usableFromInline init?(bridgeJSRawValue: Int32) {
+        switch bridgeJSRawValue {
+        case 0:
+            self = .get
+        case 1:
+            self = .post
+        case 2:
+            self = .put
+        case 3:
+            self = .delete
+        default:
+            return nil
+        }
+    }
+
+    @_spi(BridgeJS) @usableFromInline var bridgeJSRawValue: Int32 {
+        switch self {
+        case .get:
+            return 0
+        case .post:
+            return 1
+        case .put:
+            return 2
+        case .delete:
+            return 3
+        }
+    }
+}
+
+extension Configuration.LogLevel: _BridgedSwiftEnumNoPayload, _BridgedSwiftRawValueEnum {
+}
+
+extension Configuration.Port: _BridgedSwiftEnumNoPayload, _BridgedSwiftRawValueEnum {
+}
+
+extension Internal.SupportedMethod: _BridgedSwiftCaseEnum {
+    @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameter() -> Int32 {
+        return bridgeJSRawValue
+    }
+    @_spi(BridgeJS) @_transparent public static func bridgeJSLiftReturn(_ value: Int32) -> Internal.SupportedMethod {
+        return bridgeJSLiftParameter(value)
+    }
+    @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter(_ value: Int32) -> Internal.SupportedMethod {
+        return Internal.SupportedMethod(bridgeJSRawValue: value)!
+    }
+    @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() -> Int32 {
+        return bridgeJSLowerParameter()
+    }
+
+    @_spi(BridgeJS) @usableFromInline init?(bridgeJSRawValue: Int32) {
+        switch bridgeJSRawValue {
+        case 0:
+            self = .get
+        case 1:
+            self = .post
+        default:
+            return nil
+        }
+    }
+
+    @_spi(BridgeJS) @usableFromInline var bridgeJSRawValue: Int32 {
+        switch self {
+        case .get:
+            return 0
+        case .post:
+            return 1
+        }
+    }
+}
+
+extension APIResult: _BridgedSwiftAssociatedValueEnum {
+    @_spi(BridgeJS) @_transparent public static func bridgeJSStackPopPayload(_ caseId: Int32) -> APIResult {
+        switch caseId {
+        case 0:
+            return .success(String.bridgeJSStackPop())
+        case 1:
+            return .failure(Int.bridgeJSStackPop())
+        case 2:
+            return .flag(Bool.bridgeJSStackPop())
+        case 3:
+            return .rate(Float.bridgeJSStackPop())
+        case 4:
+            return .precise(Double.bridgeJSStackPop())
+        case 5:
+            return .info
+        default:
+            fatalError("Unknown APIResult case ID: \(caseId)")
+        }
+    }
+
+    @_spi(BridgeJS) @_transparent public consuming func bridgeJSStackPushPayload() -> Int32 {
+        switch self {
+        case .success(let param0):
+            param0.bridgeJSStackPush()
             return Int32(0)
         case .failure(let param0):
             param0.bridgeJSStackPush()
@@ -4444,7559 +5537,11174 @@ extension AllTypesResult: _BridgedSwiftAssociatedValueEnum {
     }
 }
 
-extension TypedPayloadResult: _BridgedSwiftAssociatedValueEnum {
-    @_spi(BridgeJS) @_transparent public static func bridgeJSStackPopPayload(_ caseId: Int32) -> TypedPayloadResult {
-        switch caseId {
-        case 0:
-            return .precision(Precision.bridgeJSStackPop())
-        case 1:
-            return .direction(Direction.bridgeJSStackPop())
-        case 2:
-            return .optPrecision(Optional<Precision>.bridgeJSStackPop())
-        case 3:
-            return .optDirection(Optional<Direction>.bridgeJSStackPop())
-        case 4:
-            return .empty
-        default:
-            fatalError("Unknown TypedPayloadResult case ID: \(caseId)")
-        }
+extension TypedPayloadResult: _BridgedSwiftAssociatedValueEnum {
+    @_spi(BridgeJS) @_transparent public static func bridgeJSStackPopPayload(_ caseId: Int32) -> TypedPayloadResult {
+        switch caseId {
+        case 0:
+            return .precision(Precision.bridgeJSStackPop())
+        case 1:
+            return .direction(Direction.bridgeJSStackPop())
+        case 2:
+            return .optPrecision(Optional<Precision>.bridgeJSStackPop())
+        case 3:
+            return .optDirection(Optional<Direction>.bridgeJSStackPop())
+        case 4:
+            return .empty
+        default:
+            fatalError("Unknown TypedPayloadResult case ID: \(caseId)")
+        }
+    }
+
+    @_spi(BridgeJS) @_transparent public consuming func bridgeJSStackPushPayload() -> Int32 {
+        switch self {
+        case .precision(let param0):
+            param0.bridgeJSStackPush()
+            return Int32(0)
+        case .direction(let param0):
+            param0.bridgeJSStackPush()
+            return Int32(1)
+        case .optPrecision(let param0):
+            param0.bridgeJSStackPush()
+            return Int32(2)
+        case .optDirection(let param0):
+            param0.bridgeJSStackPush()
+            return Int32(3)
+        case .empty:
+            return Int32(4)
+        }
+    }
+}
+
+extension StaticCalculator: _BridgedSwiftCaseEnum {
+    @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameter() -> Int32 {
+        return bridgeJSRawValue
+    }
+    @_spi(BridgeJS) @_transparent public static func bridgeJSLiftReturn(_ value: Int32) -> StaticCalculator {
+        return bridgeJSLiftParameter(value)
+    }
+    @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter(_ value: Int32) -> StaticCalculator {
+        return StaticCalculator(bridgeJSRawValue: value)!
+    }
+    @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() -> Int32 {
+        return bridgeJSLowerParameter()
+    }
+
+    @_spi(BridgeJS) @usableFromInline init?(bridgeJSRawValue: Int32) {
+        switch bridgeJSRawValue {
+        case 0:
+            self = .scientific
+        case 1:
+            self = .basic
+        default:
+            return nil
+        }
+    }
+
+    @_spi(BridgeJS) @usableFromInline var bridgeJSRawValue: Int32 {
+        switch self {
+        case .scientific:
+            return 0
+        case .basic:
+            return 1
+        }
+    }
+}
+
+@_expose(wasm, "bjs_StaticCalculator_static_roundtrip")
+@_cdecl("bjs_StaticCalculator_static_roundtrip")
+public func _bjs_StaticCalculator_static_roundtrip(_ value: Int32) -> Int32 {
+    #if arch(wasm32)
+    let ret = StaticCalculator.roundtrip(_: Int.bridgeJSLiftParameter(value))
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_StaticCalculator_static_doubleValue")
+@_cdecl("bjs_StaticCalculator_static_doubleValue")
+public func _bjs_StaticCalculator_static_doubleValue(_ value: Int32) -> Int32 {
+    #if arch(wasm32)
+    let ret = StaticCalculator.doubleValue(_: Int.bridgeJSLiftParameter(value))
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_StaticCalculator_static_version_get")
+@_cdecl("bjs_StaticCalculator_static_version_get")
+public func _bjs_StaticCalculator_static_version_get() -> Void {
+    #if arch(wasm32)
+    let ret = StaticCalculator.version
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_StaticUtils_Nested_static_roundtrip")
+@_cdecl("bjs_StaticUtils_Nested_static_roundtrip")
+public func _bjs_StaticUtils_Nested_static_roundtrip(_ valueBytes: Int32, _ valueLength: Int32) -> Void {
+    #if arch(wasm32)
+    let ret = StaticUtils.Nested.roundtrip(_: String.bridgeJSLiftParameter(valueBytes, valueLength))
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_Services_Graph_GraphOperations_static_createGraph")
+@_cdecl("bjs_Services_Graph_GraphOperations_static_createGraph")
+public func _bjs_Services_Graph_GraphOperations_static_createGraph(_ rootId: Int32) -> Int32 {
+    #if arch(wasm32)
+    let ret = GraphOperations.createGraph(rootId: Int.bridgeJSLiftParameter(rootId))
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_Services_Graph_GraphOperations_static_nodeCount")
+@_cdecl("bjs_Services_Graph_GraphOperations_static_nodeCount")
+public func _bjs_Services_Graph_GraphOperations_static_nodeCount(_ graphId: Int32) -> Int32 {
+    #if arch(wasm32)
+    let ret = GraphOperations.nodeCount(graphId: Int.bridgeJSLiftParameter(graphId))
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+extension StaticPropertyEnum: _BridgedSwiftCaseEnum {
+    @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameter() -> Int32 {
+        return bridgeJSRawValue
+    }
+    @_spi(BridgeJS) @_transparent public static func bridgeJSLiftReturn(_ value: Int32) -> StaticPropertyEnum {
+        return bridgeJSLiftParameter(value)
+    }
+    @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter(_ value: Int32) -> StaticPropertyEnum {
+        return StaticPropertyEnum(bridgeJSRawValue: value)!
+    }
+    @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() -> Int32 {
+        return bridgeJSLowerParameter()
+    }
+
+    @_spi(BridgeJS) @usableFromInline init?(bridgeJSRawValue: Int32) {
+        switch bridgeJSRawValue {
+        case 0:
+            self = .option1
+        case 1:
+            self = .option2
+        default:
+            return nil
+        }
+    }
+
+    @_spi(BridgeJS) @usableFromInline var bridgeJSRawValue: Int32 {
+        switch self {
+        case .option1:
+            return 0
+        case .option2:
+            return 1
+        }
+    }
+}
+
+@_expose(wasm, "bjs_StaticPropertyEnum_static_enumProperty_get")
+@_cdecl("bjs_StaticPropertyEnum_static_enumProperty_get")
+public func _bjs_StaticPropertyEnum_static_enumProperty_get() -> Void {
+    #if arch(wasm32)
+    let ret = StaticPropertyEnum.enumProperty
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_StaticPropertyEnum_static_enumProperty_set")
+@_cdecl("bjs_StaticPropertyEnum_static_enumProperty_set")
+public func _bjs_StaticPropertyEnum_static_enumProperty_set(_ valueBytes: Int32, _ valueLength: Int32) -> Void {
+    #if arch(wasm32)
+    StaticPropertyEnum.enumProperty = String.bridgeJSLiftParameter(valueBytes, valueLength)
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_StaticPropertyEnum_static_enumConstant_get")
+@_cdecl("bjs_StaticPropertyEnum_static_enumConstant_get")
+public func _bjs_StaticPropertyEnum_static_enumConstant_get() -> Int32 {
+    #if arch(wasm32)
+    let ret = StaticPropertyEnum.enumConstant
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_StaticPropertyEnum_static_enumBool_get")
+@_cdecl("bjs_StaticPropertyEnum_static_enumBool_get")
+public func _bjs_StaticPropertyEnum_static_enumBool_get() -> Int32 {
+    #if arch(wasm32)
+    let ret = StaticPropertyEnum.enumBool
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_StaticPropertyEnum_static_enumBool_set")
+@_cdecl("bjs_StaticPropertyEnum_static_enumBool_set")
+public func _bjs_StaticPropertyEnum_static_enumBool_set(_ value: Int32) -> Void {
+    #if arch(wasm32)
+    StaticPropertyEnum.enumBool = Bool.bridgeJSLiftParameter(value)
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_StaticPropertyEnum_static_enumVariable_get")
+@_cdecl("bjs_StaticPropertyEnum_static_enumVariable_get")
+public func _bjs_StaticPropertyEnum_static_enumVariable_get() -> Int32 {
+    #if arch(wasm32)
+    let ret = StaticPropertyEnum.enumVariable
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_StaticPropertyEnum_static_enumVariable_set")
+@_cdecl("bjs_StaticPropertyEnum_static_enumVariable_set")
+public func _bjs_StaticPropertyEnum_static_enumVariable_set(_ value: Int32) -> Void {
+    #if arch(wasm32)
+    StaticPropertyEnum.enumVariable = Int.bridgeJSLiftParameter(value)
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_StaticPropertyEnum_static_computedReadonly_get")
+@_cdecl("bjs_StaticPropertyEnum_static_computedReadonly_get")
+public func _bjs_StaticPropertyEnum_static_computedReadonly_get() -> Int32 {
+    #if arch(wasm32)
+    let ret = StaticPropertyEnum.computedReadonly
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_StaticPropertyEnum_static_computedReadWrite_get")
+@_cdecl("bjs_StaticPropertyEnum_static_computedReadWrite_get")
+public func _bjs_StaticPropertyEnum_static_computedReadWrite_get() -> Void {
+    #if arch(wasm32)
+    let ret = StaticPropertyEnum.computedReadWrite
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_StaticPropertyEnum_static_computedReadWrite_set")
+@_cdecl("bjs_StaticPropertyEnum_static_computedReadWrite_set")
+public func _bjs_StaticPropertyEnum_static_computedReadWrite_set(_ valueBytes: Int32, _ valueLength: Int32) -> Void {
+    #if arch(wasm32)
+    StaticPropertyEnum.computedReadWrite = String.bridgeJSLiftParameter(valueBytes, valueLength)
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_StaticPropertyNamespace_static_namespaceProperty_get")
+@_cdecl("bjs_StaticPropertyNamespace_static_namespaceProperty_get")
+public func _bjs_StaticPropertyNamespace_static_namespaceProperty_get() -> Void {
+    #if arch(wasm32)
+    let ret = StaticPropertyNamespace.namespaceProperty
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_StaticPropertyNamespace_static_namespaceProperty_set")
+@_cdecl("bjs_StaticPropertyNamespace_static_namespaceProperty_set")
+public func _bjs_StaticPropertyNamespace_static_namespaceProperty_set(_ valueBytes: Int32, _ valueLength: Int32) -> Void {
+    #if arch(wasm32)
+    StaticPropertyNamespace.namespaceProperty = String.bridgeJSLiftParameter(valueBytes, valueLength)
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_StaticPropertyNamespace_static_namespaceConstant_get")
+@_cdecl("bjs_StaticPropertyNamespace_static_namespaceConstant_get")
+public func _bjs_StaticPropertyNamespace_static_namespaceConstant_get() -> Void {
+    #if arch(wasm32)
+    let ret = StaticPropertyNamespace.namespaceConstant
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_StaticPropertyNamespace_NestedProperties_static_nestedProperty_get")
+@_cdecl("bjs_StaticPropertyNamespace_NestedProperties_static_nestedProperty_get")
+public func _bjs_StaticPropertyNamespace_NestedProperties_static_nestedProperty_get() -> Int32 {
+    #if arch(wasm32)
+    let ret = StaticPropertyNamespace.NestedProperties.nestedProperty
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_StaticPropertyNamespace_NestedProperties_static_nestedProperty_set")
+@_cdecl("bjs_StaticPropertyNamespace_NestedProperties_static_nestedProperty_set")
+public func _bjs_StaticPropertyNamespace_NestedProperties_static_nestedProperty_set(_ value: Int32) -> Void {
+    #if arch(wasm32)
+    StaticPropertyNamespace.NestedProperties.nestedProperty = Int.bridgeJSLiftParameter(value)
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_StaticPropertyNamespace_NestedProperties_static_nestedConstant_get")
+@_cdecl("bjs_StaticPropertyNamespace_NestedProperties_static_nestedConstant_get")
+public func _bjs_StaticPropertyNamespace_NestedProperties_static_nestedConstant_get() -> Void {
+    #if arch(wasm32)
+    let ret = StaticPropertyNamespace.NestedProperties.nestedConstant
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_StaticPropertyNamespace_NestedProperties_static_nestedDouble_get")
+@_cdecl("bjs_StaticPropertyNamespace_NestedProperties_static_nestedDouble_get")
+public func _bjs_StaticPropertyNamespace_NestedProperties_static_nestedDouble_get() -> Float64 {
+    #if arch(wasm32)
+    let ret = StaticPropertyNamespace.NestedProperties.nestedDouble
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_StaticPropertyNamespace_NestedProperties_static_nestedDouble_set")
+@_cdecl("bjs_StaticPropertyNamespace_NestedProperties_static_nestedDouble_set")
+public func _bjs_StaticPropertyNamespace_NestedProperties_static_nestedDouble_set(_ value: Float64) -> Void {
+    #if arch(wasm32)
+    StaticPropertyNamespace.NestedProperties.nestedDouble = Double.bridgeJSLiftParameter(value)
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_NestedStructGroupA_static_roundtripMetadata")
+@_cdecl("bjs_NestedStructGroupA_static_roundtripMetadata")
+public func _bjs_NestedStructGroupA_static_roundtripMetadata() -> Void {
+    #if arch(wasm32)
+    let ret = NestedStructGroupA.roundtripMetadata(_: NestedStructGroupA.Metadata.bridgeJSLiftParameter())
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_NestedStructGroupB_static_roundtripMetadata")
+@_cdecl("bjs_NestedStructGroupB_static_roundtripMetadata")
+public func _bjs_NestedStructGroupB_static_roundtripMetadata() -> Void {
+    #if arch(wasm32)
+    let ret = NestedStructGroupB.roundtripMetadata(_: NestedStructGroupB.Metadata.bridgeJSLiftParameter())
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+extension NestedTypeHost.Variant: _BridgedSwiftEnumNoPayload, _BridgedSwiftRawValueEnum {
+}
+
+extension Message: _BridgedSwiftAssociatedValueEnum {
+    @_spi(BridgeJS) @_transparent public static func bridgeJSStackPopPayload(_ caseId: Int32) -> Message {
+        switch caseId {
+        case 0:
+            return .update(Message.Update.bridgeJSStackPop())
+        case 1:
+            return .delete
+        default:
+            fatalError("Unknown Message case ID: \(caseId)")
+        }
+    }
+
+    @_spi(BridgeJS) @_transparent public consuming func bridgeJSStackPushPayload() -> Int32 {
+        switch self {
+        case .update(let param0):
+            param0.bridgeJSStackPush()
+            return Int32(0)
+        case .delete:
+            return Int32(1)
+        }
+    }
+}
+
+extension Library.Genre: _BridgedSwiftEnumNoPayload, _BridgedSwiftRawValueEnum {
+}
+
+extension Message.Update: _BridgedSwiftCaseEnum {
+    @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameter() -> Int32 {
+        return bridgeJSRawValue
+    }
+    @_spi(BridgeJS) @_transparent public static func bridgeJSLiftReturn(_ value: Int32) -> Message.Update {
+        return bridgeJSLiftParameter(value)
+    }
+    @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter(_ value: Int32) -> Message.Update {
+        return Message.Update(bridgeJSRawValue: value)!
+    }
+    @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() -> Int32 {
+        return bridgeJSLowerParameter()
+    }
+
+    @_spi(BridgeJS) @usableFromInline init?(bridgeJSRawValue: Int32) {
+        switch bridgeJSRawValue {
+        case 0:
+            self = .flip
+        case 1:
+            self = .rotate
+        default:
+            return nil
+        }
+    }
+
+    @_spi(BridgeJS) @usableFromInline var bridgeJSRawValue: Int32 {
+        switch self {
+        case .flip:
+            return 0
+        case .rotate:
+            return 1
+        }
+    }
+}
+
+extension LightColor: _BridgedSwiftCaseEnum {
+    @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameter() -> Int32 {
+        return bridgeJSRawValue
+    }
+    @_spi(BridgeJS) @_transparent public static func bridgeJSLiftReturn(_ value: Int32) -> LightColor {
+        return bridgeJSLiftParameter(value)
+    }
+    @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter(_ value: Int32) -> LightColor {
+        return LightColor(bridgeJSRawValue: value)!
+    }
+    @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() -> Int32 {
+        return bridgeJSLowerParameter()
+    }
+
+    @_spi(BridgeJS) @usableFromInline init?(bridgeJSRawValue: Int32) {
+        switch bridgeJSRawValue {
+        case 0:
+            self = .red
+        case 1:
+            self = .yellow
+        case 2:
+            self = .green
+        default:
+            return nil
+        }
+    }
+
+    @_spi(BridgeJS) @usableFromInline var bridgeJSRawValue: Int32 {
+        switch self {
+        case .red:
+            return 0
+        case .yellow:
+            return 1
+        case .green:
+            return 2
+        }
+    }
+}
+
+extension ImportedPayloadSignal: _BridgedSwiftAssociatedValueEnum {
+    @_spi(BridgeJS) @_transparent public static func bridgeJSStackPopPayload(_ caseId: Int32) -> ImportedPayloadSignal {
+        switch caseId {
+        case 0:
+            return .start(String.bridgeJSStackPop())
+        case 1:
+            return .stop(Int.bridgeJSStackPop())
+        case 2:
+            return .idle
+        default:
+            fatalError("Unknown ImportedPayloadSignal case ID: \(caseId)")
+        }
+    }
+
+    @_spi(BridgeJS) @_transparent public consuming func bridgeJSStackPushPayload() -> Int32 {
+        switch self {
+        case .start(let param0):
+            param0.bridgeJSStackPush()
+            return Int32(0)
+        case .stop(let param0):
+            param0.bridgeJSStackPush()
+            return Int32(1)
+        case .idle:
+            return Int32(2)
+        }
+    }
+}
+
+extension GenericRTColor: _BridgedSwiftCaseEnum {
+    @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameter() -> Int32 {
+        return bridgeJSRawValue
+    }
+    @_spi(BridgeJS) @_transparent public static func bridgeJSLiftReturn(_ value: Int32) -> GenericRTColor {
+        return bridgeJSLiftParameter(value)
+    }
+    @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter(_ value: Int32) -> GenericRTColor {
+        return GenericRTColor(bridgeJSRawValue: value)!
+    }
+    @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() -> Int32 {
+        return bridgeJSLowerParameter()
+    }
+
+    @_spi(BridgeJS) @usableFromInline init?(bridgeJSRawValue: Int32) {
+        switch bridgeJSRawValue {
+        case 0:
+            self = .red
+        case 1:
+            self = .green
+        case 2:
+            self = .blue
+        default:
+            return nil
+        }
+    }
+
+    @_spi(BridgeJS) @usableFromInline var bridgeJSRawValue: Int32 {
+        switch self {
+        case .red:
+            return 0
+        case .green:
+            return 1
+        case .blue:
+            return 2
+        }
+    }
+}
+
+extension GenericRTMode: _BridgedSwiftEnumNoPayload, _BridgedSwiftRawValueEnum {
+}
+
+extension GenericRTLevel: _BridgedSwiftEnumNoPayload, _BridgedSwiftRawValueEnum {
+}
+
+extension GenericRTOutcome: _BridgedSwiftAssociatedValueEnum {
+    @_spi(BridgeJS) @_transparent public static func bridgeJSStackPopPayload(_ caseId: Int32) -> GenericRTOutcome {
+        switch caseId {
+        case 0:
+            return .ok(code: Int.bridgeJSStackPop())
+        case 1:
+            return .fail(message: String.bridgeJSStackPop())
+        default:
+            fatalError("Unknown GenericRTOutcome case ID: \(caseId)")
+        }
+    }
+
+    @_spi(BridgeJS) @_transparent public consuming func bridgeJSStackPushPayload() -> Int32 {
+        switch self {
+        case .ok(let code):
+            code.bridgeJSStackPush()
+            return Int32(0)
+        case .fail(let message):
+            message.bridgeJSStackPush()
+            return Int32(1)
+        }
+    }
+}
+
+@_expose(wasm, "bjs_IntegerTypesSupportExports_static_roundTripInt")
+@_cdecl("bjs_IntegerTypesSupportExports_static_roundTripInt")
+public func _bjs_IntegerTypesSupportExports_static_roundTripInt(_ v: Int32) -> Int32 {
+    #if arch(wasm32)
+    let ret = IntegerTypesSupportExports.roundTripInt(_: Int.bridgeJSLiftParameter(v))
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_IntegerTypesSupportExports_static_roundTripUInt")
+@_cdecl("bjs_IntegerTypesSupportExports_static_roundTripUInt")
+public func _bjs_IntegerTypesSupportExports_static_roundTripUInt(_ v: Int32) -> Int32 {
+    #if arch(wasm32)
+    let ret = IntegerTypesSupportExports.roundTripUInt(_: UInt.bridgeJSLiftParameter(v))
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_IntegerTypesSupportExports_static_roundTripInt8")
+@_cdecl("bjs_IntegerTypesSupportExports_static_roundTripInt8")
+public func _bjs_IntegerTypesSupportExports_static_roundTripInt8(_ v: Int32) -> Int32 {
+    #if arch(wasm32)
+    let ret = IntegerTypesSupportExports.roundTripInt8(_: Int8.bridgeJSLiftParameter(v))
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_IntegerTypesSupportExports_static_roundTripUInt8")
+@_cdecl("bjs_IntegerTypesSupportExports_static_roundTripUInt8")
+public func _bjs_IntegerTypesSupportExports_static_roundTripUInt8(_ v: Int32) -> Int32 {
+    #if arch(wasm32)
+    let ret = IntegerTypesSupportExports.roundTripUInt8(_: UInt8.bridgeJSLiftParameter(v))
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_IntegerTypesSupportExports_static_roundTripInt16")
+@_cdecl("bjs_IntegerTypesSupportExports_static_roundTripInt16")
+public func _bjs_IntegerTypesSupportExports_static_roundTripInt16(_ v: Int32) -> Int32 {
+    #if arch(wasm32)
+    let ret = IntegerTypesSupportExports.roundTripInt16(_: Int16.bridgeJSLiftParameter(v))
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_IntegerTypesSupportExports_static_roundTripUInt16")
+@_cdecl("bjs_IntegerTypesSupportExports_static_roundTripUInt16")
+public func _bjs_IntegerTypesSupportExports_static_roundTripUInt16(_ v: Int32) -> Int32 {
+    #if arch(wasm32)
+    let ret = IntegerTypesSupportExports.roundTripUInt16(_: UInt16.bridgeJSLiftParameter(v))
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_IntegerTypesSupportExports_static_roundTripInt32")
+@_cdecl("bjs_IntegerTypesSupportExports_static_roundTripInt32")
+public func _bjs_IntegerTypesSupportExports_static_roundTripInt32(_ v: Int32) -> Int32 {
+    #if arch(wasm32)
+    let ret = IntegerTypesSupportExports.roundTripInt32(_: Int32.bridgeJSLiftParameter(v))
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_IntegerTypesSupportExports_static_roundTripUInt32")
+@_cdecl("bjs_IntegerTypesSupportExports_static_roundTripUInt32")
+public func _bjs_IntegerTypesSupportExports_static_roundTripUInt32(_ v: Int32) -> Int32 {
+    #if arch(wasm32)
+    let ret = IntegerTypesSupportExports.roundTripUInt32(_: UInt32.bridgeJSLiftParameter(v))
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_IntegerTypesSupportExports_static_roundTripInt64")
+@_cdecl("bjs_IntegerTypesSupportExports_static_roundTripInt64")
+public func _bjs_IntegerTypesSupportExports_static_roundTripInt64(_ v: Int64) -> Int64 {
+    #if arch(wasm32)
+    let ret = IntegerTypesSupportExports.roundTripInt64(_: Int64.bridgeJSLiftParameter(v))
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_IntegerTypesSupportExports_static_roundTripUInt64")
+@_cdecl("bjs_IntegerTypesSupportExports_static_roundTripUInt64")
+public func _bjs_IntegerTypesSupportExports_static_roundTripUInt64(_ v: Int64) -> Int64 {
+    #if arch(wasm32)
+    let ret = IntegerTypesSupportExports.roundTripUInt64(_: UInt64.bridgeJSLiftParameter(v))
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_JSTypedArrayExports_static_roundTripUint8Array")
+@_cdecl("bjs_JSTypedArrayExports_static_roundTripUint8Array")
+public func _bjs_JSTypedArrayExports_static_roundTripUint8Array(_ v: Int32) -> Int32 {
+    #if arch(wasm32)
+    let ret = JSTypedArrayExports.roundTripUint8Array(_: JSUint8Array.bridgeJSLiftParameter(v))
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_JSTypedArrayExports_static_roundTripFloat32Array")
+@_cdecl("bjs_JSTypedArrayExports_static_roundTripFloat32Array")
+public func _bjs_JSTypedArrayExports_static_roundTripFloat32Array(_ v: Int32) -> Int32 {
+    #if arch(wasm32)
+    let ret = JSTypedArrayExports.roundTripFloat32Array(_: JSFloat32Array.bridgeJSLiftParameter(v))
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_JSTypedArrayExports_static_roundTripFloat64Array")
+@_cdecl("bjs_JSTypedArrayExports_static_roundTripFloat64Array")
+public func _bjs_JSTypedArrayExports_static_roundTripFloat64Array(_ v: Int32) -> Int32 {
+    #if arch(wasm32)
+    let ret = JSTypedArrayExports.roundTripFloat64Array(_: JSFloat64Array.bridgeJSLiftParameter(v))
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_JSTypedArrayExports_static_roundTripInt32Array")
+@_cdecl("bjs_JSTypedArrayExports_static_roundTripInt32Array")
+public func _bjs_JSTypedArrayExports_static_roundTripInt32Array(_ v: Int32) -> Int32 {
+    #if arch(wasm32)
+    let ret = JSTypedArrayExports.roundTripInt32Array(_: JSInt32Array.bridgeJSLiftParameter(v))
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_OptionalSupportExports_static_roundTripOptionalString")
+@_cdecl("bjs_OptionalSupportExports_static_roundTripOptionalString")
+public func _bjs_OptionalSupportExports_static_roundTripOptionalString(_ vIsSome: Int32, _ vBytes: Int32, _ vLength: Int32) -> Void {
+    #if arch(wasm32)
+    let ret = OptionalSupportExports.roundTripOptionalString(_: Optional<String>.bridgeJSLiftParameter(vIsSome, vBytes, vLength))
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_OptionalSupportExports_static_roundTripOptionalInt")
+@_cdecl("bjs_OptionalSupportExports_static_roundTripOptionalInt")
+public func _bjs_OptionalSupportExports_static_roundTripOptionalInt(_ vIsSome: Int32, _ vValue: Int32) -> Void {
+    #if arch(wasm32)
+    let ret = OptionalSupportExports.roundTripOptionalInt(_: Optional<Int>.bridgeJSLiftParameter(vIsSome, vValue))
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_OptionalSupportExports_static_roundTripOptionalBool")
+@_cdecl("bjs_OptionalSupportExports_static_roundTripOptionalBool")
+public func _bjs_OptionalSupportExports_static_roundTripOptionalBool(_ vIsSome: Int32, _ vValue: Int32) -> Void {
+    #if arch(wasm32)
+    let ret = OptionalSupportExports.roundTripOptionalBool(_: Optional<Bool>.bridgeJSLiftParameter(vIsSome, vValue))
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_OptionalSupportExports_static_roundTripOptionalFloat")
+@_cdecl("bjs_OptionalSupportExports_static_roundTripOptionalFloat")
+public func _bjs_OptionalSupportExports_static_roundTripOptionalFloat(_ vIsSome: Int32, _ vValue: Float32) -> Void {
+    #if arch(wasm32)
+    let ret = OptionalSupportExports.roundTripOptionalFloat(_: Optional<Float>.bridgeJSLiftParameter(vIsSome, vValue))
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_OptionalSupportExports_static_roundTripOptionalDouble")
+@_cdecl("bjs_OptionalSupportExports_static_roundTripOptionalDouble")
+public func _bjs_OptionalSupportExports_static_roundTripOptionalDouble(_ vIsSome: Int32, _ vValue: Float64) -> Void {
+    #if arch(wasm32)
+    let ret = OptionalSupportExports.roundTripOptionalDouble(_: Optional<Double>.bridgeJSLiftParameter(vIsSome, vValue))
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_OptionalSupportExports_static_roundTripOptionalSyntax")
+@_cdecl("bjs_OptionalSupportExports_static_roundTripOptionalSyntax")
+public func _bjs_OptionalSupportExports_static_roundTripOptionalSyntax(_ vIsSome: Int32, _ vBytes: Int32, _ vLength: Int32) -> Void {
+    #if arch(wasm32)
+    let ret = OptionalSupportExports.roundTripOptionalSyntax(_: Optional<String>.bridgeJSLiftParameter(vIsSome, vBytes, vLength))
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_OptionalSupportExports_static_roundTripOptionalCaseEnum")
+@_cdecl("bjs_OptionalSupportExports_static_roundTripOptionalCaseEnum")
+public func _bjs_OptionalSupportExports_static_roundTripOptionalCaseEnum(_ vIsSome: Int32, _ vValue: Int32) -> Void {
+    #if arch(wasm32)
+    let ret = OptionalSupportExports.roundTripOptionalCaseEnum(_: Optional<Status>.bridgeJSLiftParameter(vIsSome, vValue))
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_OptionalSupportExports_static_roundTripOptionalStringRawValueEnum")
+@_cdecl("bjs_OptionalSupportExports_static_roundTripOptionalStringRawValueEnum")
+public func _bjs_OptionalSupportExports_static_roundTripOptionalStringRawValueEnum(_ vIsSome: Int32, _ vBytes: Int32, _ vLength: Int32) -> Void {
+    #if arch(wasm32)
+    let ret = OptionalSupportExports.roundTripOptionalStringRawValueEnum(_: Optional<Theme>.bridgeJSLiftParameter(vIsSome, vBytes, vLength))
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_OptionalSupportExports_static_roundTripOptionalIntRawValueEnum")
+@_cdecl("bjs_OptionalSupportExports_static_roundTripOptionalIntRawValueEnum")
+public func _bjs_OptionalSupportExports_static_roundTripOptionalIntRawValueEnum(_ vIsSome: Int32, _ vValue: Int32) -> Void {
+    #if arch(wasm32)
+    let ret = OptionalSupportExports.roundTripOptionalIntRawValueEnum(_: Optional<HttpStatus>.bridgeJSLiftParameter(vIsSome, vValue))
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_OptionalSupportExports_static_roundTripOptionalInt64RawValueEnum")
+@_cdecl("bjs_OptionalSupportExports_static_roundTripOptionalInt64RawValueEnum")
+public func _bjs_OptionalSupportExports_static_roundTripOptionalInt64RawValueEnum(_ vIsSome: Int32, _ vValue: Int64) -> Void {
+    #if arch(wasm32)
+    let ret = OptionalSupportExports.roundTripOptionalInt64RawValueEnum(_: Optional<FileSize>.bridgeJSLiftParameter(vIsSome, vValue))
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_OptionalSupportExports_static_roundTripOptionalUInt64RawValueEnum")
+@_cdecl("bjs_OptionalSupportExports_static_roundTripOptionalUInt64RawValueEnum")
+public func _bjs_OptionalSupportExports_static_roundTripOptionalUInt64RawValueEnum(_ vIsSome: Int32, _ vValue: Int64) -> Void {
+    #if arch(wasm32)
+    let ret = OptionalSupportExports.roundTripOptionalUInt64RawValueEnum(_: Optional<SessionId>.bridgeJSLiftParameter(vIsSome, vValue))
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_OptionalSupportExports_static_roundTripOptionalTSEnum")
+@_cdecl("bjs_OptionalSupportExports_static_roundTripOptionalTSEnum")
+public func _bjs_OptionalSupportExports_static_roundTripOptionalTSEnum(_ vIsSome: Int32, _ vValue: Int32) -> Void {
+    #if arch(wasm32)
+    let ret = OptionalSupportExports.roundTripOptionalTSEnum(_: Optional<TSDirection>.bridgeJSLiftParameter(vIsSome, vValue))
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_OptionalSupportExports_static_roundTripOptionalTSStringEnum")
+@_cdecl("bjs_OptionalSupportExports_static_roundTripOptionalTSStringEnum")
+public func _bjs_OptionalSupportExports_static_roundTripOptionalTSStringEnum(_ vIsSome: Int32, _ vBytes: Int32, _ vLength: Int32) -> Void {
+    #if arch(wasm32)
+    let ret = OptionalSupportExports.roundTripOptionalTSStringEnum(_: Optional<TSTheme>.bridgeJSLiftParameter(vIsSome, vBytes, vLength))
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_OptionalSupportExports_static_roundTripOptionalNamespacedEnum")
+@_cdecl("bjs_OptionalSupportExports_static_roundTripOptionalNamespacedEnum")
+public func _bjs_OptionalSupportExports_static_roundTripOptionalNamespacedEnum(_ vIsSome: Int32, _ vValue: Int32) -> Void {
+    #if arch(wasm32)
+    let ret = OptionalSupportExports.roundTripOptionalNamespacedEnum(_: Optional<Networking.API.Method>.bridgeJSLiftParameter(vIsSome, vValue))
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_OptionalSupportExports_static_roundTripOptionalSwiftClass")
+@_cdecl("bjs_OptionalSupportExports_static_roundTripOptionalSwiftClass")
+public func _bjs_OptionalSupportExports_static_roundTripOptionalSwiftClass(_ vIsSome: Int32, _ vValue: UnsafeMutableRawPointer) -> Void {
+    #if arch(wasm32)
+    let ret = OptionalSupportExports.roundTripOptionalSwiftClass(_: Optional<Greeter>.bridgeJSLiftParameter(vIsSome, vValue))
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_OptionalSupportExports_static_roundTripOptionalIntArray")
+@_cdecl("bjs_OptionalSupportExports_static_roundTripOptionalIntArray")
+public func _bjs_OptionalSupportExports_static_roundTripOptionalIntArray() -> Void {
+    #if arch(wasm32)
+    let ret = OptionalSupportExports.roundTripOptionalIntArray(_: Optional<[Int]>.bridgeJSLiftParameter())
+    ret.bridgeJSStackPush()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_OptionalSupportExports_static_roundTripOptionalStringArray")
+@_cdecl("bjs_OptionalSupportExports_static_roundTripOptionalStringArray")
+public func _bjs_OptionalSupportExports_static_roundTripOptionalStringArray() -> Void {
+    #if arch(wasm32)
+    let ret = OptionalSupportExports.roundTripOptionalStringArray(_: Optional<[String]>.bridgeJSLiftParameter())
+    ret.bridgeJSStackPush()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_OptionalSupportExports_static_roundTripOptionalSwiftClassArray")
+@_cdecl("bjs_OptionalSupportExports_static_roundTripOptionalSwiftClassArray")
+public func _bjs_OptionalSupportExports_static_roundTripOptionalSwiftClassArray() -> Void {
+    #if arch(wasm32)
+    let ret = OptionalSupportExports.roundTripOptionalSwiftClassArray(_: Optional<[Greeter]>.bridgeJSLiftParameter())
+    ret.bridgeJSStackPush()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_OptionalSupportExports_static_roundTripOptionalAPIResult")
+@_cdecl("bjs_OptionalSupportExports_static_roundTripOptionalAPIResult")
+public func _bjs_OptionalSupportExports_static_roundTripOptionalAPIResult(_ vIsSome: Int32, _ vCaseId: Int32) -> Void {
+    #if arch(wasm32)
+    let ret = OptionalSupportExports.roundTripOptionalAPIResult(_: Optional<APIResult>.bridgeJSLiftParameter(vIsSome, vCaseId))
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_OptionalSupportExports_static_roundTripOptionalTypedPayloadResult")
+@_cdecl("bjs_OptionalSupportExports_static_roundTripOptionalTypedPayloadResult")
+public func _bjs_OptionalSupportExports_static_roundTripOptionalTypedPayloadResult(_ vIsSome: Int32, _ vCaseId: Int32) -> Void {
+    #if arch(wasm32)
+    let ret = OptionalSupportExports.roundTripOptionalTypedPayloadResult(_: Optional<TypedPayloadResult>.bridgeJSLiftParameter(vIsSome, vCaseId))
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_OptionalSupportExports_static_roundTripOptionalComplexResult")
+@_cdecl("bjs_OptionalSupportExports_static_roundTripOptionalComplexResult")
+public func _bjs_OptionalSupportExports_static_roundTripOptionalComplexResult(_ vIsSome: Int32, _ vCaseId: Int32) -> Void {
+    #if arch(wasm32)
+    let ret = OptionalSupportExports.roundTripOptionalComplexResult(_: Optional<ComplexResult>.bridgeJSLiftParameter(vIsSome, vCaseId))
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_OptionalSupportExports_static_roundTripOptionalAllTypesResult")
+@_cdecl("bjs_OptionalSupportExports_static_roundTripOptionalAllTypesResult")
+public func _bjs_OptionalSupportExports_static_roundTripOptionalAllTypesResult(_ vIsSome: Int32, _ vCaseId: Int32) -> Void {
+    #if arch(wasm32)
+    let ret = OptionalSupportExports.roundTripOptionalAllTypesResult(_: Optional<AllTypesResult>.bridgeJSLiftParameter(vIsSome, vCaseId))
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_OptionalSupportExports_static_roundTripOptionalPayloadResult")
+@_cdecl("bjs_OptionalSupportExports_static_roundTripOptionalPayloadResult")
+public func _bjs_OptionalSupportExports_static_roundTripOptionalPayloadResult(_ v: Int32) -> Void {
+    #if arch(wasm32)
+    let ret = OptionalSupportExports.roundTripOptionalPayloadResult(_: OptionalAllTypesResult.bridgeJSLiftParameter(v))
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_OptionalSupportExports_static_roundTripOptionalPayloadResultOpt")
+@_cdecl("bjs_OptionalSupportExports_static_roundTripOptionalPayloadResultOpt")
+public func _bjs_OptionalSupportExports_static_roundTripOptionalPayloadResultOpt(_ vIsSome: Int32, _ vCaseId: Int32) -> Void {
+    #if arch(wasm32)
+    let ret = OptionalSupportExports.roundTripOptionalPayloadResultOpt(_: Optional<OptionalAllTypesResult>.bridgeJSLiftParameter(vIsSome, vCaseId))
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_OptionalSupportExports_static_roundTripOptionalAPIOptionalResult")
+@_cdecl("bjs_OptionalSupportExports_static_roundTripOptionalAPIOptionalResult")
+public func _bjs_OptionalSupportExports_static_roundTripOptionalAPIOptionalResult(_ vIsSome: Int32, _ vCaseId: Int32) -> Void {
+    #if arch(wasm32)
+    let ret = OptionalSupportExports.roundTripOptionalAPIOptionalResult(_: Optional<APIOptionalResult>.bridgeJSLiftParameter(vIsSome, vCaseId))
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_OptionalSupportExports_static_takeOptionalJSObject")
+@_cdecl("bjs_OptionalSupportExports_static_takeOptionalJSObject")
+public func _bjs_OptionalSupportExports_static_takeOptionalJSObject(_ valueIsSome: Int32, _ valueValue: Int32) -> Void {
+    #if arch(wasm32)
+    OptionalSupportExports.takeOptionalJSObject(_: Optional<JSObject>.bridgeJSLiftParameter(valueIsSome, valueValue))
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_OptionalSupportExports_static_applyOptionalGreeter")
+@_cdecl("bjs_OptionalSupportExports_static_applyOptionalGreeter")
+public func _bjs_OptionalSupportExports_static_applyOptionalGreeter(_ valueIsSome: Int32, _ valueValue: UnsafeMutableRawPointer, _ transform: Int32) -> Void {
+    #if arch(wasm32)
+    let ret = OptionalSupportExports.applyOptionalGreeter(_: Optional<Greeter>.bridgeJSLiftParameter(valueIsSome, valueValue), _: _BJS_Closure_20BridgeJSRuntimeTestsSq7GreeterC_Sq7GreeterC.bridgeJSLift(transform))
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_OptionalSupportExports_static_makeOptionalHolder")
+@_cdecl("bjs_OptionalSupportExports_static_makeOptionalHolder")
+public func _bjs_OptionalSupportExports_static_makeOptionalHolder(_ nullableGreeterIsSome: Int32, _ nullableGreeterValue: UnsafeMutableRawPointer, _ undefinedNumberIsSome: Int32, _ undefinedNumberValue: Float64) -> UnsafeMutableRawPointer {
+    #if arch(wasm32)
+    let ret = OptionalSupportExports.makeOptionalHolder(nullableGreeter: Optional<Greeter>.bridgeJSLiftParameter(nullableGreeterIsSome, nullableGreeterValue), undefinedNumber: JSUndefinedOr<Double>.bridgeJSLiftParameter(undefinedNumberIsSome, undefinedNumberValue))
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_OptionalSupportExports_static_compareAPIResults")
+@_cdecl("bjs_OptionalSupportExports_static_compareAPIResults")
+public func _bjs_OptionalSupportExports_static_compareAPIResults(_ r1IsSome: Int32, _ r1CaseId: Int32, _ r2IsSome: Int32, _ r2CaseId: Int32) -> Void {
+    #if arch(wasm32)
+    let _tmp_r2 = Optional<APIResult>.bridgeJSLiftParameter(r2IsSome, r2CaseId)
+    let _tmp_r1 = Optional<APIResult>.bridgeJSLiftParameter(r1IsSome, r1CaseId)
+    let ret = OptionalSupportExports.compareAPIResults(_: _tmp_r1, _: _tmp_r2)
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+extension OptionalAllTypesResult: _BridgedSwiftAssociatedValueEnum {
+    @_spi(BridgeJS) @_transparent public static func bridgeJSStackPopPayload(_ caseId: Int32) -> OptionalAllTypesResult {
+        switch caseId {
+        case 0:
+            return .optStruct(Optional<Address>.bridgeJSStackPop())
+        case 1:
+            return .optClass(Optional<Greeter>.bridgeJSStackPop())
+        case 2:
+            return .optJSObject(Optional<JSObject>.bridgeJSStackPop())
+        case 3:
+            return .optNestedEnum(Optional<APIResult>.bridgeJSStackPop())
+        case 4:
+            return .optArray(Optional<[Int]>.bridgeJSStackPop())
+        case 5:
+            return .optJsClass(Optional<JSObject>.bridgeJSStackPop().map { Foo(unsafelyWrapping: $0) })
+        case 6:
+            return .empty
+        default:
+            fatalError("Unknown OptionalAllTypesResult case ID: \(caseId)")
+        }
+    }
+
+    @_spi(BridgeJS) @_transparent public consuming func bridgeJSStackPushPayload() -> Int32 {
+        switch self {
+        case .optStruct(let param0):
+            param0.bridgeJSStackPush()
+            return Int32(0)
+        case .optClass(let param0):
+            param0.bridgeJSStackPush()
+            return Int32(1)
+        case .optJSObject(let param0):
+            param0.bridgeJSStackPush()
+            return Int32(2)
+        case .optNestedEnum(let param0):
+            param0.bridgeJSStackPush()
+            return Int32(3)
+        case .optArray(let param0):
+            param0.bridgeJSStackPush()
+            return Int32(4)
+        case .optJsClass(let param0):
+            param0.bridgeJSStackPush()
+            return Int32(5)
+        case .empty:
+            return Int32(6)
+        }
+    }
+}
+
+extension APIOptionalResult: _BridgedSwiftAssociatedValueEnum {
+    @_spi(BridgeJS) @_transparent public static func bridgeJSStackPopPayload(_ caseId: Int32) -> APIOptionalResult {
+        switch caseId {
+        case 0:
+            return .success(Optional<String>.bridgeJSStackPop())
+        case 1:
+            return .failure(Optional<Int>.bridgeJSStackPop(), Optional<Bool>.bridgeJSStackPop())
+        case 2:
+            return .status(Optional<Bool>.bridgeJSStackPop(), Optional<Int>.bridgeJSStackPop(), Optional<String>.bridgeJSStackPop())
+        default:
+            fatalError("Unknown APIOptionalResult case ID: \(caseId)")
+        }
+    }
+
+    @_spi(BridgeJS) @_transparent public consuming func bridgeJSStackPushPayload() -> Int32 {
+        switch self {
+        case .success(let param0):
+            param0.bridgeJSStackPush()
+            return Int32(0)
+        case .failure(let param0, let param1):
+            param0.bridgeJSStackPush()
+            param1.bridgeJSStackPush()
+            return Int32(1)
+        case .status(let param0, let param1, let param2):
+            param0.bridgeJSStackPush()
+            param1.bridgeJSStackPush()
+            param2.bridgeJSStackPush()
+            return Int32(2)
+        }
+    }
+}
+
+extension JSCoordinate: _BridgedSwiftStruct {
+    @_spi(BridgeJS) @_transparent public static func bridgeJSStackPop() -> JSCoordinate {
+        let longitude = Double.bridgeJSStackPop()
+        let latitude = Double.bridgeJSStackPop()
+        return JSCoordinate(latitude: latitude, longitude: longitude)
+    }
+
+    @_spi(BridgeJS) @_transparent public consuming func bridgeJSStackPush() {
+        self.latitude.bridgeJSStackPush()
+        self.longitude.bridgeJSStackPush()
+    }
+
+    init(unsafelyCopying jsObject: JSObject) {
+        _bjs_struct_lower_JSCoordinate(jsObject.bridgeJSLowerParameter())
+        self = Self.bridgeJSStackPop()
+    }
+
+    func toJSObject() -> JSObject {
+        let __bjs_self = self
+        __bjs_self.bridgeJSStackPush()
+        return JSObject(id: UInt32(bitPattern: _bjs_struct_lift_JSCoordinate()))
+    }
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "swift_js_struct_lower_JSCoordinate")
+fileprivate func _bjs_struct_lower_JSCoordinate_extern(_ objectId: Int32) -> Void
+#else
+fileprivate func _bjs_struct_lower_JSCoordinate_extern(_ objectId: Int32) -> Void {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func _bjs_struct_lower_JSCoordinate(_ objectId: Int32) -> Void {
+    return _bjs_struct_lower_JSCoordinate_extern(objectId)
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "swift_js_struct_lift_JSCoordinate")
+fileprivate func _bjs_struct_lift_JSCoordinate_extern() -> Int32
+#else
+fileprivate func _bjs_struct_lift_JSCoordinate_extern() -> Int32 {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func _bjs_struct_lift_JSCoordinate() -> Int32 {
+    return _bjs_struct_lift_JSCoordinate_extern()
+}
+
+@_expose(wasm, "bjs_JSCoordinate_init")
+@_cdecl("bjs_JSCoordinate_init")
+public func _bjs_JSCoordinate_init(_ latitude: Float64, _ longitude: Float64) -> Void {
+    #if arch(wasm32)
+    let ret = JSCoordinate(latitude: Double.bridgeJSLiftParameter(latitude), longitude: Double.bridgeJSLiftParameter(longitude))
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+extension NestedStructGroupA.Metadata: _BridgedSwiftStruct {
+    @_spi(BridgeJS) @_transparent public static func bridgeJSStackPop() -> NestedStructGroupA.Metadata {
+        let count = Int.bridgeJSStackPop()
+        let label = String.bridgeJSStackPop()
+        return NestedStructGroupA.Metadata(label: label, count: count)
+    }
+
+    @_spi(BridgeJS) @_transparent public consuming func bridgeJSStackPush() {
+        self.label.bridgeJSStackPush()
+        self.count.bridgeJSStackPush()
+    }
+
+    init(unsafelyCopying jsObject: JSObject) {
+        _bjs_struct_lower_NestedStructGroupA_Metadata(jsObject.bridgeJSLowerParameter())
+        self = Self.bridgeJSStackPop()
+    }
+
+    func toJSObject() -> JSObject {
+        let __bjs_self = self
+        __bjs_self.bridgeJSStackPush()
+        return JSObject(id: UInt32(bitPattern: _bjs_struct_lift_NestedStructGroupA_Metadata()))
+    }
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "swift_js_struct_lower_NestedStructGroupA_Metadata")
+fileprivate func _bjs_struct_lower_NestedStructGroupA_Metadata_extern(_ objectId: Int32) -> Void
+#else
+fileprivate func _bjs_struct_lower_NestedStructGroupA_Metadata_extern(_ objectId: Int32) -> Void {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func _bjs_struct_lower_NestedStructGroupA_Metadata(_ objectId: Int32) -> Void {
+    return _bjs_struct_lower_NestedStructGroupA_Metadata_extern(objectId)
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "swift_js_struct_lift_NestedStructGroupA_Metadata")
+fileprivate func _bjs_struct_lift_NestedStructGroupA_Metadata_extern() -> Int32
+#else
+fileprivate func _bjs_struct_lift_NestedStructGroupA_Metadata_extern() -> Int32 {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func _bjs_struct_lift_NestedStructGroupA_Metadata() -> Int32 {
+    return _bjs_struct_lift_NestedStructGroupA_Metadata_extern()
+}
+
+extension NestedStructGroupB.Metadata: _BridgedSwiftStruct {
+    @_spi(BridgeJS) @_transparent public static func bridgeJSStackPop() -> NestedStructGroupB.Metadata {
+        let value = Double.bridgeJSStackPop()
+        let tag = String.bridgeJSStackPop()
+        return NestedStructGroupB.Metadata(tag: tag, value: value)
+    }
+
+    @_spi(BridgeJS) @_transparent public consuming func bridgeJSStackPush() {
+        self.tag.bridgeJSStackPush()
+        self.value.bridgeJSStackPush()
+    }
+
+    init(unsafelyCopying jsObject: JSObject) {
+        _bjs_struct_lower_NestedStructGroupB_Metadata(jsObject.bridgeJSLowerParameter())
+        self = Self.bridgeJSStackPop()
+    }
+
+    func toJSObject() -> JSObject {
+        let __bjs_self = self
+        __bjs_self.bridgeJSStackPush()
+        return JSObject(id: UInt32(bitPattern: _bjs_struct_lift_NestedStructGroupB_Metadata()))
+    }
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "swift_js_struct_lower_NestedStructGroupB_Metadata")
+fileprivate func _bjs_struct_lower_NestedStructGroupB_Metadata_extern(_ objectId: Int32) -> Void
+#else
+fileprivate func _bjs_struct_lower_NestedStructGroupB_Metadata_extern(_ objectId: Int32) -> Void {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func _bjs_struct_lower_NestedStructGroupB_Metadata(_ objectId: Int32) -> Void {
+    return _bjs_struct_lower_NestedStructGroupB_Metadata_extern(objectId)
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "swift_js_struct_lift_NestedStructGroupB_Metadata")
+fileprivate func _bjs_struct_lift_NestedStructGroupB_Metadata_extern() -> Int32
+#else
+fileprivate func _bjs_struct_lift_NestedStructGroupB_Metadata_extern() -> Int32 {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func _bjs_struct_lift_NestedStructGroupB_Metadata() -> Int32 {
+    return _bjs_struct_lift_NestedStructGroupB_Metadata_extern()
+}
+
+extension NestedTypeHost.Label: _BridgedSwiftStruct {
+    @_spi(BridgeJS) @_transparent public static func bridgeJSStackPop() -> NestedTypeHost.Label {
+        let text = String.bridgeJSStackPop()
+        return NestedTypeHost.Label(text: text)
+    }
+
+    @_spi(BridgeJS) @_transparent public consuming func bridgeJSStackPush() {
+        self.text.bridgeJSStackPush()
+    }
+
+    init(unsafelyCopying jsObject: JSObject) {
+        _bjs_struct_lower_NestedTypeHost_Label(jsObject.bridgeJSLowerParameter())
+        self = Self.bridgeJSStackPop()
+    }
+
+    func toJSObject() -> JSObject {
+        let __bjs_self = self
+        __bjs_self.bridgeJSStackPush()
+        return JSObject(id: UInt32(bitPattern: _bjs_struct_lift_NestedTypeHost_Label()))
+    }
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "swift_js_struct_lower_NestedTypeHost_Label")
+fileprivate func _bjs_struct_lower_NestedTypeHost_Label_extern(_ objectId: Int32) -> Void
+#else
+fileprivate func _bjs_struct_lower_NestedTypeHost_Label_extern(_ objectId: Int32) -> Void {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func _bjs_struct_lower_NestedTypeHost_Label(_ objectId: Int32) -> Void {
+    return _bjs_struct_lower_NestedTypeHost_Label_extern(objectId)
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "swift_js_struct_lift_NestedTypeHost_Label")
+fileprivate func _bjs_struct_lift_NestedTypeHost_Label_extern() -> Int32
+#else
+fileprivate func _bjs_struct_lift_NestedTypeHost_Label_extern() -> Int32 {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func _bjs_struct_lift_NestedTypeHost_Label() -> Int32 {
+    return _bjs_struct_lift_NestedTypeHost_Label_extern()
+}
+
+@_expose(wasm, "bjs_NestedTypeHost_Label_init")
+@_cdecl("bjs_NestedTypeHost_Label_init")
+public func _bjs_NestedTypeHost_Label_init(_ textBytes: Int32, _ textLength: Int32) -> Void {
+    #if arch(wasm32)
+    let ret = NestedTypeHost.Label(text: String.bridgeJSLiftParameter(textBytes, textLength))
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_NestedTypeHost_Label_static_maxLength_get")
+@_cdecl("bjs_NestedTypeHost_Label_static_maxLength_get")
+public func _bjs_NestedTypeHost_Label_static_maxLength_get() -> Int32 {
+    #if arch(wasm32)
+    let ret = NestedTypeHost.Label.maxLength
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_NestedTypeHost_Label_static_untitled")
+@_cdecl("bjs_NestedTypeHost_Label_static_untitled")
+public func _bjs_NestedTypeHost_Label_static_untitled() -> Void {
+    #if arch(wasm32)
+    let ret = NestedTypeHost.Label.untitled()
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+extension Library.Shelf: _BridgedSwiftStruct {
+    @_spi(BridgeJS) @_transparent public static func bridgeJSStackPop() -> Library.Shelf {
+        let label = String.bridgeJSStackPop()
+        return Library.Shelf(label: label)
+    }
+
+    @_spi(BridgeJS) @_transparent public consuming func bridgeJSStackPush() {
+        self.label.bridgeJSStackPush()
+    }
+
+    init(unsafelyCopying jsObject: JSObject) {
+        _bjs_struct_lower_Library_Shelf(jsObject.bridgeJSLowerParameter())
+        self = Self.bridgeJSStackPop()
+    }
+
+    func toJSObject() -> JSObject {
+        let __bjs_self = self
+        __bjs_self.bridgeJSStackPush()
+        return JSObject(id: UInt32(bitPattern: _bjs_struct_lift_Library_Shelf()))
+    }
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "swift_js_struct_lower_Library_Shelf")
+fileprivate func _bjs_struct_lower_Library_Shelf_extern(_ objectId: Int32) -> Void
+#else
+fileprivate func _bjs_struct_lower_Library_Shelf_extern(_ objectId: Int32) -> Void {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func _bjs_struct_lower_Library_Shelf(_ objectId: Int32) -> Void {
+    return _bjs_struct_lower_Library_Shelf_extern(objectId)
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "swift_js_struct_lift_Library_Shelf")
+fileprivate func _bjs_struct_lift_Library_Shelf_extern() -> Int32
+#else
+fileprivate func _bjs_struct_lift_Library_Shelf_extern() -> Int32 {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func _bjs_struct_lift_Library_Shelf() -> Int32 {
+    return _bjs_struct_lift_Library_Shelf_extern()
+}
+
+@_expose(wasm, "bjs_Library_Shelf_init")
+@_cdecl("bjs_Library_Shelf_init")
+public func _bjs_Library_Shelf_init(_ labelBytes: Int32, _ labelLength: Int32) -> Void {
+    #if arch(wasm32)
+    let ret = Library.Shelf(label: String.bridgeJSLiftParameter(labelBytes, labelLength))
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_Library_Shelf_static_capacity_get")
+@_cdecl("bjs_Library_Shelf_static_capacity_get")
+public func _bjs_Library_Shelf_static_capacity_get() -> Int32 {
+    #if arch(wasm32)
+    let ret = Library.Shelf.capacity
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_Library_Shelf_describeShelf")
+@_cdecl("bjs_Library_Shelf_describeShelf")
+public func _bjs_Library_Shelf_describeShelf() -> Void {
+    #if arch(wasm32)
+    let ret = Library.Shelf.bridgeJSLiftParameter().describeShelf()
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+extension Library.Shelf.Divider: _BridgedSwiftStruct {
+    @_spi(BridgeJS) @_transparent public static func bridgeJSStackPop() -> Library.Shelf.Divider {
+        let slot = Int.bridgeJSStackPop()
+        return Library.Shelf.Divider(slot: slot)
+    }
+
+    @_spi(BridgeJS) @_transparent public consuming func bridgeJSStackPush() {
+        self.slot.bridgeJSStackPush()
+    }
+
+    init(unsafelyCopying jsObject: JSObject) {
+        _bjs_struct_lower_Library_Shelf_Divider(jsObject.bridgeJSLowerParameter())
+        self = Self.bridgeJSStackPop()
+    }
+
+    func toJSObject() -> JSObject {
+        let __bjs_self = self
+        __bjs_self.bridgeJSStackPush()
+        return JSObject(id: UInt32(bitPattern: _bjs_struct_lift_Library_Shelf_Divider()))
+    }
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "swift_js_struct_lower_Library_Shelf_Divider")
+fileprivate func _bjs_struct_lower_Library_Shelf_Divider_extern(_ objectId: Int32) -> Void
+#else
+fileprivate func _bjs_struct_lower_Library_Shelf_Divider_extern(_ objectId: Int32) -> Void {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func _bjs_struct_lower_Library_Shelf_Divider(_ objectId: Int32) -> Void {
+    return _bjs_struct_lower_Library_Shelf_Divider_extern(objectId)
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "swift_js_struct_lift_Library_Shelf_Divider")
+fileprivate func _bjs_struct_lift_Library_Shelf_Divider_extern() -> Int32
+#else
+fileprivate func _bjs_struct_lift_Library_Shelf_Divider_extern() -> Int32 {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func _bjs_struct_lift_Library_Shelf_Divider() -> Int32 {
+    return _bjs_struct_lift_Library_Shelf_Divider_extern()
+}
+
+@_expose(wasm, "bjs_Library_Shelf_Divider_init")
+@_cdecl("bjs_Library_Shelf_Divider_init")
+public func _bjs_Library_Shelf_Divider_init(_ slot: Int32) -> Void {
+    #if arch(wasm32)
+    let ret = Library.Shelf.Divider(slot: Int.bridgeJSLiftParameter(slot))
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+extension GenericRTPoint: _BridgedSwiftStruct {
+    @_spi(BridgeJS) @_transparent public static func bridgeJSStackPop() -> GenericRTPoint {
+        let y = Int.bridgeJSStackPop()
+        let x = Int.bridgeJSStackPop()
+        return GenericRTPoint(x: x, y: y)
+    }
+
+    @_spi(BridgeJS) @_transparent public consuming func bridgeJSStackPush() {
+        self.x.bridgeJSStackPush()
+        self.y.bridgeJSStackPush()
+    }
+
+    init(unsafelyCopying jsObject: JSObject) {
+        _bjs_struct_lower_GenericRTPoint(jsObject.bridgeJSLowerParameter())
+        self = Self.bridgeJSStackPop()
+    }
+
+    func toJSObject() -> JSObject {
+        let __bjs_self = self
+        __bjs_self.bridgeJSStackPush()
+        return JSObject(id: UInt32(bitPattern: _bjs_struct_lift_GenericRTPoint()))
+    }
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "swift_js_struct_lower_GenericRTPoint")
+fileprivate func _bjs_struct_lower_GenericRTPoint_extern(_ objectId: Int32) -> Void
+#else
+fileprivate func _bjs_struct_lower_GenericRTPoint_extern(_ objectId: Int32) -> Void {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func _bjs_struct_lower_GenericRTPoint(_ objectId: Int32) -> Void {
+    return _bjs_struct_lower_GenericRTPoint_extern(objectId)
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "swift_js_struct_lift_GenericRTPoint")
+fileprivate func _bjs_struct_lift_GenericRTPoint_extern() -> Int32
+#else
+fileprivate func _bjs_struct_lift_GenericRTPoint_extern() -> Int32 {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func _bjs_struct_lift_GenericRTPoint() -> Int32 {
+    return _bjs_struct_lift_GenericRTPoint_extern()
+}
+
+extension GenericRTNamespace.Metadata: _BridgedSwiftStruct {
+    @_spi(BridgeJS) @_transparent public static func bridgeJSStackPop() -> GenericRTNamespace.Metadata {
+        let count = Int.bridgeJSStackPop()
+        let label = String.bridgeJSStackPop()
+        return GenericRTNamespace.Metadata(label: label, count: count)
+    }
+
+    @_spi(BridgeJS) @_transparent public consuming func bridgeJSStackPush() {
+        self.label.bridgeJSStackPush()
+        self.count.bridgeJSStackPush()
+    }
+
+    init(unsafelyCopying jsObject: JSObject) {
+        _bjs_struct_lower_GenericRTNamespace_Metadata(jsObject.bridgeJSLowerParameter())
+        self = Self.bridgeJSStackPop()
+    }
+
+    func toJSObject() -> JSObject {
+        let __bjs_self = self
+        __bjs_self.bridgeJSStackPush()
+        return JSObject(id: UInt32(bitPattern: _bjs_struct_lift_GenericRTNamespace_Metadata()))
+    }
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "swift_js_struct_lower_GenericRTNamespace_Metadata")
+fileprivate func _bjs_struct_lower_GenericRTNamespace_Metadata_extern(_ objectId: Int32) -> Void
+#else
+fileprivate func _bjs_struct_lower_GenericRTNamespace_Metadata_extern(_ objectId: Int32) -> Void {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func _bjs_struct_lower_GenericRTNamespace_Metadata(_ objectId: Int32) -> Void {
+    return _bjs_struct_lower_GenericRTNamespace_Metadata_extern(objectId)
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "swift_js_struct_lift_GenericRTNamespace_Metadata")
+fileprivate func _bjs_struct_lift_GenericRTNamespace_Metadata_extern() -> Int32
+#else
+fileprivate func _bjs_struct_lift_GenericRTNamespace_Metadata_extern() -> Int32 {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func _bjs_struct_lift_GenericRTNamespace_Metadata() -> Int32 {
+    return _bjs_struct_lift_GenericRTNamespace_Metadata_extern()
+}
+
+extension Point: _BridgedSwiftStruct {
+    @_spi(BridgeJS) @_transparent public static func bridgeJSStackPop() -> Point {
+        let y = Int.bridgeJSStackPop()
+        let x = Int.bridgeJSStackPop()
+        return Point(x: x, y: y)
+    }
+
+    @_spi(BridgeJS) @_transparent public consuming func bridgeJSStackPush() {
+        self.x.bridgeJSStackPush()
+        self.y.bridgeJSStackPush()
+    }
+
+    init(unsafelyCopying jsObject: JSObject) {
+        _bjs_struct_lower_Point(jsObject.bridgeJSLowerParameter())
+        self = Self.bridgeJSStackPop()
+    }
+
+    func toJSObject() -> JSObject {
+        let __bjs_self = self
+        __bjs_self.bridgeJSStackPush()
+        return JSObject(id: UInt32(bitPattern: _bjs_struct_lift_Point()))
+    }
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "swift_js_struct_lower_Point")
+fileprivate func _bjs_struct_lower_Point_extern(_ objectId: Int32) -> Void
+#else
+fileprivate func _bjs_struct_lower_Point_extern(_ objectId: Int32) -> Void {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func _bjs_struct_lower_Point(_ objectId: Int32) -> Void {
+    return _bjs_struct_lower_Point_extern(objectId)
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "swift_js_struct_lift_Point")
+fileprivate func _bjs_struct_lift_Point_extern() -> Int32
+#else
+fileprivate func _bjs_struct_lift_Point_extern() -> Int32 {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func _bjs_struct_lift_Point() -> Int32 {
+    return _bjs_struct_lift_Point_extern()
+}
+
+extension PointerFields: _BridgedSwiftStruct {
+    @_spi(BridgeJS) @_transparent public static func bridgeJSStackPop() -> PointerFields {
+        let mutPtr = UnsafeMutablePointer<UInt8>.bridgeJSStackPop()
+        let ptr = UnsafePointer<UInt8>.bridgeJSStackPop()
+        let opaque = OpaquePointer.bridgeJSStackPop()
+        let mutRaw = UnsafeMutableRawPointer.bridgeJSStackPop()
+        let raw = UnsafeRawPointer.bridgeJSStackPop()
+        return PointerFields(raw: raw, mutRaw: mutRaw, opaque: opaque, ptr: ptr, mutPtr: mutPtr)
+    }
+
+    @_spi(BridgeJS) @_transparent public consuming func bridgeJSStackPush() {
+        self.raw.bridgeJSStackPush()
+        self.mutRaw.bridgeJSStackPush()
+        self.opaque.bridgeJSStackPush()
+        self.ptr.bridgeJSStackPush()
+        self.mutPtr.bridgeJSStackPush()
+    }
+
+    init(unsafelyCopying jsObject: JSObject) {
+        _bjs_struct_lower_PointerFields(jsObject.bridgeJSLowerParameter())
+        self = Self.bridgeJSStackPop()
+    }
+
+    func toJSObject() -> JSObject {
+        let __bjs_self = self
+        __bjs_self.bridgeJSStackPush()
+        return JSObject(id: UInt32(bitPattern: _bjs_struct_lift_PointerFields()))
+    }
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "swift_js_struct_lower_PointerFields")
+fileprivate func _bjs_struct_lower_PointerFields_extern(_ objectId: Int32) -> Void
+#else
+fileprivate func _bjs_struct_lower_PointerFields_extern(_ objectId: Int32) -> Void {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func _bjs_struct_lower_PointerFields(_ objectId: Int32) -> Void {
+    return _bjs_struct_lower_PointerFields_extern(objectId)
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "swift_js_struct_lift_PointerFields")
+fileprivate func _bjs_struct_lift_PointerFields_extern() -> Int32
+#else
+fileprivate func _bjs_struct_lift_PointerFields_extern() -> Int32 {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func _bjs_struct_lift_PointerFields() -> Int32 {
+    return _bjs_struct_lift_PointerFields_extern()
+}
+
+@_expose(wasm, "bjs_PointerFields_init")
+@_cdecl("bjs_PointerFields_init")
+public func _bjs_PointerFields_init(_ raw: UnsafeMutableRawPointer, _ mutRaw: UnsafeMutableRawPointer, _ opaque: UnsafeMutableRawPointer, _ ptr: UnsafeMutableRawPointer, _ mutPtr: UnsafeMutableRawPointer) -> Void {
+    #if arch(wasm32)
+    let ret = PointerFields(raw: UnsafeRawPointer.bridgeJSLiftParameter(raw), mutRaw: UnsafeMutableRawPointer.bridgeJSLiftParameter(mutRaw), opaque: OpaquePointer.bridgeJSLiftParameter(opaque), ptr: UnsafePointer<UInt8>.bridgeJSLiftParameter(ptr), mutPtr: UnsafeMutablePointer<UInt8>.bridgeJSLiftParameter(mutPtr))
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+extension DataPoint: _BridgedSwiftStruct {
+    @_spi(BridgeJS) @_transparent public static func bridgeJSStackPop() -> DataPoint {
+        let optFlag = Optional<Bool>.bridgeJSStackPop()
+        let optCount = Optional<Int>.bridgeJSStackPop()
+        let label = String.bridgeJSStackPop()
+        let y = Double.bridgeJSStackPop()
+        let x = Double.bridgeJSStackPop()
+        return DataPoint(x: x, y: y, label: label, optCount: optCount, optFlag: optFlag)
+    }
+
+    @_spi(BridgeJS) @_transparent public consuming func bridgeJSStackPush() {
+        self.x.bridgeJSStackPush()
+        self.y.bridgeJSStackPush()
+        self.label.bridgeJSStackPush()
+        self.optCount.bridgeJSStackPush()
+        self.optFlag.bridgeJSStackPush()
+    }
+
+    init(unsafelyCopying jsObject: JSObject) {
+        _bjs_struct_lower_DataPoint(jsObject.bridgeJSLowerParameter())
+        self = Self.bridgeJSStackPop()
+    }
+
+    func toJSObject() -> JSObject {
+        let __bjs_self = self
+        __bjs_self.bridgeJSStackPush()
+        return JSObject(id: UInt32(bitPattern: _bjs_struct_lift_DataPoint()))
+    }
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "swift_js_struct_lower_DataPoint")
+fileprivate func _bjs_struct_lower_DataPoint_extern(_ objectId: Int32) -> Void
+#else
+fileprivate func _bjs_struct_lower_DataPoint_extern(_ objectId: Int32) -> Void {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func _bjs_struct_lower_DataPoint(_ objectId: Int32) -> Void {
+    return _bjs_struct_lower_DataPoint_extern(objectId)
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "swift_js_struct_lift_DataPoint")
+fileprivate func _bjs_struct_lift_DataPoint_extern() -> Int32
+#else
+fileprivate func _bjs_struct_lift_DataPoint_extern() -> Int32 {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func _bjs_struct_lift_DataPoint() -> Int32 {
+    return _bjs_struct_lift_DataPoint_extern()
+}
+
+@_expose(wasm, "bjs_DataPoint_init")
+@_cdecl("bjs_DataPoint_init")
+public func _bjs_DataPoint_init(_ x: Float64, _ y: Float64, _ labelBytes: Int32, _ labelLength: Int32, _ optCountIsSome: Int32, _ optCountValue: Int32, _ optFlagIsSome: Int32, _ optFlagValue: Int32) -> Void {
+    #if arch(wasm32)
+    let ret = DataPoint(x: Double.bridgeJSLiftParameter(x), y: Double.bridgeJSLiftParameter(y), label: String.bridgeJSLiftParameter(labelBytes, labelLength), optCount: Optional<Int>.bridgeJSLiftParameter(optCountIsSome, optCountValue), optFlag: Optional<Bool>.bridgeJSLiftParameter(optFlagIsSome, optFlagValue))
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_DataPoint_static_dimensions_get")
+@_cdecl("bjs_DataPoint_static_dimensions_get")
+public func _bjs_DataPoint_static_dimensions_get() -> Int32 {
+    #if arch(wasm32)
+    let ret = DataPoint.dimensions
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_DataPoint_static_origin")
+@_cdecl("bjs_DataPoint_static_origin")
+public func _bjs_DataPoint_static_origin() -> Void {
+    #if arch(wasm32)
+    let ret = DataPoint.origin()
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+extension PublicPoint: _BridgedSwiftStruct {
+    @_spi(BridgeJS) @_transparent public static func bridgeJSStackPop() -> PublicPoint {
+        let y = Int.bridgeJSStackPop()
+        let x = Int.bridgeJSStackPop()
+        return PublicPoint(x: x, y: y)
+    }
+
+    @_spi(BridgeJS) @_transparent public consuming func bridgeJSStackPush() {
+        self.x.bridgeJSStackPush()
+        self.y.bridgeJSStackPush()
+    }
+
+    public init(unsafelyCopying jsObject: JSObject) {
+        _bjs_struct_lower_PublicPoint(jsObject.bridgeJSLowerParameter())
+        self = Self.bridgeJSStackPop()
+    }
+
+    public func toJSObject() -> JSObject {
+        let __bjs_self = self
+        __bjs_self.bridgeJSStackPush()
+        return JSObject(id: UInt32(bitPattern: _bjs_struct_lift_PublicPoint()))
+    }
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "swift_js_struct_lower_PublicPoint")
+fileprivate func _bjs_struct_lower_PublicPoint_extern(_ objectId: Int32) -> Void
+#else
+fileprivate func _bjs_struct_lower_PublicPoint_extern(_ objectId: Int32) -> Void {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func _bjs_struct_lower_PublicPoint(_ objectId: Int32) -> Void {
+    return _bjs_struct_lower_PublicPoint_extern(objectId)
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "swift_js_struct_lift_PublicPoint")
+fileprivate func _bjs_struct_lift_PublicPoint_extern() -> Int32
+#else
+fileprivate func _bjs_struct_lift_PublicPoint_extern() -> Int32 {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func _bjs_struct_lift_PublicPoint() -> Int32 {
+    return _bjs_struct_lift_PublicPoint_extern()
+}
+
+@_expose(wasm, "bjs_PublicPoint_init")
+@_cdecl("bjs_PublicPoint_init")
+public func _bjs_PublicPoint_init(_ x: Int32, _ y: Int32) -> Void {
+    #if arch(wasm32)
+    let ret = PublicPoint(x: Int.bridgeJSLiftParameter(x), y: Int.bridgeJSLiftParameter(y))
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+extension Address: _BridgedSwiftStruct {
+    @_spi(BridgeJS) @_transparent public static func bridgeJSStackPop() -> Address {
+        let zipCode = Optional<Int>.bridgeJSStackPop()
+        let city = String.bridgeJSStackPop()
+        let street = String.bridgeJSStackPop()
+        return Address(street: street, city: city, zipCode: zipCode)
+    }
+
+    @_spi(BridgeJS) @_transparent public consuming func bridgeJSStackPush() {
+        self.street.bridgeJSStackPush()
+        self.city.bridgeJSStackPush()
+        self.zipCode.bridgeJSStackPush()
+    }
+
+    init(unsafelyCopying jsObject: JSObject) {
+        _bjs_struct_lower_Address(jsObject.bridgeJSLowerParameter())
+        self = Self.bridgeJSStackPop()
+    }
+
+    func toJSObject() -> JSObject {
+        let __bjs_self = self
+        __bjs_self.bridgeJSStackPush()
+        return JSObject(id: UInt32(bitPattern: _bjs_struct_lift_Address()))
+    }
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "swift_js_struct_lower_Address")
+fileprivate func _bjs_struct_lower_Address_extern(_ objectId: Int32) -> Void
+#else
+fileprivate func _bjs_struct_lower_Address_extern(_ objectId: Int32) -> Void {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func _bjs_struct_lower_Address(_ objectId: Int32) -> Void {
+    return _bjs_struct_lower_Address_extern(objectId)
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "swift_js_struct_lift_Address")
+fileprivate func _bjs_struct_lift_Address_extern() -> Int32
+#else
+fileprivate func _bjs_struct_lift_Address_extern() -> Int32 {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func _bjs_struct_lift_Address() -> Int32 {
+    return _bjs_struct_lift_Address_extern()
+}
+
+extension Contact: _BridgedSwiftStruct {
+    @_spi(BridgeJS) @_transparent public static func bridgeJSStackPop() -> Contact {
+        let secondaryAddress = Optional<Address>.bridgeJSStackPop()
+        let email = Optional<String>.bridgeJSStackPop()
+        let address = Address.bridgeJSStackPop()
+        let age = Int.bridgeJSStackPop()
+        let name = String.bridgeJSStackPop()
+        return Contact(name: name, age: age, address: address, email: email, secondaryAddress: secondaryAddress)
+    }
+
+    @_spi(BridgeJS) @_transparent public consuming func bridgeJSStackPush() {
+        self.name.bridgeJSStackPush()
+        self.age.bridgeJSStackPush()
+        self.address.bridgeJSStackPush()
+        self.email.bridgeJSStackPush()
+        self.secondaryAddress.bridgeJSStackPush()
+    }
+
+    init(unsafelyCopying jsObject: JSObject) {
+        _bjs_struct_lower_Contact(jsObject.bridgeJSLowerParameter())
+        self = Self.bridgeJSStackPop()
+    }
+
+    func toJSObject() -> JSObject {
+        let __bjs_self = self
+        __bjs_self.bridgeJSStackPush()
+        return JSObject(id: UInt32(bitPattern: _bjs_struct_lift_Contact()))
+    }
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "swift_js_struct_lower_Contact")
+fileprivate func _bjs_struct_lower_Contact_extern(_ objectId: Int32) -> Void
+#else
+fileprivate func _bjs_struct_lower_Contact_extern(_ objectId: Int32) -> Void {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func _bjs_struct_lower_Contact(_ objectId: Int32) -> Void {
+    return _bjs_struct_lower_Contact_extern(objectId)
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "swift_js_struct_lift_Contact")
+fileprivate func _bjs_struct_lift_Contact_extern() -> Int32
+#else
+fileprivate func _bjs_struct_lift_Contact_extern() -> Int32 {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func _bjs_struct_lift_Contact() -> Int32 {
+    return _bjs_struct_lift_Contact_extern()
+}
+
+extension Config: _BridgedSwiftStruct {
+    @_spi(BridgeJS) @_transparent public static func bridgeJSStackPop() -> Config {
+        let status = Status.bridgeJSStackPop()
+        let direction = Optional<Direction>.bridgeJSStackPop()
+        let theme = Optional<Theme>.bridgeJSStackPop()
+        let name = String.bridgeJSStackPop()
+        return Config(name: name, theme: theme, direction: direction, status: status)
+    }
+
+    @_spi(BridgeJS) @_transparent public consuming func bridgeJSStackPush() {
+        self.name.bridgeJSStackPush()
+        self.theme.bridgeJSStackPush()
+        self.direction.bridgeJSStackPush()
+        self.status.bridgeJSStackPush()
+    }
+
+    init(unsafelyCopying jsObject: JSObject) {
+        _bjs_struct_lower_Config(jsObject.bridgeJSLowerParameter())
+        self = Self.bridgeJSStackPop()
+    }
+
+    func toJSObject() -> JSObject {
+        let __bjs_self = self
+        __bjs_self.bridgeJSStackPush()
+        return JSObject(id: UInt32(bitPattern: _bjs_struct_lift_Config()))
+    }
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "swift_js_struct_lower_Config")
+fileprivate func _bjs_struct_lower_Config_extern(_ objectId: Int32) -> Void
+#else
+fileprivate func _bjs_struct_lower_Config_extern(_ objectId: Int32) -> Void {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func _bjs_struct_lower_Config(_ objectId: Int32) -> Void {
+    return _bjs_struct_lower_Config_extern(objectId)
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "swift_js_struct_lift_Config")
+fileprivate func _bjs_struct_lift_Config_extern() -> Int32
+#else
+fileprivate func _bjs_struct_lift_Config_extern() -> Int32 {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func _bjs_struct_lift_Config() -> Int32 {
+    return _bjs_struct_lift_Config_extern()
+}
+
+extension SessionData: _BridgedSwiftStruct {
+    @_spi(BridgeJS) @_transparent public static func bridgeJSStackPop() -> SessionData {
+        let owner = Optional<Greeter>.bridgeJSStackPop()
+        let id = Int.bridgeJSStackPop()
+        return SessionData(id: id, owner: owner)
+    }
+
+    @_spi(BridgeJS) @_transparent public consuming func bridgeJSStackPush() {
+        self.id.bridgeJSStackPush()
+        self.owner.bridgeJSStackPush()
+    }
+
+    init(unsafelyCopying jsObject: JSObject) {
+        _bjs_struct_lower_SessionData(jsObject.bridgeJSLowerParameter())
+        self = Self.bridgeJSStackPop()
+    }
+
+    func toJSObject() -> JSObject {
+        let __bjs_self = self
+        __bjs_self.bridgeJSStackPush()
+        return JSObject(id: UInt32(bitPattern: _bjs_struct_lift_SessionData()))
+    }
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "swift_js_struct_lower_SessionData")
+fileprivate func _bjs_struct_lower_SessionData_extern(_ objectId: Int32) -> Void
+#else
+fileprivate func _bjs_struct_lower_SessionData_extern(_ objectId: Int32) -> Void {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func _bjs_struct_lower_SessionData(_ objectId: Int32) -> Void {
+    return _bjs_struct_lower_SessionData_extern(objectId)
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "swift_js_struct_lift_SessionData")
+fileprivate func _bjs_struct_lift_SessionData_extern() -> Int32
+#else
+fileprivate func _bjs_struct_lift_SessionData_extern() -> Int32 {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func _bjs_struct_lift_SessionData() -> Int32 {
+    return _bjs_struct_lift_SessionData_extern()
+}
+
+extension ValidationReport: _BridgedSwiftStruct {
+    @_spi(BridgeJS) @_transparent public static func bridgeJSStackPop() -> ValidationReport {
+        let outcome = Optional<APIResult>.bridgeJSStackPop()
+        let status = Optional<Status>.bridgeJSStackPop()
+        let result = APIResult.bridgeJSStackPop()
+        let id = Int.bridgeJSStackPop()
+        return ValidationReport(id: id, result: result, status: status, outcome: outcome)
+    }
+
+    @_spi(BridgeJS) @_transparent public consuming func bridgeJSStackPush() {
+        self.id.bridgeJSStackPush()
+        self.result.bridgeJSStackPush()
+        self.status.bridgeJSStackPush()
+        self.outcome.bridgeJSStackPush()
+    }
+
+    init(unsafelyCopying jsObject: JSObject) {
+        _bjs_struct_lower_ValidationReport(jsObject.bridgeJSLowerParameter())
+        self = Self.bridgeJSStackPop()
+    }
+
+    func toJSObject() -> JSObject {
+        let __bjs_self = self
+        __bjs_self.bridgeJSStackPush()
+        return JSObject(id: UInt32(bitPattern: _bjs_struct_lift_ValidationReport()))
+    }
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "swift_js_struct_lower_ValidationReport")
+fileprivate func _bjs_struct_lower_ValidationReport_extern(_ objectId: Int32) -> Void
+#else
+fileprivate func _bjs_struct_lower_ValidationReport_extern(_ objectId: Int32) -> Void {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func _bjs_struct_lower_ValidationReport(_ objectId: Int32) -> Void {
+    return _bjs_struct_lower_ValidationReport_extern(objectId)
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "swift_js_struct_lift_ValidationReport")
+fileprivate func _bjs_struct_lift_ValidationReport_extern() -> Int32
+#else
+fileprivate func _bjs_struct_lift_ValidationReport_extern() -> Int32 {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func _bjs_struct_lift_ValidationReport() -> Int32 {
+    return _bjs_struct_lift_ValidationReport_extern()
+}
+
+extension AdvancedConfig: _BridgedSwiftStruct {
+    @_spi(BridgeJS) @_transparent public static func bridgeJSStackPop() -> AdvancedConfig {
+        let overrideDefaults = Optional<ConfigStruct>.bridgeJSStackPop()
+        let defaults = ConfigStruct.bridgeJSStackPop()
+        let location = Optional<DataPoint>.bridgeJSStackPop()
+        let metadata = Optional<JSObject>.bridgeJSStackPop()
+        let result = Optional<APIResult>.bridgeJSStackPop()
+        let status = Status.bridgeJSStackPop()
+        let theme = Theme.bridgeJSStackPop()
+        let enabled = Bool.bridgeJSStackPop()
+        let title = String.bridgeJSStackPop()
+        let id = Int.bridgeJSStackPop()
+        return AdvancedConfig(id: id, title: title, enabled: enabled, theme: theme, status: status, result: result, metadata: metadata, location: location, defaults: defaults, overrideDefaults: overrideDefaults)
+    }
+
+    @_spi(BridgeJS) @_transparent public consuming func bridgeJSStackPush() {
+        self.id.bridgeJSStackPush()
+        self.title.bridgeJSStackPush()
+        self.enabled.bridgeJSStackPush()
+        self.theme.bridgeJSStackPush()
+        self.status.bridgeJSStackPush()
+        self.result.bridgeJSStackPush()
+        self.metadata.bridgeJSStackPush()
+        self.location.bridgeJSStackPush()
+        self.defaults.bridgeJSStackPush()
+        self.overrideDefaults.bridgeJSStackPush()
+    }
+
+    init(unsafelyCopying jsObject: JSObject) {
+        _bjs_struct_lower_AdvancedConfig(jsObject.bridgeJSLowerParameter())
+        self = Self.bridgeJSStackPop()
+    }
+
+    func toJSObject() -> JSObject {
+        let __bjs_self = self
+        __bjs_self.bridgeJSStackPush()
+        return JSObject(id: UInt32(bitPattern: _bjs_struct_lift_AdvancedConfig()))
+    }
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "swift_js_struct_lower_AdvancedConfig")
+fileprivate func _bjs_struct_lower_AdvancedConfig_extern(_ objectId: Int32) -> Void
+#else
+fileprivate func _bjs_struct_lower_AdvancedConfig_extern(_ objectId: Int32) -> Void {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func _bjs_struct_lower_AdvancedConfig(_ objectId: Int32) -> Void {
+    return _bjs_struct_lower_AdvancedConfig_extern(objectId)
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "swift_js_struct_lift_AdvancedConfig")
+fileprivate func _bjs_struct_lift_AdvancedConfig_extern() -> Int32
+#else
+fileprivate func _bjs_struct_lift_AdvancedConfig_extern() -> Int32 {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func _bjs_struct_lift_AdvancedConfig() -> Int32 {
+    return _bjs_struct_lift_AdvancedConfig_extern()
+}
+
+extension MeasurementConfig: _BridgedSwiftStruct {
+    @_spi(BridgeJS) @_transparent public static func bridgeJSStackPop() -> MeasurementConfig {
+        let optionalRatio = Optional<Ratio>.bridgeJSStackPop()
+        let optionalPrecision = Optional<Precision>.bridgeJSStackPop()
+        let ratio = Ratio.bridgeJSStackPop()
+        let precision = Precision.bridgeJSStackPop()
+        return MeasurementConfig(precision: precision, ratio: ratio, optionalPrecision: optionalPrecision, optionalRatio: optionalRatio)
+    }
+
+    @_spi(BridgeJS) @_transparent public consuming func bridgeJSStackPush() {
+        self.precision.bridgeJSStackPush()
+        self.ratio.bridgeJSStackPush()
+        self.optionalPrecision.bridgeJSStackPush()
+        self.optionalRatio.bridgeJSStackPush()
+    }
+
+    init(unsafelyCopying jsObject: JSObject) {
+        _bjs_struct_lower_MeasurementConfig(jsObject.bridgeJSLowerParameter())
+        self = Self.bridgeJSStackPop()
+    }
+
+    func toJSObject() -> JSObject {
+        let __bjs_self = self
+        __bjs_self.bridgeJSStackPush()
+        return JSObject(id: UInt32(bitPattern: _bjs_struct_lift_MeasurementConfig()))
+    }
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "swift_js_struct_lower_MeasurementConfig")
+fileprivate func _bjs_struct_lower_MeasurementConfig_extern(_ objectId: Int32) -> Void
+#else
+fileprivate func _bjs_struct_lower_MeasurementConfig_extern(_ objectId: Int32) -> Void {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func _bjs_struct_lower_MeasurementConfig(_ objectId: Int32) -> Void {
+    return _bjs_struct_lower_MeasurementConfig_extern(objectId)
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "swift_js_struct_lift_MeasurementConfig")
+fileprivate func _bjs_struct_lift_MeasurementConfig_extern() -> Int32
+#else
+fileprivate func _bjs_struct_lift_MeasurementConfig_extern() -> Int32 {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func _bjs_struct_lift_MeasurementConfig() -> Int32 {
+    return _bjs_struct_lift_MeasurementConfig_extern()
+}
+
+extension MathOperations: _BridgedSwiftStruct {
+    @_spi(BridgeJS) @_transparent public static func bridgeJSStackPop() -> MathOperations {
+        let baseValue = Double.bridgeJSStackPop()
+        return MathOperations(baseValue: baseValue)
+    }
+
+    @_spi(BridgeJS) @_transparent public consuming func bridgeJSStackPush() {
+        self.baseValue.bridgeJSStackPush()
+    }
+
+    init(unsafelyCopying jsObject: JSObject) {
+        _bjs_struct_lower_MathOperations(jsObject.bridgeJSLowerParameter())
+        self = Self.bridgeJSStackPop()
+    }
+
+    func toJSObject() -> JSObject {
+        let __bjs_self = self
+        __bjs_self.bridgeJSStackPush()
+        return JSObject(id: UInt32(bitPattern: _bjs_struct_lift_MathOperations()))
+    }
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "swift_js_struct_lower_MathOperations")
+fileprivate func _bjs_struct_lower_MathOperations_extern(_ objectId: Int32) -> Void
+#else
+fileprivate func _bjs_struct_lower_MathOperations_extern(_ objectId: Int32) -> Void {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func _bjs_struct_lower_MathOperations(_ objectId: Int32) -> Void {
+    return _bjs_struct_lower_MathOperations_extern(objectId)
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "swift_js_struct_lift_MathOperations")
+fileprivate func _bjs_struct_lift_MathOperations_extern() -> Int32
+#else
+fileprivate func _bjs_struct_lift_MathOperations_extern() -> Int32 {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func _bjs_struct_lift_MathOperations() -> Int32 {
+    return _bjs_struct_lift_MathOperations_extern()
+}
+
+@_expose(wasm, "bjs_MathOperations_init")
+@_cdecl("bjs_MathOperations_init")
+public func _bjs_MathOperations_init(_ baseValue: Float64) -> Void {
+    #if arch(wasm32)
+    let ret = MathOperations(baseValue: Double.bridgeJSLiftParameter(baseValue))
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_MathOperations_add")
+@_cdecl("bjs_MathOperations_add")
+public func _bjs_MathOperations_add(_ a: Float64, _ b: Float64) -> Float64 {
+    #if arch(wasm32)
+    let ret = MathOperations.bridgeJSLiftParameter().add(a: Double.bridgeJSLiftParameter(a), b: Double.bridgeJSLiftParameter(b))
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_MathOperations_multiply")
+@_cdecl("bjs_MathOperations_multiply")
+public func _bjs_MathOperations_multiply(_ a: Float64, _ b: Float64) -> Float64 {
+    #if arch(wasm32)
+    let ret = MathOperations.bridgeJSLiftParameter().multiply(a: Double.bridgeJSLiftParameter(a), b: Double.bridgeJSLiftParameter(b))
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_MathOperations_static_subtract")
+@_cdecl("bjs_MathOperations_static_subtract")
+public func _bjs_MathOperations_static_subtract(_ a: Float64, _ b: Float64) -> Float64 {
+    #if arch(wasm32)
+    let ret = MathOperations.subtract(a: Double.bridgeJSLiftParameter(a), b: Double.bridgeJSLiftParameter(b))
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+extension CopyableCart: _BridgedSwiftStruct {
+    @_spi(BridgeJS) @_transparent public static func bridgeJSStackPop() -> CopyableCart {
+        let note = Optional<String>.bridgeJSStackPop()
+        let x = Int.bridgeJSStackPop()
+        return CopyableCart(x: x, note: note)
+    }
+
+    @_spi(BridgeJS) @_transparent public consuming func bridgeJSStackPush() {
+        self.x.bridgeJSStackPush()
+        self.note.bridgeJSStackPush()
+    }
+
+    init(unsafelyCopying jsObject: JSObject) {
+        _bjs_struct_lower_CopyableCart(jsObject.bridgeJSLowerParameter())
+        self = Self.bridgeJSStackPop()
+    }
+
+    func toJSObject() -> JSObject {
+        let __bjs_self = self
+        __bjs_self.bridgeJSStackPush()
+        return JSObject(id: UInt32(bitPattern: _bjs_struct_lift_CopyableCart()))
+    }
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "swift_js_struct_lower_CopyableCart")
+fileprivate func _bjs_struct_lower_CopyableCart_extern(_ objectId: Int32) -> Void
+#else
+fileprivate func _bjs_struct_lower_CopyableCart_extern(_ objectId: Int32) -> Void {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func _bjs_struct_lower_CopyableCart(_ objectId: Int32) -> Void {
+    return _bjs_struct_lower_CopyableCart_extern(objectId)
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "swift_js_struct_lift_CopyableCart")
+fileprivate func _bjs_struct_lift_CopyableCart_extern() -> Int32
+#else
+fileprivate func _bjs_struct_lift_CopyableCart_extern() -> Int32 {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func _bjs_struct_lift_CopyableCart() -> Int32 {
+    return _bjs_struct_lift_CopyableCart_extern()
+}
+
+@_expose(wasm, "bjs_CopyableCart_static_fromJSObject")
+@_cdecl("bjs_CopyableCart_static_fromJSObject")
+public func _bjs_CopyableCart_static_fromJSObject(_ object: Int32) -> Void {
+    #if arch(wasm32)
+    let ret = CopyableCart.fromJSObject(_: JSObject.bridgeJSLiftParameter(object))
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+extension CopyableCartItem: _BridgedSwiftStruct {
+    @_spi(BridgeJS) @_transparent public static func bridgeJSStackPop() -> CopyableCartItem {
+        let quantity = Int.bridgeJSStackPop()
+        let sku = String.bridgeJSStackPop()
+        return CopyableCartItem(sku: sku, quantity: quantity)
+    }
+
+    @_spi(BridgeJS) @_transparent public consuming func bridgeJSStackPush() {
+        self.sku.bridgeJSStackPush()
+        self.quantity.bridgeJSStackPush()
+    }
+
+    init(unsafelyCopying jsObject: JSObject) {
+        _bjs_struct_lower_CopyableCartItem(jsObject.bridgeJSLowerParameter())
+        self = Self.bridgeJSStackPop()
+    }
+
+    func toJSObject() -> JSObject {
+        let __bjs_self = self
+        __bjs_self.bridgeJSStackPush()
+        return JSObject(id: UInt32(bitPattern: _bjs_struct_lift_CopyableCartItem()))
+    }
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "swift_js_struct_lower_CopyableCartItem")
+fileprivate func _bjs_struct_lower_CopyableCartItem_extern(_ objectId: Int32) -> Void
+#else
+fileprivate func _bjs_struct_lower_CopyableCartItem_extern(_ objectId: Int32) -> Void {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func _bjs_struct_lower_CopyableCartItem(_ objectId: Int32) -> Void {
+    return _bjs_struct_lower_CopyableCartItem_extern(objectId)
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "swift_js_struct_lift_CopyableCartItem")
+fileprivate func _bjs_struct_lift_CopyableCartItem_extern() -> Int32
+#else
+fileprivate func _bjs_struct_lift_CopyableCartItem_extern() -> Int32 {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func _bjs_struct_lift_CopyableCartItem() -> Int32 {
+    return _bjs_struct_lift_CopyableCartItem_extern()
+}
+
+extension CopyableNestedCart: _BridgedSwiftStruct {
+    @_spi(BridgeJS) @_transparent public static func bridgeJSStackPop() -> CopyableNestedCart {
+        let shippingAddress = Optional<Address>.bridgeJSStackPop()
+        let item = CopyableCartItem.bridgeJSStackPop()
+        let id = Int.bridgeJSStackPop()
+        return CopyableNestedCart(id: id, item: item, shippingAddress: shippingAddress)
+    }
+
+    @_spi(BridgeJS) @_transparent public consuming func bridgeJSStackPush() {
+        self.id.bridgeJSStackPush()
+        self.item.bridgeJSStackPush()
+        self.shippingAddress.bridgeJSStackPush()
+    }
+
+    init(unsafelyCopying jsObject: JSObject) {
+        _bjs_struct_lower_CopyableNestedCart(jsObject.bridgeJSLowerParameter())
+        self = Self.bridgeJSStackPop()
+    }
+
+    func toJSObject() -> JSObject {
+        let __bjs_self = self
+        __bjs_self.bridgeJSStackPush()
+        return JSObject(id: UInt32(bitPattern: _bjs_struct_lift_CopyableNestedCart()))
+    }
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "swift_js_struct_lower_CopyableNestedCart")
+fileprivate func _bjs_struct_lower_CopyableNestedCart_extern(_ objectId: Int32) -> Void
+#else
+fileprivate func _bjs_struct_lower_CopyableNestedCart_extern(_ objectId: Int32) -> Void {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func _bjs_struct_lower_CopyableNestedCart(_ objectId: Int32) -> Void {
+    return _bjs_struct_lower_CopyableNestedCart_extern(objectId)
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "swift_js_struct_lift_CopyableNestedCart")
+fileprivate func _bjs_struct_lift_CopyableNestedCart_extern() -> Int32
+#else
+fileprivate func _bjs_struct_lift_CopyableNestedCart_extern() -> Int32 {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func _bjs_struct_lift_CopyableNestedCart() -> Int32 {
+    return _bjs_struct_lift_CopyableNestedCart_extern()
+}
+
+@_expose(wasm, "bjs_CopyableNestedCart_static_fromJSObject")
+@_cdecl("bjs_CopyableNestedCart_static_fromJSObject")
+public func _bjs_CopyableNestedCart_static_fromJSObject(_ object: Int32) -> Void {
+    #if arch(wasm32)
+    let ret = CopyableNestedCart.fromJSObject(_: JSObject.bridgeJSLiftParameter(object))
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+extension ConfigStruct: _BridgedSwiftStruct {
+    @_spi(BridgeJS) @_transparent public static func bridgeJSStackPop() -> ConfigStruct {
+        let value = Int.bridgeJSStackPop()
+        let name = String.bridgeJSStackPop()
+        return ConfigStruct(name: name, value: value)
+    }
+
+    @_spi(BridgeJS) @_transparent public consuming func bridgeJSStackPush() {
+        self.name.bridgeJSStackPush()
+        self.value.bridgeJSStackPush()
+    }
+
+    init(unsafelyCopying jsObject: JSObject) {
+        _bjs_struct_lower_ConfigStruct(jsObject.bridgeJSLowerParameter())
+        self = Self.bridgeJSStackPop()
+    }
+
+    func toJSObject() -> JSObject {
+        let __bjs_self = self
+        __bjs_self.bridgeJSStackPush()
+        return JSObject(id: UInt32(bitPattern: _bjs_struct_lift_ConfigStruct()))
+    }
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "swift_js_struct_lower_ConfigStruct")
+fileprivate func _bjs_struct_lower_ConfigStruct_extern(_ objectId: Int32) -> Void
+#else
+fileprivate func _bjs_struct_lower_ConfigStruct_extern(_ objectId: Int32) -> Void {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func _bjs_struct_lower_ConfigStruct(_ objectId: Int32) -> Void {
+    return _bjs_struct_lower_ConfigStruct_extern(objectId)
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "swift_js_struct_lift_ConfigStruct")
+fileprivate func _bjs_struct_lift_ConfigStruct_extern() -> Int32
+#else
+fileprivate func _bjs_struct_lift_ConfigStruct_extern() -> Int32 {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func _bjs_struct_lift_ConfigStruct() -> Int32 {
+    return _bjs_struct_lift_ConfigStruct_extern()
+}
+
+@_expose(wasm, "bjs_ConfigStruct_static_defaultConfig_get")
+@_cdecl("bjs_ConfigStruct_static_defaultConfig_get")
+public func _bjs_ConfigStruct_static_defaultConfig_get() -> Void {
+    #if arch(wasm32)
+    let ret = ConfigStruct.defaultConfig
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_ConfigStruct_static_defaultConfig_set")
+@_cdecl("bjs_ConfigStruct_static_defaultConfig_set")
+public func _bjs_ConfigStruct_static_defaultConfig_set(_ valueBytes: Int32, _ valueLength: Int32) -> Void {
+    #if arch(wasm32)
+    ConfigStruct.defaultConfig = String.bridgeJSLiftParameter(valueBytes, valueLength)
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_ConfigStruct_static_maxRetries_get")
+@_cdecl("bjs_ConfigStruct_static_maxRetries_get")
+public func _bjs_ConfigStruct_static_maxRetries_get() -> Int32 {
+    #if arch(wasm32)
+    let ret = ConfigStruct.maxRetries
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_ConfigStruct_static_timeout_get")
+@_cdecl("bjs_ConfigStruct_static_timeout_get")
+public func _bjs_ConfigStruct_static_timeout_get() -> Float64 {
+    #if arch(wasm32)
+    let ret = ConfigStruct.timeout
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_ConfigStruct_static_timeout_set")
+@_cdecl("bjs_ConfigStruct_static_timeout_set")
+public func _bjs_ConfigStruct_static_timeout_set(_ value: Float64) -> Void {
+    #if arch(wasm32)
+    ConfigStruct.timeout = Double.bridgeJSLiftParameter(value)
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_ConfigStruct_static_computedSetting_get")
+@_cdecl("bjs_ConfigStruct_static_computedSetting_get")
+public func _bjs_ConfigStruct_static_computedSetting_get() -> Void {
+    #if arch(wasm32)
+    let ret = ConfigStruct.computedSetting
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+extension Vector2D: _BridgedSwiftStruct {
+    @_spi(BridgeJS) @_transparent public static func bridgeJSStackPop() -> Vector2D {
+        let dy = Double.bridgeJSStackPop()
+        let dx = Double.bridgeJSStackPop()
+        return Vector2D(dx: dx, dy: dy)
+    }
+
+    @_spi(BridgeJS) @_transparent public consuming func bridgeJSStackPush() {
+        self.dx.bridgeJSStackPush()
+        self.dy.bridgeJSStackPush()
+    }
+
+    init(unsafelyCopying jsObject: JSObject) {
+        _bjs_struct_lower_Vector2D(jsObject.bridgeJSLowerParameter())
+        self = Self.bridgeJSStackPop()
+    }
+
+    func toJSObject() -> JSObject {
+        let __bjs_self = self
+        __bjs_self.bridgeJSStackPush()
+        return JSObject(id: UInt32(bitPattern: _bjs_struct_lift_Vector2D()))
+    }
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "swift_js_struct_lower_Vector2D")
+fileprivate func _bjs_struct_lower_Vector2D_extern(_ objectId: Int32) -> Void
+#else
+fileprivate func _bjs_struct_lower_Vector2D_extern(_ objectId: Int32) -> Void {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func _bjs_struct_lower_Vector2D(_ objectId: Int32) -> Void {
+    return _bjs_struct_lower_Vector2D_extern(objectId)
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "swift_js_struct_lift_Vector2D")
+fileprivate func _bjs_struct_lift_Vector2D_extern() -> Int32
+#else
+fileprivate func _bjs_struct_lift_Vector2D_extern() -> Int32 {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func _bjs_struct_lift_Vector2D() -> Int32 {
+    return _bjs_struct_lift_Vector2D_extern()
+}
+
+@_expose(wasm, "bjs_Vector2D_init")
+@_cdecl("bjs_Vector2D_init")
+public func _bjs_Vector2D_init(_ dx: Float64, _ dy: Float64) -> Void {
+    #if arch(wasm32)
+    let ret = Vector2D(dx: Double.bridgeJSLiftParameter(dx), dy: Double.bridgeJSLiftParameter(dy))
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_Vector2D_magnitude")
+@_cdecl("bjs_Vector2D_magnitude")
+public func _bjs_Vector2D_magnitude() -> Float64 {
+    #if arch(wasm32)
+    let ret = Vector2D.bridgeJSLiftParameter().magnitude()
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_Vector2D_scaled")
+@_cdecl("bjs_Vector2D_scaled")
+public func _bjs_Vector2D_scaled(_ factor: Float64) -> Void {
+    #if arch(wasm32)
+    let ret = Vector2D.bridgeJSLiftParameter().scaled(by: Double.bridgeJSLiftParameter(factor))
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_Vector2D_describe")
+@_cdecl("bjs_Vector2D_describe")
+public func _bjs_Vector2D_describe() -> Void {
+    #if arch(wasm32)
+    let ret = Vector2D.bridgeJSLiftParameter().describe()
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+extension JSObjectContainer: _BridgedSwiftStruct {
+    @_spi(BridgeJS) @_transparent public static func bridgeJSStackPop() -> JSObjectContainer {
+        let optionalObject = Optional<JSObject>.bridgeJSStackPop()
+        let object = JSObject.bridgeJSStackPop()
+        return JSObjectContainer(object: object, optionalObject: optionalObject)
+    }
+
+    @_spi(BridgeJS) @_transparent public consuming func bridgeJSStackPush() {
+        self.object.bridgeJSStackPush()
+        self.optionalObject.bridgeJSStackPush()
+    }
+
+    init(unsafelyCopying jsObject: JSObject) {
+        _bjs_struct_lower_JSObjectContainer(jsObject.bridgeJSLowerParameter())
+        self = Self.bridgeJSStackPop()
+    }
+
+    func toJSObject() -> JSObject {
+        let __bjs_self = self
+        __bjs_self.bridgeJSStackPush()
+        return JSObject(id: UInt32(bitPattern: _bjs_struct_lift_JSObjectContainer()))
+    }
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "swift_js_struct_lower_JSObjectContainer")
+fileprivate func _bjs_struct_lower_JSObjectContainer_extern(_ objectId: Int32) -> Void
+#else
+fileprivate func _bjs_struct_lower_JSObjectContainer_extern(_ objectId: Int32) -> Void {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func _bjs_struct_lower_JSObjectContainer(_ objectId: Int32) -> Void {
+    return _bjs_struct_lower_JSObjectContainer_extern(objectId)
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "swift_js_struct_lift_JSObjectContainer")
+fileprivate func _bjs_struct_lift_JSObjectContainer_extern() -> Int32
+#else
+fileprivate func _bjs_struct_lift_JSObjectContainer_extern() -> Int32 {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func _bjs_struct_lift_JSObjectContainer() -> Int32 {
+    return _bjs_struct_lift_JSObjectContainer_extern()
+}
+
+extension FooContainer: _BridgedSwiftStruct {
+    @_spi(BridgeJS) @_transparent public static func bridgeJSStackPop() -> FooContainer {
+        let optionalFoo = Optional<JSObject>.bridgeJSStackPop().map { Foo(unsafelyWrapping: $0) }
+        let foo = Foo(unsafelyWrapping: JSObject.bridgeJSStackPop())
+        return FooContainer(foo: foo, optionalFoo: optionalFoo)
+    }
+
+    @_spi(BridgeJS) @_transparent public consuming func bridgeJSStackPush() {
+        self.foo.jsObject.bridgeJSStackPush()
+        self.optionalFoo.bridgeJSStackPush()
+    }
+
+    init(unsafelyCopying jsObject: JSObject) {
+        _bjs_struct_lower_FooContainer(jsObject.bridgeJSLowerParameter())
+        self = Self.bridgeJSStackPop()
+    }
+
+    func toJSObject() -> JSObject {
+        let __bjs_self = self
+        __bjs_self.bridgeJSStackPush()
+        return JSObject(id: UInt32(bitPattern: _bjs_struct_lift_FooContainer()))
+    }
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "swift_js_struct_lower_FooContainer")
+fileprivate func _bjs_struct_lower_FooContainer_extern(_ objectId: Int32) -> Void
+#else
+fileprivate func _bjs_struct_lower_FooContainer_extern(_ objectId: Int32) -> Void {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func _bjs_struct_lower_FooContainer(_ objectId: Int32) -> Void {
+    return _bjs_struct_lower_FooContainer_extern(objectId)
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "swift_js_struct_lift_FooContainer")
+fileprivate func _bjs_struct_lift_FooContainer_extern() -> Int32
+#else
+fileprivate func _bjs_struct_lift_FooContainer_extern() -> Int32 {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func _bjs_struct_lift_FooContainer() -> Int32 {
+    return _bjs_struct_lift_FooContainer_extern()
+}
+
+extension ArrayMembers: _BridgedSwiftStruct {
+    @_spi(BridgeJS) @_transparent public static func bridgeJSStackPop() -> ArrayMembers {
+        let optStrings = Optional<[String]>.bridgeJSStackPop()
+        let ints = [Int].bridgeJSStackPop()
+        return ArrayMembers(ints: ints, optStrings: optStrings)
+    }
+
+    @_spi(BridgeJS) @_transparent public consuming func bridgeJSStackPush() {
+        self.ints.bridgeJSStackPush()
+        self.optStrings.bridgeJSStackPush()
+    }
+
+    init(unsafelyCopying jsObject: JSObject) {
+        _bjs_struct_lower_ArrayMembers(jsObject.bridgeJSLowerParameter())
+        self = Self.bridgeJSStackPop()
+    }
+
+    func toJSObject() -> JSObject {
+        let __bjs_self = self
+        __bjs_self.bridgeJSStackPush()
+        return JSObject(id: UInt32(bitPattern: _bjs_struct_lift_ArrayMembers()))
+    }
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "swift_js_struct_lower_ArrayMembers")
+fileprivate func _bjs_struct_lower_ArrayMembers_extern(_ objectId: Int32) -> Void
+#else
+fileprivate func _bjs_struct_lower_ArrayMembers_extern(_ objectId: Int32) -> Void {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func _bjs_struct_lower_ArrayMembers(_ objectId: Int32) -> Void {
+    return _bjs_struct_lower_ArrayMembers_extern(objectId)
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "swift_js_struct_lift_ArrayMembers")
+fileprivate func _bjs_struct_lift_ArrayMembers_extern() -> Int32
+#else
+fileprivate func _bjs_struct_lift_ArrayMembers_extern() -> Int32 {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func _bjs_struct_lift_ArrayMembers() -> Int32 {
+    return _bjs_struct_lift_ArrayMembers_extern()
+}
+
+@_expose(wasm, "bjs_ArrayMembers_sumValues")
+@_cdecl("bjs_ArrayMembers_sumValues")
+public func _bjs_ArrayMembers_sumValues() -> Int32 {
+    #if arch(wasm32)
+    let ret = ArrayMembers.bridgeJSLiftParameter().sumValues(_: [Int].bridgeJSStackPop())
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_ArrayMembers_firstString")
+@_cdecl("bjs_ArrayMembers_firstString")
+public func _bjs_ArrayMembers_firstString() -> Void {
+    #if arch(wasm32)
+    let ret = ArrayMembers.bridgeJSLiftParameter().firstString(_: [String].bridgeJSStackPop())
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_makeTag")
+@_cdecl("bjs_makeTag")
+public func _bjs_makeTag(_ nameBytes: Int32, _ nameLength: Int32) -> UnsafeMutableRawPointer {
+    #if arch(wasm32)
+    let ret = makeTag(_: String.bridgeJSLiftParameter(nameBytes, nameLength))
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_roundTripPolygon")
+@_cdecl("bjs_roundTripPolygon")
+public func _bjs_roundTripPolygon(_ polygon: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer {
+    #if arch(wasm32)
+    let ret = roundTripPolygon(_: Polygon.bridgeJSLiftParameter(polygon))
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_appendVertex")
+@_cdecl("bjs_appendVertex")
+public func _bjs_appendVertex(_ polygon: UnsafeMutableRawPointer, _ value: Float64) -> UnsafeMutableRawPointer {
+    #if arch(wasm32)
+    let ret = appendVertex(_: Polygon.bridgeJSLiftParameter(polygon), _: Double.bridgeJSLiftParameter(value))
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_optionalRoundTripPolygon")
+@_cdecl("bjs_optionalRoundTripPolygon")
+public func _bjs_optionalRoundTripPolygon(_ polygonIsSome: Int32, _ polygonValue: UnsafeMutableRawPointer) -> Void {
+    #if arch(wasm32)
+    let ret = optionalRoundTripPolygon(_: Optional<Polygon>.bridgeJSLiftParameter(polygonIsSome, polygonValue))
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_polygonVertexCount")
+@_cdecl("bjs_polygonVertexCount")
+public func _bjs_polygonVertexCount(_ polygon: UnsafeMutableRawPointer) -> Int32 {
+    #if arch(wasm32)
+    let ret = polygonVertexCount(_: Polygon.bridgeJSLiftParameter(polygon))
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_roundTripPolygonArray")
+@_cdecl("bjs_roundTripPolygonArray")
+public func _bjs_roundTripPolygonArray() -> Void {
+    #if arch(wasm32)
+    let ret = roundTripPolygonArray(_: [Polygon].bridgeJSStackPop())
+    ret.bridgeJSStackPush()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_concatPolygons")
+@_cdecl("bjs_concatPolygons")
+public func _bjs_concatPolygons() -> UnsafeMutableRawPointer {
+    #if arch(wasm32)
+    let ret = concatPolygons(_: [Polygon].bridgeJSStackPop())
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_validatePolygon")
+@_cdecl("bjs_validatePolygon")
+public func _bjs_validatePolygon(_ polygon: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer {
+    #if arch(wasm32)
+    do {
+        let ret = try validatePolygon(_: Polygon.bridgeJSLiftParameter(polygon))
+        return ret.bridgeJSLowerReturn()
+    } catch let error {
+        if let error = error.thrownValue.object {
+            withExtendedLifetime(error) {
+                _swift_js_throw(Int32(bitPattern: $0.id))
+            }
+        } else {
+            let jsError = JSError(message: error.description)
+            withExtendedLifetime(jsError.jsObject) {
+                _swift_js_throw(Int32(bitPattern: $0.id))
+            }
+        }
+        return UnsafeMutableRawPointer(bitPattern: -1).unsafelyUnwrapped
+    }
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_splitPolygon")
+@_cdecl("bjs_splitPolygon")
+public func _bjs_splitPolygon(_ polygon: UnsafeMutableRawPointer) -> Void {
+    #if arch(wasm32)
+    let ret = splitPolygon(_: Polygon.bridgeJSLiftParameter(polygon))
+    ret.bridgeJSStackPush()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_makePolygonInspector")
+@_cdecl("bjs_makePolygonInspector")
+public func _bjs_makePolygonInspector() -> Int32 {
+    #if arch(wasm32)
+    let ret = makePolygonInspector()
+    return JSTypedClosure(ret).bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_roundTripOptionalPolygonArray")
+@_cdecl("bjs_roundTripOptionalPolygonArray")
+public func _bjs_roundTripOptionalPolygonArray() -> Void {
+    #if arch(wasm32)
+    let ret = roundTripOptionalPolygonArray(_: [Optional<Polygon>].bridgeJSStackPop())
+    ret.bridgeJSStackPush()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_makeTagHolder")
+@_cdecl("bjs_makeTagHolder")
+public func _bjs_makeTagHolder(_ nameBytes: Int32, _ nameLength: Int32, _ version: Int32) -> UnsafeMutableRawPointer {
+    #if arch(wasm32)
+    let ret = makeTagHolder(_: String.bridgeJSLiftParameter(nameBytes, nameLength), _: Int.bridgeJSLiftParameter(version))
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_roundTripCoordinate")
+@_cdecl("bjs_roundTripCoordinate")
+public func _bjs_roundTripCoordinate() -> Void {
+    #if arch(wasm32)
+    let ret = roundTripCoordinate(_: Coordinate.bridgeJSLiftParameter())
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_roundTripPriority")
+@_cdecl("bjs_roundTripPriority")
+public func _bjs_roundTripPriority(_ priority: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer {
+    #if arch(wasm32)
+    let ret = roundTripPriority(_: Priority.bridgeJSLiftParameter(priority))
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_roundTripAlert")
+@_cdecl("bjs_roundTripAlert")
+public func _bjs_roundTripAlert(_ alert: Int32) -> Int32 {
+    #if arch(wasm32)
+    let ret = roundTripAlert(_: Alert.bridgeJSLiftParameter(alert))
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_makeAlert")
+@_cdecl("bjs_makeAlert")
+public func _bjs_makeAlert(_ level: Int32) -> Int32 {
+    #if arch(wasm32)
+    let ret = makeAlert(_: Severity.bridgeJSLiftParameter(level))
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_roundTripShape")
+@_cdecl("bjs_roundTripShape")
+public func _bjs_roundTripShape(_ s: Int32) -> Void {
+    #if arch(wasm32)
+    let ret = roundTripShape(_: Shape.bridgeJSLiftParameter(s))
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_makeShapePolygon")
+@_cdecl("bjs_makeShapePolygon")
+public func _bjs_makeShapePolygon(_ polygon: UnsafeMutableRawPointer) -> Void {
+    #if arch(wasm32)
+    let ret = makeShapePolygon(_: Polygon.bridgeJSLiftParameter(polygon))
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_makeShapeEmpty")
+@_cdecl("bjs_makeShapeEmpty")
+public func _bjs_makeShapeEmpty() -> Void {
+    #if arch(wasm32)
+    let ret = makeShapeEmpty()
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_roundTripUserId")
+@_cdecl("bjs_roundTripUserId")
+public func _bjs_roundTripUserId(_ id: Int32) -> Int32 {
+    #if arch(wasm32)
+    let ret = roundTripUserId(_: UserId.bridgeJSLiftParameter(id))
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_roundTripOptionalUserId")
+@_cdecl("bjs_roundTripOptionalUserId")
+public func _bjs_roundTripOptionalUserId(_ idIsSome: Int32, _ idValue: Int32) -> Void {
+    #if arch(wasm32)
+    let ret = roundTripOptionalUserId(_: Optional<UserId>.bridgeJSLiftParameter(idIsSome, idValue))
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_roundTripUserIdArray")
+@_cdecl("bjs_roundTripUserIdArray")
+public func _bjs_roundTripUserIdArray() -> Void {
+    #if arch(wasm32)
+    let ret = roundTripUserIdArray(_: [UserId].bridgeJSStackPop())
+    ret.bridgeJSStackPush()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_roundTripBoxed")
+@_cdecl("bjs_roundTripBoxed")
+public func _bjs_roundTripBoxed(_ boxedKind: Int32, _ boxedPayload1: Int32, _ boxedPayload2: Float64) -> Void {
+    #if arch(wasm32)
+    let ret = roundTripBoxed(_: Boxed.bridgeJSLiftParameter(boxedKind, boxedPayload1, boxedPayload2))
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_roundTripOptionalBoxed")
+@_cdecl("bjs_roundTripOptionalBoxed")
+public func _bjs_roundTripOptionalBoxed(_ boxedIsSome: Int32, _ boxedKind: Int32, _ boxedPayload1: Int32, _ boxedPayload2: Float64) -> Void {
+    #if arch(wasm32)
+    let ret = roundTripOptionalBoxed(_: Optional<Boxed>.bridgeJSLiftParameter(boxedIsSome, boxedKind, boxedPayload1, boxedPayload2))
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_awaitAsyncCallback")
+@_cdecl("bjs_awaitAsyncCallback")
+public func _bjs_awaitAsyncCallback(_ fetch: Int32) -> Int32 {
+    #if arch(wasm32)
+    return _bjs_makePromise(resolve: Promise_resolve_SS, reject: Promise_reject) { () async throws(JSException) -> String in
+        return try await awaitAsyncCallback(_: _BJS_Closure_20BridgeJSRuntimeTestsYaKSS_SS.bridgeJSLift(fetch))
     }
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
 
-    @_spi(BridgeJS) @_transparent public consuming func bridgeJSStackPushPayload() -> Int32 {
-        switch self {
-        case .precision(let param0):
-            param0.bridgeJSStackPush()
-            return Int32(0)
-        case .direction(let param0):
-            param0.bridgeJSStackPush()
-            return Int32(1)
-        case .optPrecision(let param0):
-            param0.bridgeJSStackPush()
-            return Int32(2)
-        case .optDirection(let param0):
-            param0.bridgeJSStackPush()
-            return Int32(3)
-        case .empty:
-            return Int32(4)
-        }
-    }
+@_expose(wasm, "bjs_makeAsyncParser")
+@_cdecl("bjs_makeAsyncParser")
+public func _bjs_makeAsyncParser() -> Int32 {
+    #if arch(wasm32)
+    let ret = makeAsyncParser()
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
 }
 
-extension StaticCalculator: _BridgedSwiftCaseEnum {
-    @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameter() -> Int32 {
-        return bridgeJSRawValue
-    }
-    @_spi(BridgeJS) @_transparent public static func bridgeJSLiftReturn(_ value: Int32) -> StaticCalculator {
-        return bridgeJSLiftParameter(value)
-    }
-    @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter(_ value: Int32) -> StaticCalculator {
-        return StaticCalculator(bridgeJSRawValue: value)!
-    }
-    @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() -> Int32 {
-        return bridgeJSLowerParameter()
-    }
+@_expose(wasm, "bjs_makeAsyncEcho")
+@_cdecl("bjs_makeAsyncEcho")
+public func _bjs_makeAsyncEcho() -> Int32 {
+    #if arch(wasm32)
+    let ret = makeAsyncEcho()
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
 
-    @_spi(BridgeJS) @usableFromInline init?(bridgeJSRawValue: Int32) {
-        switch bridgeJSRawValue {
-        case 0:
-            self = .scientific
-        case 1:
-            self = .basic
-        default:
-            return nil
-        }
-    }
+@_expose(wasm, "bjs_makeAsyncRecorder")
+@_cdecl("bjs_makeAsyncRecorder")
+public func _bjs_makeAsyncRecorder() -> Int32 {
+    #if arch(wasm32)
+    let ret = makeAsyncRecorder()
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
 
-    @_spi(BridgeJS) @usableFromInline var bridgeJSRawValue: Int32 {
-        switch self {
-        case .scientific:
-            return 0
-        case .basic:
-            return 1
-        }
+@_expose(wasm, "bjs_lastRecordedValue")
+@_cdecl("bjs_lastRecordedValue")
+public func _bjs_lastRecordedValue() -> Void {
+    #if arch(wasm32)
+    let ret = lastRecordedValue()
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_makeAsyncPayloadLoader")
+@_cdecl("bjs_makeAsyncPayloadLoader")
+public func _bjs_makeAsyncPayloadLoader() -> Int32 {
+    #if arch(wasm32)
+    let ret = makeAsyncPayloadLoader()
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_awaitPayloadCallback")
+@_cdecl("bjs_awaitPayloadCallback")
+public func _bjs_awaitPayloadCallback(_ load: Int32) -> Int32 {
+    #if arch(wasm32)
+    return _bjs_makePromise(resolve: Promise_resolve_SS, reject: Promise_reject) { () async throws(JSException) -> String in
+        return try await awaitPayloadCallback(_: _BJS_Closure_20BridgeJSRuntimeTestsYaKSb_18AsyncPayloadResultO.bridgeJSLift(load))
     }
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
 }
 
-@_expose(wasm, "bjs_StaticCalculator_static_roundtrip")
-@_cdecl("bjs_StaticCalculator_static_roundtrip")
-public func _bjs_StaticCalculator_static_roundtrip(_ value: Int32) -> Int32 {
+@_expose(wasm, "bjs_makeAsyncPointMaker")
+@_cdecl("bjs_makeAsyncPointMaker")
+public func _bjs_makeAsyncPointMaker() -> Int32 {
     #if arch(wasm32)
-    let ret = StaticCalculator.roundtrip(_: Int.bridgeJSLiftParameter(value))
+    let ret = makeAsyncPointMaker()
     return ret.bridgeJSLowerReturn()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_StaticCalculator_static_doubleValue")
-@_cdecl("bjs_StaticCalculator_static_doubleValue")
-public func _bjs_StaticCalculator_static_doubleValue(_ value: Int32) -> Int32 {
+@_expose(wasm, "bjs_makeThrowingParser")
+@_cdecl("bjs_makeThrowingParser")
+public func _bjs_makeThrowingParser() -> Int32 {
     #if arch(wasm32)
-    let ret = StaticCalculator.doubleValue(_: Int.bridgeJSLiftParameter(value))
+    let ret = makeThrowingParser()
     return ret.bridgeJSLowerReturn()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_StaticCalculator_static_version_get")
-@_cdecl("bjs_StaticCalculator_static_version_get")
-public func _bjs_StaticCalculator_static_version_get() -> Void {
+@_expose(wasm, "bjs_runValidator")
+@_cdecl("bjs_runValidator")
+public func _bjs_runValidator(_ validate: Int32) -> Int32 {
     #if arch(wasm32)
-    let ret = StaticCalculator.version
+    do {
+        let ret = try runValidator(_: _BJS_Closure_20BridgeJSRuntimeTestsKSS_Sb.bridgeJSLift(validate))
+        return ret.bridgeJSLowerReturn()
+    } catch let error {
+        if let error = error.thrownValue.object {
+            withExtendedLifetime(error) {
+                _swift_js_throw(Int32(bitPattern: $0.id))
+            }
+        } else {
+            let jsError = JSError(message: error.description)
+            withExtendedLifetime(jsError.jsObject) {
+                _swift_js_throw(Int32(bitPattern: $0.id))
+            }
+        }
+        return 0
+    }
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_roundTripVoid")
+@_cdecl("bjs_roundTripVoid")
+public func _bjs_roundTripVoid() -> Void {
+    #if arch(wasm32)
+    roundTripVoid()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_roundTripFloat")
+@_cdecl("bjs_roundTripFloat")
+public func _bjs_roundTripFloat(_ v: Float32) -> Float32 {
+    #if arch(wasm32)
+    let ret = roundTripFloat(v: Float.bridgeJSLiftParameter(v))
     return ret.bridgeJSLowerReturn()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_StaticUtils_Nested_static_roundtrip")
-@_cdecl("bjs_StaticUtils_Nested_static_roundtrip")
-public func _bjs_StaticUtils_Nested_static_roundtrip(_ valueBytes: Int32, _ valueLength: Int32) -> Void {
+@_expose(wasm, "bjs_roundTripDouble")
+@_cdecl("bjs_roundTripDouble")
+public func _bjs_roundTripDouble(_ v: Float64) -> Float64 {
     #if arch(wasm32)
-    let ret = StaticUtils.Nested.roundtrip(_: String.bridgeJSLiftParameter(valueBytes, valueLength))
+    let ret = roundTripDouble(v: Double.bridgeJSLiftParameter(v))
     return ret.bridgeJSLowerReturn()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_Services_Graph_GraphOperations_static_createGraph")
-@_cdecl("bjs_Services_Graph_GraphOperations_static_createGraph")
-public func _bjs_Services_Graph_GraphOperations_static_createGraph(_ rootId: Int32) -> Int32 {
+@_expose(wasm, "bjs_roundTripBool")
+@_cdecl("bjs_roundTripBool")
+public func _bjs_roundTripBool(_ v: Int32) -> Int32 {
     #if arch(wasm32)
-    let ret = GraphOperations.createGraph(rootId: Int.bridgeJSLiftParameter(rootId))
+    let ret = roundTripBool(v: Bool.bridgeJSLiftParameter(v))
     return ret.bridgeJSLowerReturn()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_Services_Graph_GraphOperations_static_nodeCount")
-@_cdecl("bjs_Services_Graph_GraphOperations_static_nodeCount")
-public func _bjs_Services_Graph_GraphOperations_static_nodeCount(_ graphId: Int32) -> Int32 {
+@_expose(wasm, "bjs_roundTripString")
+@_cdecl("bjs_roundTripString")
+public func _bjs_roundTripString(_ vBytes: Int32, _ vLength: Int32) -> Void {
     #if arch(wasm32)
-    let ret = GraphOperations.nodeCount(graphId: Int.bridgeJSLiftParameter(graphId))
+    let ret = roundTripString(v: String.bridgeJSLiftParameter(vBytes, vLength))
     return ret.bridgeJSLowerReturn()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-extension StaticPropertyEnum: _BridgedSwiftCaseEnum {
-    @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameter() -> Int32 {
-        return bridgeJSRawValue
-    }
-    @_spi(BridgeJS) @_transparent public static func bridgeJSLiftReturn(_ value: Int32) -> StaticPropertyEnum {
-        return bridgeJSLiftParameter(value)
-    }
-    @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter(_ value: Int32) -> StaticPropertyEnum {
-        return StaticPropertyEnum(bridgeJSRawValue: value)!
-    }
-    @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() -> Int32 {
-        return bridgeJSLowerParameter()
-    }
+@_expose(wasm, "bjs_roundTripSwiftHeapObject")
+@_cdecl("bjs_roundTripSwiftHeapObject")
+public func _bjs_roundTripSwiftHeapObject(_ v: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer {
+    #if arch(wasm32)
+    let ret = roundTripSwiftHeapObject(v: Greeter.bridgeJSLiftParameter(v))
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
 
-    @_spi(BridgeJS) @usableFromInline init?(bridgeJSRawValue: Int32) {
-        switch bridgeJSRawValue {
-        case 0:
-            self = .option1
-        case 1:
-            self = .option2
-        default:
-            return nil
-        }
-    }
+@_expose(wasm, "bjs_roundTripUnsafeRawPointer")
+@_cdecl("bjs_roundTripUnsafeRawPointer")
+public func _bjs_roundTripUnsafeRawPointer(_ v: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer {
+    #if arch(wasm32)
+    let ret = roundTripUnsafeRawPointer(v: UnsafeRawPointer.bridgeJSLiftParameter(v))
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
 
-    @_spi(BridgeJS) @usableFromInline var bridgeJSRawValue: Int32 {
-        switch self {
-        case .option1:
-            return 0
-        case .option2:
-            return 1
-        }
-    }
+@_expose(wasm, "bjs_roundTripUnsafeMutableRawPointer")
+@_cdecl("bjs_roundTripUnsafeMutableRawPointer")
+public func _bjs_roundTripUnsafeMutableRawPointer(_ v: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer {
+    #if arch(wasm32)
+    let ret = roundTripUnsafeMutableRawPointer(v: UnsafeMutableRawPointer.bridgeJSLiftParameter(v))
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
 }
 
-@_expose(wasm, "bjs_StaticPropertyEnum_static_enumProperty_get")
-@_cdecl("bjs_StaticPropertyEnum_static_enumProperty_get")
-public func _bjs_StaticPropertyEnum_static_enumProperty_get() -> Void {
+@_expose(wasm, "bjs_roundTripOpaquePointer")
+@_cdecl("bjs_roundTripOpaquePointer")
+public func _bjs_roundTripOpaquePointer(_ v: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer {
     #if arch(wasm32)
-    let ret = StaticPropertyEnum.enumProperty
+    let ret = roundTripOpaquePointer(v: OpaquePointer.bridgeJSLiftParameter(v))
     return ret.bridgeJSLowerReturn()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_StaticPropertyEnum_static_enumProperty_set")
-@_cdecl("bjs_StaticPropertyEnum_static_enumProperty_set")
-public func _bjs_StaticPropertyEnum_static_enumProperty_set(_ valueBytes: Int32, _ valueLength: Int32) -> Void {
+@_expose(wasm, "bjs_roundTripUnsafePointer")
+@_cdecl("bjs_roundTripUnsafePointer")
+public func _bjs_roundTripUnsafePointer(_ v: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer {
     #if arch(wasm32)
-    StaticPropertyEnum.enumProperty = String.bridgeJSLiftParameter(valueBytes, valueLength)
+    let ret = roundTripUnsafePointer(v: UnsafePointer<UInt8>.bridgeJSLiftParameter(v))
+    return ret.bridgeJSLowerReturn()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_StaticPropertyEnum_static_enumConstant_get")
-@_cdecl("bjs_StaticPropertyEnum_static_enumConstant_get")
-public func _bjs_StaticPropertyEnum_static_enumConstant_get() -> Int32 {
+@_expose(wasm, "bjs_roundTripUnsafeMutablePointer")
+@_cdecl("bjs_roundTripUnsafeMutablePointer")
+public func _bjs_roundTripUnsafeMutablePointer(_ v: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer {
     #if arch(wasm32)
-    let ret = StaticPropertyEnum.enumConstant
+    let ret = roundTripUnsafeMutablePointer(v: UnsafeMutablePointer<UInt8>.bridgeJSLiftParameter(v))
     return ret.bridgeJSLowerReturn()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_StaticPropertyEnum_static_enumBool_get")
-@_cdecl("bjs_StaticPropertyEnum_static_enumBool_get")
-public func _bjs_StaticPropertyEnum_static_enumBool_get() -> Int32 {
+@_expose(wasm, "bjs_roundTripJSObject")
+@_cdecl("bjs_roundTripJSObject")
+public func _bjs_roundTripJSObject(_ v: Int32) -> Int32 {
     #if arch(wasm32)
-    let ret = StaticPropertyEnum.enumBool
+    let ret = roundTripJSObject(v: JSObject.bridgeJSLiftParameter(v))
     return ret.bridgeJSLowerReturn()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_StaticPropertyEnum_static_enumBool_set")
-@_cdecl("bjs_StaticPropertyEnum_static_enumBool_set")
-public func _bjs_StaticPropertyEnum_static_enumBool_set(_ value: Int32) -> Void {
+@_expose(wasm, "bjs_roundTripDictionaryExport")
+@_cdecl("bjs_roundTripDictionaryExport")
+public func _bjs_roundTripDictionaryExport() -> Void {
     #if arch(wasm32)
-    StaticPropertyEnum.enumBool = Bool.bridgeJSLiftParameter(value)
+    let ret = roundTripDictionaryExport(v: [String: Int].bridgeJSLiftParameter())
+    return ret.bridgeJSLowerReturn()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_StaticPropertyEnum_static_enumVariable_get")
-@_cdecl("bjs_StaticPropertyEnum_static_enumVariable_get")
-public func _bjs_StaticPropertyEnum_static_enumVariable_get() -> Int32 {
+@_expose(wasm, "bjs_roundTripOptionalDictionaryExport")
+@_cdecl("bjs_roundTripOptionalDictionaryExport")
+public func _bjs_roundTripOptionalDictionaryExport() -> Void {
     #if arch(wasm32)
-    let ret = StaticPropertyEnum.enumVariable
+    let ret = roundTripOptionalDictionaryExport(v: Optional<[String: String]>.bridgeJSLiftParameter())
     return ret.bridgeJSLowerReturn()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_StaticPropertyEnum_static_enumVariable_set")
-@_cdecl("bjs_StaticPropertyEnum_static_enumVariable_set")
-public func _bjs_StaticPropertyEnum_static_enumVariable_set(_ value: Int32) -> Void {
+@_expose(wasm, "bjs_roundTripJSValue")
+@_cdecl("bjs_roundTripJSValue")
+public func _bjs_roundTripJSValue(_ vKind: Int32, _ vPayload1: Int32, _ vPayload2: Float64) -> Void {
     #if arch(wasm32)
-    StaticPropertyEnum.enumVariable = Int.bridgeJSLiftParameter(value)
+    let ret = roundTripJSValue(v: JSValue.bridgeJSLiftParameter(vKind, vPayload1, vPayload2))
+    return ret.bridgeJSLowerReturn()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_StaticPropertyEnum_static_computedReadonly_get")
-@_cdecl("bjs_StaticPropertyEnum_static_computedReadonly_get")
-public func _bjs_StaticPropertyEnum_static_computedReadonly_get() -> Int32 {
+@_expose(wasm, "bjs_roundTripOptionalJSValue")
+@_cdecl("bjs_roundTripOptionalJSValue")
+public func _bjs_roundTripOptionalJSValue(_ vIsSome: Int32, _ vKind: Int32, _ vPayload1: Int32, _ vPayload2: Float64) -> Void {
     #if arch(wasm32)
-    let ret = StaticPropertyEnum.computedReadonly
+    let ret = roundTripOptionalJSValue(v: Optional<JSValue>.bridgeJSLiftParameter(vIsSome, vKind, vPayload1, vPayload2))
     return ret.bridgeJSLowerReturn()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_StaticPropertyEnum_static_computedReadWrite_get")
-@_cdecl("bjs_StaticPropertyEnum_static_computedReadWrite_get")
-public func _bjs_StaticPropertyEnum_static_computedReadWrite_get() -> Void {
+@_expose(wasm, "bjs_roundTripOptionalJSValueArray")
+@_cdecl("bjs_roundTripOptionalJSValueArray")
+public func _bjs_roundTripOptionalJSValueArray() -> Void {
     #if arch(wasm32)
-    let ret = StaticPropertyEnum.computedReadWrite
-    return ret.bridgeJSLowerReturn()
+    let ret = roundTripOptionalJSValueArray(v: Optional<[JSValue]>.bridgeJSLiftParameter())
+    ret.bridgeJSStackPush()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_StaticPropertyEnum_static_computedReadWrite_set")
-@_cdecl("bjs_StaticPropertyEnum_static_computedReadWrite_set")
-public func _bjs_StaticPropertyEnum_static_computedReadWrite_set(_ valueBytes: Int32, _ valueLength: Int32) -> Void {
+@_expose(wasm, "bjs_makeImportedFoo")
+@_cdecl("bjs_makeImportedFoo")
+public func _bjs_makeImportedFoo(_ valueBytes: Int32, _ valueLength: Int32) -> Int32 {
     #if arch(wasm32)
-    StaticPropertyEnum.computedReadWrite = String.bridgeJSLiftParameter(valueBytes, valueLength)
+    do {
+        let ret = try makeImportedFoo(value: String.bridgeJSLiftParameter(valueBytes, valueLength))
+        return ret.bridgeJSLowerReturn()
+    } catch let error {
+        if let error = error.thrownValue.object {
+            withExtendedLifetime(error) {
+                _swift_js_throw(Int32(bitPattern: $0.id))
+            }
+        } else {
+            let jsError = JSError(message: error.description)
+            withExtendedLifetime(jsError.jsObject) {
+                _swift_js_throw(Int32(bitPattern: $0.id))
+            }
+        }
+        return 0
+    }
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_StaticPropertyNamespace_static_namespaceProperty_get")
-@_cdecl("bjs_StaticPropertyNamespace_static_namespaceProperty_get")
-public func _bjs_StaticPropertyNamespace_static_namespaceProperty_get() -> Void {
+@_expose(wasm, "bjs_roundTripOptionalImportedClass")
+@_cdecl("bjs_roundTripOptionalImportedClass")
+public func _bjs_roundTripOptionalImportedClass(_ vIsSome: Int32, _ vValue: Int32) -> Void {
     #if arch(wasm32)
-    let ret = StaticPropertyNamespace.namespaceProperty
+    let ret = roundTripOptionalImportedClass(v: Optional<Foo>.bridgeJSLiftParameter(vIsSome, vValue))
     return ret.bridgeJSLowerReturn()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_StaticPropertyNamespace_static_namespaceProperty_set")
-@_cdecl("bjs_StaticPropertyNamespace_static_namespaceProperty_set")
-public func _bjs_StaticPropertyNamespace_static_namespaceProperty_set(_ valueBytes: Int32, _ valueLength: Int32) -> Void {
+@_expose(wasm, "bjs_throwsSwiftError")
+@_cdecl("bjs_throwsSwiftError")
+public func _bjs_throwsSwiftError(_ shouldThrow: Int32) -> Void {
     #if arch(wasm32)
-    StaticPropertyNamespace.namespaceProperty = String.bridgeJSLiftParameter(valueBytes, valueLength)
+    do {
+        try throwsSwiftError(shouldThrow: Bool.bridgeJSLiftParameter(shouldThrow))
+    } catch let error {
+        if let error = error.thrownValue.object {
+            withExtendedLifetime(error) {
+                _swift_js_throw(Int32(bitPattern: $0.id))
+            }
+        } else {
+            let jsError = JSError(message: error.description)
+            withExtendedLifetime(jsError.jsObject) {
+                _swift_js_throw(Int32(bitPattern: $0.id))
+            }
+        }
+        return
+    }
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_StaticPropertyNamespace_static_namespaceConstant_get")
-@_cdecl("bjs_StaticPropertyNamespace_static_namespaceConstant_get")
-public func _bjs_StaticPropertyNamespace_static_namespaceConstant_get() -> Void {
+@_expose(wasm, "bjs_throwsWithIntResult")
+@_cdecl("bjs_throwsWithIntResult")
+public func _bjs_throwsWithIntResult() -> Int32 {
     #if arch(wasm32)
-    let ret = StaticPropertyNamespace.namespaceConstant
-    return ret.bridgeJSLowerReturn()
+    do {
+        let ret = try throwsWithIntResult()
+        return ret.bridgeJSLowerReturn()
+    } catch let error {
+        if let error = error.thrownValue.object {
+            withExtendedLifetime(error) {
+                _swift_js_throw(Int32(bitPattern: $0.id))
+            }
+        } else {
+            let jsError = JSError(message: error.description)
+            withExtendedLifetime(jsError.jsObject) {
+                _swift_js_throw(Int32(bitPattern: $0.id))
+            }
+        }
+        return 0
+    }
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_StaticPropertyNamespace_NestedProperties_static_nestedProperty_get")
-@_cdecl("bjs_StaticPropertyNamespace_NestedProperties_static_nestedProperty_get")
-public func _bjs_StaticPropertyNamespace_NestedProperties_static_nestedProperty_get() -> Int32 {
+@_expose(wasm, "bjs_throwsWithStringResult")
+@_cdecl("bjs_throwsWithStringResult")
+public func _bjs_throwsWithStringResult() -> Void {
     #if arch(wasm32)
-    let ret = StaticPropertyNamespace.NestedProperties.nestedProperty
-    return ret.bridgeJSLowerReturn()
+    do {
+        let ret = try throwsWithStringResult()
+        return ret.bridgeJSLowerReturn()
+    } catch let error {
+        if let error = error.thrownValue.object {
+            withExtendedLifetime(error) {
+                _swift_js_throw(Int32(bitPattern: $0.id))
+            }
+        } else {
+            let jsError = JSError(message: error.description)
+            withExtendedLifetime(jsError.jsObject) {
+                _swift_js_throw(Int32(bitPattern: $0.id))
+            }
+        }
+        return
+    }
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_StaticPropertyNamespace_NestedProperties_static_nestedProperty_set")
-@_cdecl("bjs_StaticPropertyNamespace_NestedProperties_static_nestedProperty_set")
-public func _bjs_StaticPropertyNamespace_NestedProperties_static_nestedProperty_set(_ value: Int32) -> Void {
+@_expose(wasm, "bjs_throwsWithBoolResult")
+@_cdecl("bjs_throwsWithBoolResult")
+public func _bjs_throwsWithBoolResult() -> Int32 {
     #if arch(wasm32)
-    StaticPropertyNamespace.NestedProperties.nestedProperty = Int.bridgeJSLiftParameter(value)
+    do {
+        let ret = try throwsWithBoolResult()
+        return ret.bridgeJSLowerReturn()
+    } catch let error {
+        if let error = error.thrownValue.object {
+            withExtendedLifetime(error) {
+                _swift_js_throw(Int32(bitPattern: $0.id))
+            }
+        } else {
+            let jsError = JSError(message: error.description)
+            withExtendedLifetime(jsError.jsObject) {
+                _swift_js_throw(Int32(bitPattern: $0.id))
+            }
+        }
+        return 0
+    }
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_StaticPropertyNamespace_NestedProperties_static_nestedConstant_get")
-@_cdecl("bjs_StaticPropertyNamespace_NestedProperties_static_nestedConstant_get")
-public func _bjs_StaticPropertyNamespace_NestedProperties_static_nestedConstant_get() -> Void {
+@_expose(wasm, "bjs_throwsWithFloatResult")
+@_cdecl("bjs_throwsWithFloatResult")
+public func _bjs_throwsWithFloatResult() -> Float32 {
     #if arch(wasm32)
-    let ret = StaticPropertyNamespace.NestedProperties.nestedConstant
-    return ret.bridgeJSLowerReturn()
+    do {
+        let ret = try throwsWithFloatResult()
+        return ret.bridgeJSLowerReturn()
+    } catch let error {
+        if let error = error.thrownValue.object {
+            withExtendedLifetime(error) {
+                _swift_js_throw(Int32(bitPattern: $0.id))
+            }
+        } else {
+            let jsError = JSError(message: error.description)
+            withExtendedLifetime(jsError.jsObject) {
+                _swift_js_throw(Int32(bitPattern: $0.id))
+            }
+        }
+        return 0.0
+    }
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_StaticPropertyNamespace_NestedProperties_static_nestedDouble_get")
-@_cdecl("bjs_StaticPropertyNamespace_NestedProperties_static_nestedDouble_get")
-public func _bjs_StaticPropertyNamespace_NestedProperties_static_nestedDouble_get() -> Float64 {
+@_expose(wasm, "bjs_throwsWithDoubleResult")
+@_cdecl("bjs_throwsWithDoubleResult")
+public func _bjs_throwsWithDoubleResult() -> Float64 {
     #if arch(wasm32)
-    let ret = StaticPropertyNamespace.NestedProperties.nestedDouble
-    return ret.bridgeJSLowerReturn()
+    do {
+        let ret = try throwsWithDoubleResult()
+        return ret.bridgeJSLowerReturn()
+    } catch let error {
+        if let error = error.thrownValue.object {
+            withExtendedLifetime(error) {
+                _swift_js_throw(Int32(bitPattern: $0.id))
+            }
+        } else {
+            let jsError = JSError(message: error.description)
+            withExtendedLifetime(jsError.jsObject) {
+                _swift_js_throw(Int32(bitPattern: $0.id))
+            }
+        }
+        return 0.0
+    }
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_StaticPropertyNamespace_NestedProperties_static_nestedDouble_set")
-@_cdecl("bjs_StaticPropertyNamespace_NestedProperties_static_nestedDouble_set")
-public func _bjs_StaticPropertyNamespace_NestedProperties_static_nestedDouble_set(_ value: Float64) -> Void {
+@_expose(wasm, "bjs_throwsWithSwiftHeapObjectResult")
+@_cdecl("bjs_throwsWithSwiftHeapObjectResult")
+public func _bjs_throwsWithSwiftHeapObjectResult() -> UnsafeMutableRawPointer {
     #if arch(wasm32)
-    StaticPropertyNamespace.NestedProperties.nestedDouble = Double.bridgeJSLiftParameter(value)
+    do {
+        let ret = try throwsWithSwiftHeapObjectResult()
+        return ret.bridgeJSLowerReturn()
+    } catch let error {
+        if let error = error.thrownValue.object {
+            withExtendedLifetime(error) {
+                _swift_js_throw(Int32(bitPattern: $0.id))
+            }
+        } else {
+            let jsError = JSError(message: error.description)
+            withExtendedLifetime(jsError.jsObject) {
+                _swift_js_throw(Int32(bitPattern: $0.id))
+            }
+        }
+        return UnsafeMutableRawPointer(bitPattern: -1).unsafelyUnwrapped
+    }
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_NestedStructGroupA_static_roundtripMetadata")
-@_cdecl("bjs_NestedStructGroupA_static_roundtripMetadata")
-public func _bjs_NestedStructGroupA_static_roundtripMetadata() -> Void {
+@_expose(wasm, "bjs_throwsWithJSObjectResult")
+@_cdecl("bjs_throwsWithJSObjectResult")
+public func _bjs_throwsWithJSObjectResult() -> Int32 {
     #if arch(wasm32)
-    let ret = NestedStructGroupA.roundtripMetadata(_: NestedStructGroupA.Metadata.bridgeJSLiftParameter())
-    return ret.bridgeJSLowerReturn()
+    do {
+        let ret = try throwsWithJSObjectResult()
+        return ret.bridgeJSLowerReturn()
+    } catch let error {
+        if let error = error.thrownValue.object {
+            withExtendedLifetime(error) {
+                _swift_js_throw(Int32(bitPattern: $0.id))
+            }
+        } else {
+            let jsError = JSError(message: error.description)
+            withExtendedLifetime(jsError.jsObject) {
+                _swift_js_throw(Int32(bitPattern: $0.id))
+            }
+        }
+        return 0
+    }
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_NestedStructGroupB_static_roundtripMetadata")
-@_cdecl("bjs_NestedStructGroupB_static_roundtripMetadata")
-public func _bjs_NestedStructGroupB_static_roundtripMetadata() -> Void {
+@_expose(wasm, "bjs_zeroArgAsyncThrows")
+@_cdecl("bjs_zeroArgAsyncThrows")
+public func _bjs_zeroArgAsyncThrows() -> Int32 {
     #if arch(wasm32)
-    let ret = NestedStructGroupB.roundtripMetadata(_: NestedStructGroupB.Metadata.bridgeJSLiftParameter())
-    return ret.bridgeJSLowerReturn()
+    let __bjs_capture = 0
+    return _bjs_makePromise(resolve: Promise_resolve_SS, reject: Promise_reject) { [__bjs_capture] () async throws(JSException) -> String in
+        _ = __bjs_capture
+        return try await zeroArgAsyncThrows()
+    }
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_IntegerTypesSupportExports_static_roundTripInt")
-@_cdecl("bjs_IntegerTypesSupportExports_static_roundTripInt")
-public func _bjs_IntegerTypesSupportExports_static_roundTripInt(_ v: Int32) -> Int32 {
+@_expose(wasm, "bjs_asyncRoundTripVoid")
+@_cdecl("bjs_asyncRoundTripVoid")
+public func _bjs_asyncRoundTripVoid() -> Int32 {
     #if arch(wasm32)
-    let ret = IntegerTypesSupportExports.roundTripInt(_: Int.bridgeJSLiftParameter(v))
-    return ret.bridgeJSLowerReturn()
+    return _bjs_makePromise(resolve: Promise_resolve_y, reject: Promise_reject) {
+        await asyncRoundTripVoid()
+    }
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_IntegerTypesSupportExports_static_roundTripUInt")
-@_cdecl("bjs_IntegerTypesSupportExports_static_roundTripUInt")
-public func _bjs_IntegerTypesSupportExports_static_roundTripUInt(_ v: Int32) -> Int32 {
+@_expose(wasm, "bjs_asyncRoundTripInt")
+@_cdecl("bjs_asyncRoundTripInt")
+public func _bjs_asyncRoundTripInt(_ v: Int32) -> Int32 {
     #if arch(wasm32)
-    let ret = IntegerTypesSupportExports.roundTripUInt(_: UInt.bridgeJSLiftParameter(v))
-    return ret.bridgeJSLowerReturn()
+    return _bjs_makePromise(resolve: Promise_resolve_Si, reject: Promise_reject) {
+        return await asyncRoundTripInt(v: Int.bridgeJSLiftParameter(v))
+    }
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_IntegerTypesSupportExports_static_roundTripInt8")
-@_cdecl("bjs_IntegerTypesSupportExports_static_roundTripInt8")
-public func _bjs_IntegerTypesSupportExports_static_roundTripInt8(_ v: Int32) -> Int32 {
+@_expose(wasm, "bjs_asyncRoundTripFloat")
+@_cdecl("bjs_asyncRoundTripFloat")
+public func _bjs_asyncRoundTripFloat(_ v: Float32) -> Int32 {
     #if arch(wasm32)
-    let ret = IntegerTypesSupportExports.roundTripInt8(_: Int8.bridgeJSLiftParameter(v))
-    return ret.bridgeJSLowerReturn()
+    return _bjs_makePromise(resolve: Promise_resolve_Sf, reject: Promise_reject) {
+        return await asyncRoundTripFloat(v: Float.bridgeJSLiftParameter(v))
+    }
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_IntegerTypesSupportExports_static_roundTripUInt8")
-@_cdecl("bjs_IntegerTypesSupportExports_static_roundTripUInt8")
-public func _bjs_IntegerTypesSupportExports_static_roundTripUInt8(_ v: Int32) -> Int32 {
+@_expose(wasm, "bjs_asyncRoundTripDouble")
+@_cdecl("bjs_asyncRoundTripDouble")
+public func _bjs_asyncRoundTripDouble(_ v: Float64) -> Int32 {
     #if arch(wasm32)
-    let ret = IntegerTypesSupportExports.roundTripUInt8(_: UInt8.bridgeJSLiftParameter(v))
-    return ret.bridgeJSLowerReturn()
+    return _bjs_makePromise(resolve: Promise_resolve_Sd, reject: Promise_reject) {
+        return await asyncRoundTripDouble(v: Double.bridgeJSLiftParameter(v))
+    }
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_IntegerTypesSupportExports_static_roundTripInt16")
-@_cdecl("bjs_IntegerTypesSupportExports_static_roundTripInt16")
-public func _bjs_IntegerTypesSupportExports_static_roundTripInt16(_ v: Int32) -> Int32 {
+@_expose(wasm, "bjs_asyncRoundTripBool")
+@_cdecl("bjs_asyncRoundTripBool")
+public func _bjs_asyncRoundTripBool(_ v: Int32) -> Int32 {
     #if arch(wasm32)
-    let ret = IntegerTypesSupportExports.roundTripInt16(_: Int16.bridgeJSLiftParameter(v))
-    return ret.bridgeJSLowerReturn()
+    return _bjs_makePromise(resolve: Promise_resolve_Sb, reject: Promise_reject) {
+        return await asyncRoundTripBool(v: Bool.bridgeJSLiftParameter(v))
+    }
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_IntegerTypesSupportExports_static_roundTripUInt16")
-@_cdecl("bjs_IntegerTypesSupportExports_static_roundTripUInt16")
-public func _bjs_IntegerTypesSupportExports_static_roundTripUInt16(_ v: Int32) -> Int32 {
+@_expose(wasm, "bjs_asyncRoundTripString")
+@_cdecl("bjs_asyncRoundTripString")
+public func _bjs_asyncRoundTripString(_ vBytes: Int32, _ vLength: Int32) -> Int32 {
     #if arch(wasm32)
-    let ret = IntegerTypesSupportExports.roundTripUInt16(_: UInt16.bridgeJSLiftParameter(v))
-    return ret.bridgeJSLowerReturn()
+    return _bjs_makePromise(resolve: Promise_resolve_SS, reject: Promise_reject) {
+        return await asyncRoundTripString(v: String.bridgeJSLiftParameter(vBytes, vLength))
+    }
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_IntegerTypesSupportExports_static_roundTripInt32")
-@_cdecl("bjs_IntegerTypesSupportExports_static_roundTripInt32")
-public func _bjs_IntegerTypesSupportExports_static_roundTripInt32(_ v: Int32) -> Int32 {
+@_expose(wasm, "bjs_asyncRoundTripSwiftHeapObject")
+@_cdecl("bjs_asyncRoundTripSwiftHeapObject")
+public func _bjs_asyncRoundTripSwiftHeapObject(_ v: UnsafeMutableRawPointer) -> Int32 {
     #if arch(wasm32)
-    let ret = IntegerTypesSupportExports.roundTripInt32(_: Int32.bridgeJSLiftParameter(v))
-    return ret.bridgeJSLowerReturn()
+    return _bjs_makePromise(resolve: Promise_resolve_7GreeterC, reject: Promise_reject) {
+        return await asyncRoundTripSwiftHeapObject(v: Greeter.bridgeJSLiftParameter(v))
+    }
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_IntegerTypesSupportExports_static_roundTripUInt32")
-@_cdecl("bjs_IntegerTypesSupportExports_static_roundTripUInt32")
-public func _bjs_IntegerTypesSupportExports_static_roundTripUInt32(_ v: Int32) -> Int32 {
+@_expose(wasm, "bjs_asyncRoundTripJSObject")
+@_cdecl("bjs_asyncRoundTripJSObject")
+public func _bjs_asyncRoundTripJSObject(_ v: Int32) -> Int32 {
     #if arch(wasm32)
-    let ret = IntegerTypesSupportExports.roundTripUInt32(_: UInt32.bridgeJSLiftParameter(v))
-    return ret.bridgeJSLowerReturn()
+    return _bjs_makePromise(resolve: Promise_resolve_8JSObjectC, reject: Promise_reject) {
+        return await asyncRoundTripJSObject(v: JSObject.bridgeJSLiftParameter(v))
+    }
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_IntegerTypesSupportExports_static_roundTripInt64")
-@_cdecl("bjs_IntegerTypesSupportExports_static_roundTripInt64")
-public func _bjs_IntegerTypesSupportExports_static_roundTripInt64(_ v: Int64) -> Int64 {
+@_expose(wasm, "bjs_takeGreeter")
+@_cdecl("bjs_takeGreeter")
+public func _bjs_takeGreeter(_ g: UnsafeMutableRawPointer, _ nameBytes: Int32, _ nameLength: Int32) -> Void {
     #if arch(wasm32)
-    let ret = IntegerTypesSupportExports.roundTripInt64(_: Int64.bridgeJSLiftParameter(v))
-    return ret.bridgeJSLowerReturn()
+    takeGreeter(g: Greeter.bridgeJSLiftParameter(g), name: String.bridgeJSLiftParameter(nameBytes, nameLength))
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_IntegerTypesSupportExports_static_roundTripUInt64")
-@_cdecl("bjs_IntegerTypesSupportExports_static_roundTripUInt64")
-public func _bjs_IntegerTypesSupportExports_static_roundTripUInt64(_ v: Int64) -> Int64 {
+@_expose(wasm, "bjs_createCalculator")
+@_cdecl("bjs_createCalculator")
+public func _bjs_createCalculator() -> UnsafeMutableRawPointer {
     #if arch(wasm32)
-    let ret = IntegerTypesSupportExports.roundTripUInt64(_: UInt64.bridgeJSLiftParameter(v))
+    let ret = createCalculator()
     return ret.bridgeJSLowerReturn()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_JSTypedArrayExports_static_roundTripUint8Array")
-@_cdecl("bjs_JSTypedArrayExports_static_roundTripUint8Array")
-public func _bjs_JSTypedArrayExports_static_roundTripUint8Array(_ v: Int32) -> Int32 {
+@_expose(wasm, "bjs_useCalculator")
+@_cdecl("bjs_useCalculator")
+public func _bjs_useCalculator(_ calc: UnsafeMutableRawPointer, _ x: Int32, _ y: Int32) -> Int32 {
     #if arch(wasm32)
-    let ret = JSTypedArrayExports.roundTripUint8Array(_: JSUint8Array.bridgeJSLiftParameter(v))
+    let ret = useCalculator(calc: Calculator.bridgeJSLiftParameter(calc), x: Int.bridgeJSLiftParameter(x), y: Int.bridgeJSLiftParameter(y))
     return ret.bridgeJSLowerReturn()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_JSTypedArrayExports_static_roundTripFloat32Array")
-@_cdecl("bjs_JSTypedArrayExports_static_roundTripFloat32Array")
-public func _bjs_JSTypedArrayExports_static_roundTripFloat32Array(_ v: Int32) -> Int32 {
+@_expose(wasm, "bjs_testGreeterToJSValue")
+@_cdecl("bjs_testGreeterToJSValue")
+public func _bjs_testGreeterToJSValue() -> Int32 {
     #if arch(wasm32)
-    let ret = JSTypedArrayExports.roundTripFloat32Array(_: JSFloat32Array.bridgeJSLiftParameter(v))
+    let ret = testGreeterToJSValue()
     return ret.bridgeJSLowerReturn()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_JSTypedArrayExports_static_roundTripFloat64Array")
-@_cdecl("bjs_JSTypedArrayExports_static_roundTripFloat64Array")
-public func _bjs_JSTypedArrayExports_static_roundTripFloat64Array(_ v: Int32) -> Int32 {
+@_expose(wasm, "bjs_testCalculatorToJSValue")
+@_cdecl("bjs_testCalculatorToJSValue")
+public func _bjs_testCalculatorToJSValue() -> Int32 {
     #if arch(wasm32)
-    let ret = JSTypedArrayExports.roundTripFloat64Array(_: JSFloat64Array.bridgeJSLiftParameter(v))
+    let ret = testCalculatorToJSValue()
     return ret.bridgeJSLowerReturn()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_JSTypedArrayExports_static_roundTripInt32Array")
-@_cdecl("bjs_JSTypedArrayExports_static_roundTripInt32Array")
-public func _bjs_JSTypedArrayExports_static_roundTripInt32Array(_ v: Int32) -> Int32 {
+@_expose(wasm, "bjs_testSwiftClassAsJSValue")
+@_cdecl("bjs_testSwiftClassAsJSValue")
+public func _bjs_testSwiftClassAsJSValue(_ greeter: UnsafeMutableRawPointer) -> Int32 {
     #if arch(wasm32)
-    let ret = JSTypedArrayExports.roundTripInt32Array(_: JSInt32Array.bridgeJSLiftParameter(v))
+    let ret = testSwiftClassAsJSValue(greeter: Greeter.bridgeJSLiftParameter(greeter))
     return ret.bridgeJSLowerReturn()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_OptionalSupportExports_static_roundTripOptionalString")
-@_cdecl("bjs_OptionalSupportExports_static_roundTripOptionalString")
-public func _bjs_OptionalSupportExports_static_roundTripOptionalString(_ vIsSome: Int32, _ vBytes: Int32, _ vLength: Int32) -> Void {
+@_expose(wasm, "bjs_setDirection")
+@_cdecl("bjs_setDirection")
+public func _bjs_setDirection(_ direction: Int32) -> Int32 {
     #if arch(wasm32)
-    let ret = OptionalSupportExports.roundTripOptionalString(_: Optional<String>.bridgeJSLiftParameter(vIsSome, vBytes, vLength))
+    let ret = setDirection(_: Direction.bridgeJSLiftParameter(direction))
     return ret.bridgeJSLowerReturn()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_OptionalSupportExports_static_roundTripOptionalInt")
-@_cdecl("bjs_OptionalSupportExports_static_roundTripOptionalInt")
-public func _bjs_OptionalSupportExports_static_roundTripOptionalInt(_ vIsSome: Int32, _ vValue: Int32) -> Void {
+@_expose(wasm, "bjs_getDirection")
+@_cdecl("bjs_getDirection")
+public func _bjs_getDirection() -> Int32 {
     #if arch(wasm32)
-    let ret = OptionalSupportExports.roundTripOptionalInt(_: Optional<Int>.bridgeJSLiftParameter(vIsSome, vValue))
+    let ret = getDirection()
     return ret.bridgeJSLowerReturn()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_OptionalSupportExports_static_roundTripOptionalBool")
-@_cdecl("bjs_OptionalSupportExports_static_roundTripOptionalBool")
-public func _bjs_OptionalSupportExports_static_roundTripOptionalBool(_ vIsSome: Int32, _ vValue: Int32) -> Void {
+@_expose(wasm, "bjs_processDirection")
+@_cdecl("bjs_processDirection")
+public func _bjs_processDirection(_ input: Int32) -> Int32 {
     #if arch(wasm32)
-    let ret = OptionalSupportExports.roundTripOptionalBool(_: Optional<Bool>.bridgeJSLiftParameter(vIsSome, vValue))
+    let ret = processDirection(_: Direction.bridgeJSLiftParameter(input))
     return ret.bridgeJSLowerReturn()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_OptionalSupportExports_static_roundTripOptionalFloat")
-@_cdecl("bjs_OptionalSupportExports_static_roundTripOptionalFloat")
-public func _bjs_OptionalSupportExports_static_roundTripOptionalFloat(_ vIsSome: Int32, _ vValue: Float32) -> Void {
+@_expose(wasm, "bjs_setTheme")
+@_cdecl("bjs_setTheme")
+public func _bjs_setTheme(_ themeBytes: Int32, _ themeLength: Int32) -> Void {
     #if arch(wasm32)
-    let ret = OptionalSupportExports.roundTripOptionalFloat(_: Optional<Float>.bridgeJSLiftParameter(vIsSome, vValue))
+    let ret = setTheme(_: Theme.bridgeJSLiftParameter(themeBytes, themeLength))
     return ret.bridgeJSLowerReturn()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_OptionalSupportExports_static_roundTripOptionalDouble")
-@_cdecl("bjs_OptionalSupportExports_static_roundTripOptionalDouble")
-public func _bjs_OptionalSupportExports_static_roundTripOptionalDouble(_ vIsSome: Int32, _ vValue: Float64) -> Void {
+@_expose(wasm, "bjs_getTheme")
+@_cdecl("bjs_getTheme")
+public func _bjs_getTheme() -> Void {
     #if arch(wasm32)
-    let ret = OptionalSupportExports.roundTripOptionalDouble(_: Optional<Double>.bridgeJSLiftParameter(vIsSome, vValue))
+    let ret = getTheme()
     return ret.bridgeJSLowerReturn()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_OptionalSupportExports_static_roundTripOptionalSyntax")
-@_cdecl("bjs_OptionalSupportExports_static_roundTripOptionalSyntax")
-public func _bjs_OptionalSupportExports_static_roundTripOptionalSyntax(_ vIsSome: Int32, _ vBytes: Int32, _ vLength: Int32) -> Void {
+@_expose(wasm, "bjs_asyncRoundTripTheme")
+@_cdecl("bjs_asyncRoundTripTheme")
+public func _bjs_asyncRoundTripTheme(_ vBytes: Int32, _ vLength: Int32) -> Int32 {
     #if arch(wasm32)
-    let ret = OptionalSupportExports.roundTripOptionalSyntax(_: Optional<String>.bridgeJSLiftParameter(vIsSome, vBytes, vLength))
-    return ret.bridgeJSLowerReturn()
+    return _bjs_makePromise(resolve: Promise_resolve_5ThemeO, reject: Promise_reject) {
+        return await asyncRoundTripTheme(_: Theme.bridgeJSLiftParameter(vBytes, vLength))
+    }
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_OptionalSupportExports_static_roundTripOptionalCaseEnum")
-@_cdecl("bjs_OptionalSupportExports_static_roundTripOptionalCaseEnum")
-public func _bjs_OptionalSupportExports_static_roundTripOptionalCaseEnum(_ vIsSome: Int32, _ vValue: Int32) -> Void {
+@_expose(wasm, "bjs_asyncRoundTripDirection")
+@_cdecl("bjs_asyncRoundTripDirection")
+public func _bjs_asyncRoundTripDirection(_ v: Int32) -> Int32 {
     #if arch(wasm32)
-    let ret = OptionalSupportExports.roundTripOptionalCaseEnum(_: Optional<Status>.bridgeJSLiftParameter(vIsSome, vValue))
-    return ret.bridgeJSLowerReturn()
+    return _bjs_makePromise(resolve: Promise_resolve_9DirectionO, reject: Promise_reject) {
+        return await asyncRoundTripDirection(_: Direction.bridgeJSLiftParameter(v))
+    }
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_OptionalSupportExports_static_roundTripOptionalStringRawValueEnum")
-@_cdecl("bjs_OptionalSupportExports_static_roundTripOptionalStringRawValueEnum")
-public func _bjs_OptionalSupportExports_static_roundTripOptionalStringRawValueEnum(_ vIsSome: Int32, _ vBytes: Int32, _ vLength: Int32) -> Void {
+@_expose(wasm, "bjs_asyncRoundTripOptionalTheme")
+@_cdecl("bjs_asyncRoundTripOptionalTheme")
+public func _bjs_asyncRoundTripOptionalTheme(_ vIsSome: Int32, _ vBytes: Int32, _ vLength: Int32) -> Int32 {
     #if arch(wasm32)
-    let ret = OptionalSupportExports.roundTripOptionalStringRawValueEnum(_: Optional<Theme>.bridgeJSLiftParameter(vIsSome, vBytes, vLength))
-    return ret.bridgeJSLowerReturn()
+    return _bjs_makePromise(resolve: Promise_resolve_Sq5ThemeO, reject: Promise_reject) {
+        return await asyncRoundTripOptionalTheme(_: Optional<Theme>.bridgeJSLiftParameter(vIsSome, vBytes, vLength))
+    }
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_OptionalSupportExports_static_roundTripOptionalIntRawValueEnum")
-@_cdecl("bjs_OptionalSupportExports_static_roundTripOptionalIntRawValueEnum")
-public func _bjs_OptionalSupportExports_static_roundTripOptionalIntRawValueEnum(_ vIsSome: Int32, _ vValue: Int32) -> Void {
+@_expose(wasm, "bjs_asyncRoundTripOptionalDirection")
+@_cdecl("bjs_asyncRoundTripOptionalDirection")
+public func _bjs_asyncRoundTripOptionalDirection(_ vIsSome: Int32, _ vValue: Int32) -> Int32 {
     #if arch(wasm32)
-    let ret = OptionalSupportExports.roundTripOptionalIntRawValueEnum(_: Optional<HttpStatus>.bridgeJSLiftParameter(vIsSome, vValue))
-    return ret.bridgeJSLowerReturn()
+    return _bjs_makePromise(resolve: Promise_resolve_Sq9DirectionO, reject: Promise_reject) {
+        return await asyncRoundTripOptionalDirection(_: Optional<Direction>.bridgeJSLiftParameter(vIsSome, vValue))
+    }
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_OptionalSupportExports_static_roundTripOptionalInt64RawValueEnum")
-@_cdecl("bjs_OptionalSupportExports_static_roundTripOptionalInt64RawValueEnum")
-public func _bjs_OptionalSupportExports_static_roundTripOptionalInt64RawValueEnum(_ vIsSome: Int32, _ vValue: Int64) -> Void {
+@_expose(wasm, "bjs_asyncRoundTripDirectionArray")
+@_cdecl("bjs_asyncRoundTripDirectionArray")
+public func _bjs_asyncRoundTripDirectionArray() -> Int32 {
     #if arch(wasm32)
-    let ret = OptionalSupportExports.roundTripOptionalInt64RawValueEnum(_: Optional<FileSize>.bridgeJSLiftParameter(vIsSome, vValue))
-    return ret.bridgeJSLowerReturn()
+    let _tmp_v = [Direction].bridgeJSStackPop()
+    return _bjs_makePromise(resolve: Promise_resolve_Sa9DirectionO, reject: Promise_reject) {
+        return await asyncRoundTripDirectionArray(_: _tmp_v)
+    }
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_OptionalSupportExports_static_roundTripOptionalUInt64RawValueEnum")
-@_cdecl("bjs_OptionalSupportExports_static_roundTripOptionalUInt64RawValueEnum")
-public func _bjs_OptionalSupportExports_static_roundTripOptionalUInt64RawValueEnum(_ vIsSome: Int32, _ vValue: Int64) -> Void {
+@_expose(wasm, "bjs_asyncRoundTripDirectionDict")
+@_cdecl("bjs_asyncRoundTripDirectionDict")
+public func _bjs_asyncRoundTripDirectionDict() -> Int32 {
     #if arch(wasm32)
-    let ret = OptionalSupportExports.roundTripOptionalUInt64RawValueEnum(_: Optional<SessionId>.bridgeJSLiftParameter(vIsSome, vValue))
-    return ret.bridgeJSLowerReturn()
+    let _tmp_v = [String: Direction].bridgeJSLiftParameter()
+    return _bjs_makePromise(resolve: Promise_resolve_SD9DirectionO, reject: Promise_reject) {
+        return await asyncRoundTripDirectionDict(_: _tmp_v)
+    }
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_OptionalSupportExports_static_roundTripOptionalTSEnum")
-@_cdecl("bjs_OptionalSupportExports_static_roundTripOptionalTSEnum")
-public func _bjs_OptionalSupportExports_static_roundTripOptionalTSEnum(_ vIsSome: Int32, _ vValue: Int32) -> Void {
+@_expose(wasm, "bjs_asyncRoundTripThemeArray")
+@_cdecl("bjs_asyncRoundTripThemeArray")
+public func _bjs_asyncRoundTripThemeArray() -> Int32 {
     #if arch(wasm32)
-    let ret = OptionalSupportExports.roundTripOptionalTSEnum(_: Optional<TSDirection>.bridgeJSLiftParameter(vIsSome, vValue))
-    return ret.bridgeJSLowerReturn()
+    let _tmp_v = [Theme].bridgeJSStackPop()
+    return _bjs_makePromise(resolve: Promise_resolve_Sa5ThemeO, reject: Promise_reject) {
+        return await asyncRoundTripThemeArray(_: _tmp_v)
+    }
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_OptionalSupportExports_static_roundTripOptionalTSStringEnum")
-@_cdecl("bjs_OptionalSupportExports_static_roundTripOptionalTSStringEnum")
-public func _bjs_OptionalSupportExports_static_roundTripOptionalTSStringEnum(_ vIsSome: Int32, _ vBytes: Int32, _ vLength: Int32) -> Void {
+@_expose(wasm, "bjs_asyncRoundTripThemeDict")
+@_cdecl("bjs_asyncRoundTripThemeDict")
+public func _bjs_asyncRoundTripThemeDict() -> Int32 {
     #if arch(wasm32)
-    let ret = OptionalSupportExports.roundTripOptionalTSStringEnum(_: Optional<TSTheme>.bridgeJSLiftParameter(vIsSome, vBytes, vLength))
-    return ret.bridgeJSLowerReturn()
+    let _tmp_v = [String: Theme].bridgeJSLiftParameter()
+    return _bjs_makePromise(resolve: Promise_resolve_SD5ThemeO, reject: Promise_reject) {
+        return await asyncRoundTripThemeDict(_: _tmp_v)
+    }
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_OptionalSupportExports_static_roundTripOptionalNamespacedEnum")
-@_cdecl("bjs_OptionalSupportExports_static_roundTripOptionalNamespacedEnum")
-public func _bjs_OptionalSupportExports_static_roundTripOptionalNamespacedEnum(_ vIsSome: Int32, _ vValue: Int32) -> Void {
+@_expose(wasm, "bjs_asyncRoundTripFileSize")
+@_cdecl("bjs_asyncRoundTripFileSize")
+public func _bjs_asyncRoundTripFileSize(_ v: Int64) -> Int32 {
     #if arch(wasm32)
-    let ret = OptionalSupportExports.roundTripOptionalNamespacedEnum(_: Optional<Networking.API.Method>.bridgeJSLiftParameter(vIsSome, vValue))
-    return ret.bridgeJSLowerReturn()
+    return _bjs_makePromise(resolve: Promise_resolve_8FileSizeO, reject: Promise_reject) {
+        return await asyncRoundTripFileSize(_: FileSize.bridgeJSLiftParameter(v))
+    }
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_OptionalSupportExports_static_roundTripOptionalSwiftClass")
-@_cdecl("bjs_OptionalSupportExports_static_roundTripOptionalSwiftClass")
-public func _bjs_OptionalSupportExports_static_roundTripOptionalSwiftClass(_ vIsSome: Int32, _ vValue: UnsafeMutableRawPointer) -> Void {
+@_expose(wasm, "bjs_asyncRoundTripOptionalFileSize")
+@_cdecl("bjs_asyncRoundTripOptionalFileSize")
+public func _bjs_asyncRoundTripOptionalFileSize(_ vIsSome: Int32, _ vValue: Int64) -> Int32 {
     #if arch(wasm32)
-    let ret = OptionalSupportExports.roundTripOptionalSwiftClass(_: Optional<Greeter>.bridgeJSLiftParameter(vIsSome, vValue))
-    return ret.bridgeJSLowerReturn()
+    return _bjs_makePromise(resolve: Promise_resolve_Sq8FileSizeO, reject: Promise_reject) {
+        return await asyncRoundTripOptionalFileSize(_: Optional<FileSize>.bridgeJSLiftParameter(vIsSome, vValue))
+    }
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_OptionalSupportExports_static_roundTripOptionalIntArray")
-@_cdecl("bjs_OptionalSupportExports_static_roundTripOptionalIntArray")
-public func _bjs_OptionalSupportExports_static_roundTripOptionalIntArray() -> Void {
+@_expose(wasm, "bjs_asyncRoundTripAssociatedValueEnum")
+@_cdecl("bjs_asyncRoundTripAssociatedValueEnum")
+public func _bjs_asyncRoundTripAssociatedValueEnum(_ v: Int32) -> Int32 {
     #if arch(wasm32)
-    let ret = OptionalSupportExports.roundTripOptionalIntArray(_: Optional<[Int]>.bridgeJSLiftParameter())
-    ret.bridgeJSStackPush()
+    let _tmp_v = AsyncPayloadResult.bridgeJSLiftParameter(v)
+    return _bjs_makePromise(resolve: Promise_resolve_18AsyncPayloadResultO, reject: Promise_reject) {
+        return await asyncRoundTripAssociatedValueEnum(_: _tmp_v)
+    }
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_OptionalSupportExports_static_roundTripOptionalStringArray")
-@_cdecl("bjs_OptionalSupportExports_static_roundTripOptionalStringArray")
-public func _bjs_OptionalSupportExports_static_roundTripOptionalStringArray() -> Void {
+@_expose(wasm, "bjs_asyncRoundTripOptionalAssociatedValueEnum")
+@_cdecl("bjs_asyncRoundTripOptionalAssociatedValueEnum")
+public func _bjs_asyncRoundTripOptionalAssociatedValueEnum(_ vIsSome: Int32, _ vCaseId: Int32) -> Int32 {
     #if arch(wasm32)
-    let ret = OptionalSupportExports.roundTripOptionalStringArray(_: Optional<[String]>.bridgeJSLiftParameter())
-    ret.bridgeJSStackPush()
+    let _tmp_v = Optional<AsyncPayloadResult>.bridgeJSLiftParameter(vIsSome, vCaseId)
+    return _bjs_makePromise(resolve: Promise_resolve_Sq18AsyncPayloadResultO, reject: Promise_reject) {
+        return await asyncRoundTripOptionalAssociatedValueEnum(_: _tmp_v)
+    }
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_OptionalSupportExports_static_roundTripOptionalSwiftClassArray")
-@_cdecl("bjs_OptionalSupportExports_static_roundTripOptionalSwiftClassArray")
-public func _bjs_OptionalSupportExports_static_roundTripOptionalSwiftClassArray() -> Void {
-    #if arch(wasm32)
-    let ret = OptionalSupportExports.roundTripOptionalSwiftClassArray(_: Optional<[Greeter]>.bridgeJSLiftParameter())
-    ret.bridgeJSStackPush()
+@_expose(wasm, "bjs_setHttpStatus")
+@_cdecl("bjs_setHttpStatus")
+public func _bjs_setHttpStatus(_ status: Int32) -> Int32 {
+    #if arch(wasm32)
+    let ret = setHttpStatus(_: HttpStatus.bridgeJSLiftParameter(status))
+    return ret.bridgeJSLowerReturn()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_OptionalSupportExports_static_roundTripOptionalAPIResult")
-@_cdecl("bjs_OptionalSupportExports_static_roundTripOptionalAPIResult")
-public func _bjs_OptionalSupportExports_static_roundTripOptionalAPIResult(_ vIsSome: Int32, _ vCaseId: Int32) -> Void {
+@_expose(wasm, "bjs_getHttpStatus")
+@_cdecl("bjs_getHttpStatus")
+public func _bjs_getHttpStatus() -> Int32 {
     #if arch(wasm32)
-    let ret = OptionalSupportExports.roundTripOptionalAPIResult(_: Optional<APIResult>.bridgeJSLiftParameter(vIsSome, vCaseId))
+    let ret = getHttpStatus()
     return ret.bridgeJSLowerReturn()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_OptionalSupportExports_static_roundTripOptionalTypedPayloadResult")
-@_cdecl("bjs_OptionalSupportExports_static_roundTripOptionalTypedPayloadResult")
-public func _bjs_OptionalSupportExports_static_roundTripOptionalTypedPayloadResult(_ vIsSome: Int32, _ vCaseId: Int32) -> Void {
+@_expose(wasm, "bjs_setFileSize")
+@_cdecl("bjs_setFileSize")
+public func _bjs_setFileSize(_ size: Int64) -> Int64 {
     #if arch(wasm32)
-    let ret = OptionalSupportExports.roundTripOptionalTypedPayloadResult(_: Optional<TypedPayloadResult>.bridgeJSLiftParameter(vIsSome, vCaseId))
+    let ret = setFileSize(_: FileSize.bridgeJSLiftParameter(size))
     return ret.bridgeJSLowerReturn()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_OptionalSupportExports_static_roundTripOptionalComplexResult")
-@_cdecl("bjs_OptionalSupportExports_static_roundTripOptionalComplexResult")
-public func _bjs_OptionalSupportExports_static_roundTripOptionalComplexResult(_ vIsSome: Int32, _ vCaseId: Int32) -> Void {
+@_expose(wasm, "bjs_getFileSize")
+@_cdecl("bjs_getFileSize")
+public func _bjs_getFileSize() -> Int64 {
     #if arch(wasm32)
-    let ret = OptionalSupportExports.roundTripOptionalComplexResult(_: Optional<ComplexResult>.bridgeJSLiftParameter(vIsSome, vCaseId))
+    let ret = getFileSize()
     return ret.bridgeJSLowerReturn()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_OptionalSupportExports_static_roundTripOptionalAllTypesResult")
-@_cdecl("bjs_OptionalSupportExports_static_roundTripOptionalAllTypesResult")
-public func _bjs_OptionalSupportExports_static_roundTripOptionalAllTypesResult(_ vIsSome: Int32, _ vCaseId: Int32) -> Void {
+@_expose(wasm, "bjs_setSessionId")
+@_cdecl("bjs_setSessionId")
+public func _bjs_setSessionId(_ session: Int64) -> Int64 {
     #if arch(wasm32)
-    let ret = OptionalSupportExports.roundTripOptionalAllTypesResult(_: Optional<AllTypesResult>.bridgeJSLiftParameter(vIsSome, vCaseId))
+    let ret = setSessionId(_: SessionId.bridgeJSLiftParameter(session))
     return ret.bridgeJSLowerReturn()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_OptionalSupportExports_static_roundTripOptionalPayloadResult")
-@_cdecl("bjs_OptionalSupportExports_static_roundTripOptionalPayloadResult")
-public func _bjs_OptionalSupportExports_static_roundTripOptionalPayloadResult(_ v: Int32) -> Void {
+@_expose(wasm, "bjs_getSessionId")
+@_cdecl("bjs_getSessionId")
+public func _bjs_getSessionId() -> Int64 {
     #if arch(wasm32)
-    let ret = OptionalSupportExports.roundTripOptionalPayloadResult(_: OptionalAllTypesResult.bridgeJSLiftParameter(v))
+    let ret = getSessionId()
     return ret.bridgeJSLowerReturn()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_OptionalSupportExports_static_roundTripOptionalPayloadResultOpt")
-@_cdecl("bjs_OptionalSupportExports_static_roundTripOptionalPayloadResultOpt")
-public func _bjs_OptionalSupportExports_static_roundTripOptionalPayloadResultOpt(_ vIsSome: Int32, _ vCaseId: Int32) -> Void {
+@_expose(wasm, "bjs_processTheme")
+@_cdecl("bjs_processTheme")
+public func _bjs_processTheme(_ themeBytes: Int32, _ themeLength: Int32) -> Int32 {
     #if arch(wasm32)
-    let ret = OptionalSupportExports.roundTripOptionalPayloadResultOpt(_: Optional<OptionalAllTypesResult>.bridgeJSLiftParameter(vIsSome, vCaseId))
+    let ret = processTheme(_: Theme.bridgeJSLiftParameter(themeBytes, themeLength))
     return ret.bridgeJSLowerReturn()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_OptionalSupportExports_static_roundTripOptionalAPIOptionalResult")
-@_cdecl("bjs_OptionalSupportExports_static_roundTripOptionalAPIOptionalResult")
-public func _bjs_OptionalSupportExports_static_roundTripOptionalAPIOptionalResult(_ vIsSome: Int32, _ vCaseId: Int32) -> Void {
+@_expose(wasm, "bjs_setTSDirection")
+@_cdecl("bjs_setTSDirection")
+public func _bjs_setTSDirection(_ direction: Int32) -> Int32 {
     #if arch(wasm32)
-    let ret = OptionalSupportExports.roundTripOptionalAPIOptionalResult(_: Optional<APIOptionalResult>.bridgeJSLiftParameter(vIsSome, vCaseId))
+    let ret = setTSDirection(_: TSDirection.bridgeJSLiftParameter(direction))
     return ret.bridgeJSLowerReturn()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_OptionalSupportExports_static_takeOptionalJSObject")
-@_cdecl("bjs_OptionalSupportExports_static_takeOptionalJSObject")
-public func _bjs_OptionalSupportExports_static_takeOptionalJSObject(_ valueIsSome: Int32, _ valueValue: Int32) -> Void {
+@_expose(wasm, "bjs_getTSDirection")
+@_cdecl("bjs_getTSDirection")
+public func _bjs_getTSDirection() -> Int32 {
     #if arch(wasm32)
-    OptionalSupportExports.takeOptionalJSObject(_: Optional<JSObject>.bridgeJSLiftParameter(valueIsSome, valueValue))
+    let ret = getTSDirection()
+    return ret.bridgeJSLowerReturn()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_OptionalSupportExports_static_applyOptionalGreeter")
-@_cdecl("bjs_OptionalSupportExports_static_applyOptionalGreeter")
-public func _bjs_OptionalSupportExports_static_applyOptionalGreeter(_ valueIsSome: Int32, _ valueValue: UnsafeMutableRawPointer, _ transform: Int32) -> Void {
+@_expose(wasm, "bjs_setTSTheme")
+@_cdecl("bjs_setTSTheme")
+public func _bjs_setTSTheme(_ themeBytes: Int32, _ themeLength: Int32) -> Void {
     #if arch(wasm32)
-    let ret = OptionalSupportExports.applyOptionalGreeter(_: Optional<Greeter>.bridgeJSLiftParameter(valueIsSome, valueValue), _: _BJS_Closure_20BridgeJSRuntimeTestsSq7GreeterC_Sq7GreeterC.bridgeJSLift(transform))
+    let ret = setTSTheme(_: TSTheme.bridgeJSLiftParameter(themeBytes, themeLength))
     return ret.bridgeJSLowerReturn()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_OptionalSupportExports_static_makeOptionalHolder")
-@_cdecl("bjs_OptionalSupportExports_static_makeOptionalHolder")
-public func _bjs_OptionalSupportExports_static_makeOptionalHolder(_ nullableGreeterIsSome: Int32, _ nullableGreeterValue: UnsafeMutableRawPointer, _ undefinedNumberIsSome: Int32, _ undefinedNumberValue: Float64) -> UnsafeMutableRawPointer {
+@_expose(wasm, "bjs_getTSTheme")
+@_cdecl("bjs_getTSTheme")
+public func _bjs_getTSTheme() -> Void {
     #if arch(wasm32)
-    let ret = OptionalSupportExports.makeOptionalHolder(nullableGreeter: Optional<Greeter>.bridgeJSLiftParameter(nullableGreeterIsSome, nullableGreeterValue), undefinedNumber: JSUndefinedOr<Double>.bridgeJSLiftParameter(undefinedNumberIsSome, undefinedNumberValue))
+    let ret = getTSTheme()
     return ret.bridgeJSLowerReturn()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_OptionalSupportExports_static_compareAPIResults")
-@_cdecl("bjs_OptionalSupportExports_static_compareAPIResults")
-public func _bjs_OptionalSupportExports_static_compareAPIResults(_ r1IsSome: Int32, _ r1CaseId: Int32, _ r2IsSome: Int32, _ r2CaseId: Int32) -> Void {
+@_expose(wasm, "bjs_createConverter")
+@_cdecl("bjs_createConverter")
+public func _bjs_createConverter() -> UnsafeMutableRawPointer {
     #if arch(wasm32)
-    let _tmp_r2 = Optional<APIResult>.bridgeJSLiftParameter(r2IsSome, r2CaseId)
-    let _tmp_r1 = Optional<APIResult>.bridgeJSLiftParameter(r1IsSome, r1CaseId)
-    let ret = OptionalSupportExports.compareAPIResults(_: _tmp_r1, _: _tmp_r2)
+    let ret = createConverter()
     return ret.bridgeJSLowerReturn()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-extension OptionalAllTypesResult: _BridgedSwiftAssociatedValueEnum {
-    @_spi(BridgeJS) @_transparent public static func bridgeJSStackPopPayload(_ caseId: Int32) -> OptionalAllTypesResult {
-        switch caseId {
-        case 0:
-            return .optStruct(Optional<Address>.bridgeJSStackPop())
-        case 1:
-            return .optClass(Optional<Greeter>.bridgeJSStackPop())
-        case 2:
-            return .optJSObject(Optional<JSObject>.bridgeJSStackPop())
-        case 3:
-            return .optNestedEnum(Optional<APIResult>.bridgeJSStackPop())
-        case 4:
-            return .optArray(Optional<[Int]>.bridgeJSStackPop())
-        case 5:
-            return .optJsClass(Optional<JSObject>.bridgeJSStackPop().map { Foo(unsafelyWrapping: $0) })
-        case 6:
-            return .empty
-        default:
-            fatalError("Unknown OptionalAllTypesResult case ID: \(caseId)")
-        }
-    }
-
-    @_spi(BridgeJS) @_transparent public consuming func bridgeJSStackPushPayload() -> Int32 {
-        switch self {
-        case .optStruct(let param0):
-            param0.bridgeJSStackPush()
-            return Int32(0)
-        case .optClass(let param0):
-            param0.bridgeJSStackPush()
-            return Int32(1)
-        case .optJSObject(let param0):
-            param0.bridgeJSStackPush()
-            return Int32(2)
-        case .optNestedEnum(let param0):
-            param0.bridgeJSStackPush()
-            return Int32(3)
-        case .optArray(let param0):
-            param0.bridgeJSStackPush()
-            return Int32(4)
-        case .optJsClass(let param0):
-            param0.bridgeJSStackPush()
-            return Int32(5)
-        case .empty:
-            return Int32(6)
-        }
-    }
-}
-
-extension APIOptionalResult: _BridgedSwiftAssociatedValueEnum {
-    @_spi(BridgeJS) @_transparent public static func bridgeJSStackPopPayload(_ caseId: Int32) -> APIOptionalResult {
-        switch caseId {
-        case 0:
-            return .success(Optional<String>.bridgeJSStackPop())
-        case 1:
-            return .failure(Optional<Int>.bridgeJSStackPop(), Optional<Bool>.bridgeJSStackPop())
-        case 2:
-            return .status(Optional<Bool>.bridgeJSStackPop(), Optional<Int>.bridgeJSStackPop(), Optional<String>.bridgeJSStackPop())
-        default:
-            fatalError("Unknown APIOptionalResult case ID: \(caseId)")
-        }
-    }
-
-    @_spi(BridgeJS) @_transparent public consuming func bridgeJSStackPushPayload() -> Int32 {
-        switch self {
-        case .success(let param0):
-            param0.bridgeJSStackPush()
-            return Int32(0)
-        case .failure(let param0, let param1):
-            param0.bridgeJSStackPush()
-            param1.bridgeJSStackPush()
-            return Int32(1)
-        case .status(let param0, let param1, let param2):
-            param0.bridgeJSStackPush()
-            param1.bridgeJSStackPush()
-            param2.bridgeJSStackPush()
-            return Int32(2)
-        }
-    }
-}
-
-extension NestedStructGroupA.Metadata: _BridgedSwiftStruct {
-    @_spi(BridgeJS) @_transparent public static func bridgeJSStackPop() -> NestedStructGroupA.Metadata {
-        let count = Int.bridgeJSStackPop()
-        let label = String.bridgeJSStackPop()
-        return NestedStructGroupA.Metadata(label: label, count: count)
-    }
-
-    @_spi(BridgeJS) @_transparent public consuming func bridgeJSStackPush() {
-        self.label.bridgeJSStackPush()
-        self.count.bridgeJSStackPush()
-    }
-
-    init(unsafelyCopying jsObject: JSObject) {
-        _bjs_struct_lower_NestedStructGroupA_Metadata(jsObject.bridgeJSLowerParameter())
-        self = Self.bridgeJSStackPop()
-    }
-
-    func toJSObject() -> JSObject {
-        let __bjs_self = self
-        __bjs_self.bridgeJSStackPush()
-        return JSObject(id: UInt32(bitPattern: _bjs_struct_lift_NestedStructGroupA_Metadata()))
-    }
-}
-
-#if arch(wasm32)
-@_extern(wasm, module: "bjs", name: "swift_js_struct_lower_NestedStructGroupA_Metadata")
-fileprivate func _bjs_struct_lower_NestedStructGroupA_Metadata_extern(_ objectId: Int32) -> Void
-#else
-fileprivate func _bjs_struct_lower_NestedStructGroupA_Metadata_extern(_ objectId: Int32) -> Void {
+@_expose(wasm, "bjs_useConverter")
+@_cdecl("bjs_useConverter")
+public func _bjs_useConverter(_ converter: UnsafeMutableRawPointer, _ value: Int32) -> Void {
+    #if arch(wasm32)
+    let ret = useConverter(converter: Utils.Converter.bridgeJSLiftParameter(converter), value: Int.bridgeJSLiftParameter(value))
+    return ret.bridgeJSLowerReturn()
+    #else
     fatalError("Only available on WebAssembly")
-}
-#endif
-@inline(never) fileprivate func _bjs_struct_lower_NestedStructGroupA_Metadata(_ objectId: Int32) -> Void {
-    return _bjs_struct_lower_NestedStructGroupA_Metadata_extern(objectId)
+    #endif
 }
 
-#if arch(wasm32)
-@_extern(wasm, module: "bjs", name: "swift_js_struct_lift_NestedStructGroupA_Metadata")
-fileprivate func _bjs_struct_lift_NestedStructGroupA_Metadata_extern() -> Int32
-#else
-fileprivate func _bjs_struct_lift_NestedStructGroupA_Metadata_extern() -> Int32 {
+@_expose(wasm, "bjs_roundTripConverterArray")
+@_cdecl("bjs_roundTripConverterArray")
+public func _bjs_roundTripConverterArray() -> Void {
+    #if arch(wasm32)
+    let ret = roundTripConverterArray(_: [Utils.Converter].bridgeJSStackPop())
+    ret.bridgeJSStackPush()
+    #else
     fatalError("Only available on WebAssembly")
-}
-#endif
-@inline(never) fileprivate func _bjs_struct_lift_NestedStructGroupA_Metadata() -> Int32 {
-    return _bjs_struct_lift_NestedStructGroupA_Metadata_extern()
-}
-
-extension NestedStructGroupB.Metadata: _BridgedSwiftStruct {
-    @_spi(BridgeJS) @_transparent public static func bridgeJSStackPop() -> NestedStructGroupB.Metadata {
-        let value = Double.bridgeJSStackPop()
-        let tag = String.bridgeJSStackPop()
-        return NestedStructGroupB.Metadata(tag: tag, value: value)
-    }
-
-    @_spi(BridgeJS) @_transparent public consuming func bridgeJSStackPush() {
-        self.tag.bridgeJSStackPush()
-        self.value.bridgeJSStackPush()
-    }
-
-    init(unsafelyCopying jsObject: JSObject) {
-        _bjs_struct_lower_NestedStructGroupB_Metadata(jsObject.bridgeJSLowerParameter())
-        self = Self.bridgeJSStackPop()
-    }
-
-    func toJSObject() -> JSObject {
-        let __bjs_self = self
-        __bjs_self.bridgeJSStackPush()
-        return JSObject(id: UInt32(bitPattern: _bjs_struct_lift_NestedStructGroupB_Metadata()))
-    }
+    #endif
 }
 
-#if arch(wasm32)
-@_extern(wasm, module: "bjs", name: "swift_js_struct_lower_NestedStructGroupB_Metadata")
-fileprivate func _bjs_struct_lower_NestedStructGroupB_Metadata_extern(_ objectId: Int32) -> Void
-#else
-fileprivate func _bjs_struct_lower_NestedStructGroupB_Metadata_extern(_ objectId: Int32) -> Void {
+@_expose(wasm, "bjs_createHTTPServer")
+@_cdecl("bjs_createHTTPServer")
+public func _bjs_createHTTPServer() -> UnsafeMutableRawPointer {
+    #if arch(wasm32)
+    let ret = createHTTPServer()
+    return ret.bridgeJSLowerReturn()
+    #else
     fatalError("Only available on WebAssembly")
-}
-#endif
-@inline(never) fileprivate func _bjs_struct_lower_NestedStructGroupB_Metadata(_ objectId: Int32) -> Void {
-    return _bjs_struct_lower_NestedStructGroupB_Metadata_extern(objectId)
+    #endif
 }
 
-#if arch(wasm32)
-@_extern(wasm, module: "bjs", name: "swift_js_struct_lift_NestedStructGroupB_Metadata")
-fileprivate func _bjs_struct_lift_NestedStructGroupB_Metadata_extern() -> Int32
-#else
-fileprivate func _bjs_struct_lift_NestedStructGroupB_Metadata_extern() -> Int32 {
+@_expose(wasm, "bjs_createUUID")
+@_cdecl("bjs_createUUID")
+public func _bjs_createUUID(_ valueBytes: Int32, _ valueLength: Int32) -> UnsafeMutableRawPointer {
+    #if arch(wasm32)
+    let ret = createUUID(value: String.bridgeJSLiftParameter(valueBytes, valueLength))
+    return ret.bridgeJSLowerReturn()
+    #else
     fatalError("Only available on WebAssembly")
+    #endif
 }
-#endif
-@inline(never) fileprivate func _bjs_struct_lift_NestedStructGroupB_Metadata() -> Int32 {
-    return _bjs_struct_lift_NestedStructGroupB_Metadata_extern()
-}
-
-extension Point: _BridgedSwiftStruct {
-    @_spi(BridgeJS) @_transparent public static func bridgeJSStackPop() -> Point {
-        let y = Int.bridgeJSStackPop()
-        let x = Int.bridgeJSStackPop()
-        return Point(x: x, y: y)
-    }
-
-    @_spi(BridgeJS) @_transparent public consuming func bridgeJSStackPush() {
-        self.x.bridgeJSStackPush()
-        self.y.bridgeJSStackPush()
-    }
-
-    init(unsafelyCopying jsObject: JSObject) {
-        _bjs_struct_lower_Point(jsObject.bridgeJSLowerParameter())
-        self = Self.bridgeJSStackPop()
-    }
 
-    func toJSObject() -> JSObject {
-        let __bjs_self = self
-        __bjs_self.bridgeJSStackPush()
-        return JSObject(id: UInt32(bitPattern: _bjs_struct_lift_Point()))
-    }
+@_expose(wasm, "bjs_roundTripUUID")
+@_cdecl("bjs_roundTripUUID")
+public func _bjs_roundTripUUID(_ uuid: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer {
+    #if arch(wasm32)
+    let ret = roundTripUUID(_: UUID.bridgeJSLiftParameter(uuid))
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
 }
 
-#if arch(wasm32)
-@_extern(wasm, module: "bjs", name: "swift_js_struct_lower_Point")
-fileprivate func _bjs_struct_lower_Point_extern(_ objectId: Int32) -> Void
-#else
-fileprivate func _bjs_struct_lower_Point_extern(_ objectId: Int32) -> Void {
+@_expose(wasm, "bjs_roundtripNetworkingAPIMethod")
+@_cdecl("bjs_roundtripNetworkingAPIMethod")
+public func _bjs_roundtripNetworkingAPIMethod(_ method: Int32) -> Int32 {
+    #if arch(wasm32)
+    let ret = roundtripNetworkingAPIMethod(_: Networking.API.Method.bridgeJSLiftParameter(method))
+    return ret.bridgeJSLowerReturn()
+    #else
     fatalError("Only available on WebAssembly")
-}
-#endif
-@inline(never) fileprivate func _bjs_struct_lower_Point(_ objectId: Int32) -> Void {
-    return _bjs_struct_lower_Point_extern(objectId)
+    #endif
 }
 
-#if arch(wasm32)
-@_extern(wasm, module: "bjs", name: "swift_js_struct_lift_Point")
-fileprivate func _bjs_struct_lift_Point_extern() -> Int32
-#else
-fileprivate func _bjs_struct_lift_Point_extern() -> Int32 {
+@_expose(wasm, "bjs_roundtripConfigurationLogLevel")
+@_cdecl("bjs_roundtripConfigurationLogLevel")
+public func _bjs_roundtripConfigurationLogLevel(_ levelBytes: Int32, _ levelLength: Int32) -> Void {
+    #if arch(wasm32)
+    let ret = roundtripConfigurationLogLevel(_: Configuration.LogLevel.bridgeJSLiftParameter(levelBytes, levelLength))
+    return ret.bridgeJSLowerReturn()
+    #else
     fatalError("Only available on WebAssembly")
+    #endif
 }
-#endif
-@inline(never) fileprivate func _bjs_struct_lift_Point() -> Int32 {
-    return _bjs_struct_lift_Point_extern()
-}
-
-extension PointerFields: _BridgedSwiftStruct {
-    @_spi(BridgeJS) @_transparent public static func bridgeJSStackPop() -> PointerFields {
-        let mutPtr = UnsafeMutablePointer<UInt8>.bridgeJSStackPop()
-        let ptr = UnsafePointer<UInt8>.bridgeJSStackPop()
-        let opaque = OpaquePointer.bridgeJSStackPop()
-        let mutRaw = UnsafeMutableRawPointer.bridgeJSStackPop()
-        let raw = UnsafeRawPointer.bridgeJSStackPop()
-        return PointerFields(raw: raw, mutRaw: mutRaw, opaque: opaque, ptr: ptr, mutPtr: mutPtr)
-    }
-
-    @_spi(BridgeJS) @_transparent public consuming func bridgeJSStackPush() {
-        self.raw.bridgeJSStackPush()
-        self.mutRaw.bridgeJSStackPush()
-        self.opaque.bridgeJSStackPush()
-        self.ptr.bridgeJSStackPush()
-        self.mutPtr.bridgeJSStackPush()
-    }
-
-    init(unsafelyCopying jsObject: JSObject) {
-        _bjs_struct_lower_PointerFields(jsObject.bridgeJSLowerParameter())
-        self = Self.bridgeJSStackPop()
-    }
 
-    func toJSObject() -> JSObject {
-        let __bjs_self = self
-        __bjs_self.bridgeJSStackPush()
-        return JSObject(id: UInt32(bitPattern: _bjs_struct_lift_PointerFields()))
-    }
+@_expose(wasm, "bjs_roundtripConfigurationPort")
+@_cdecl("bjs_roundtripConfigurationPort")
+public func _bjs_roundtripConfigurationPort(_ port: Int32) -> Int32 {
+    #if arch(wasm32)
+    let ret = roundtripConfigurationPort(_: Configuration.Port.bridgeJSLiftParameter(port))
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
 }
 
-#if arch(wasm32)
-@_extern(wasm, module: "bjs", name: "swift_js_struct_lower_PointerFields")
-fileprivate func _bjs_struct_lower_PointerFields_extern(_ objectId: Int32) -> Void
-#else
-fileprivate func _bjs_struct_lower_PointerFields_extern(_ objectId: Int32) -> Void {
+@_expose(wasm, "bjs_processConfigurationLogLevel")
+@_cdecl("bjs_processConfigurationLogLevel")
+public func _bjs_processConfigurationLogLevel(_ levelBytes: Int32, _ levelLength: Int32) -> Int32 {
+    #if arch(wasm32)
+    let ret = processConfigurationLogLevel(_: Configuration.LogLevel.bridgeJSLiftParameter(levelBytes, levelLength))
+    return ret.bridgeJSLowerReturn()
+    #else
     fatalError("Only available on WebAssembly")
+    #endif
 }
-#endif
-@inline(never) fileprivate func _bjs_struct_lower_PointerFields(_ objectId: Int32) -> Void {
-    return _bjs_struct_lower_PointerFields_extern(objectId)
+
+@_expose(wasm, "bjs_roundtripInternalSupportedMethod")
+@_cdecl("bjs_roundtripInternalSupportedMethod")
+public func _bjs_roundtripInternalSupportedMethod(_ method: Int32) -> Int32 {
+    #if arch(wasm32)
+    let ret = roundtripInternalSupportedMethod(_: Internal.SupportedMethod.bridgeJSLiftParameter(method))
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
 }
 
-#if arch(wasm32)
-@_extern(wasm, module: "bjs", name: "swift_js_struct_lift_PointerFields")
-fileprivate func _bjs_struct_lift_PointerFields_extern() -> Int32
-#else
-fileprivate func _bjs_struct_lift_PointerFields_extern() -> Int32 {
+@_expose(wasm, "bjs_roundtripAPIResult")
+@_cdecl("bjs_roundtripAPIResult")
+public func _bjs_roundtripAPIResult(_ result: Int32) -> Void {
+    #if arch(wasm32)
+    let ret = roundtripAPIResult(result: APIResult.bridgeJSLiftParameter(result))
+    return ret.bridgeJSLowerReturn()
+    #else
     fatalError("Only available on WebAssembly")
+    #endif
 }
-#endif
-@inline(never) fileprivate func _bjs_struct_lift_PointerFields() -> Int32 {
-    return _bjs_struct_lift_PointerFields_extern()
+
+@_expose(wasm, "bjs_makeAPIResultSuccess")
+@_cdecl("bjs_makeAPIResultSuccess")
+public func _bjs_makeAPIResultSuccess(_ valueBytes: Int32, _ valueLength: Int32) -> Void {
+    #if arch(wasm32)
+    let ret = makeAPIResultSuccess(_: String.bridgeJSLiftParameter(valueBytes, valueLength))
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
 }
 
-@_expose(wasm, "bjs_PointerFields_init")
-@_cdecl("bjs_PointerFields_init")
-public func _bjs_PointerFields_init(_ raw: UnsafeMutableRawPointer, _ mutRaw: UnsafeMutableRawPointer, _ opaque: UnsafeMutableRawPointer, _ ptr: UnsafeMutableRawPointer, _ mutPtr: UnsafeMutableRawPointer) -> Void {
+@_expose(wasm, "bjs_makeAPIResultFailure")
+@_cdecl("bjs_makeAPIResultFailure")
+public func _bjs_makeAPIResultFailure(_ value: Int32) -> Void {
     #if arch(wasm32)
-    let ret = PointerFields(raw: UnsafeRawPointer.bridgeJSLiftParameter(raw), mutRaw: UnsafeMutableRawPointer.bridgeJSLiftParameter(mutRaw), opaque: OpaquePointer.bridgeJSLiftParameter(opaque), ptr: UnsafePointer<UInt8>.bridgeJSLiftParameter(ptr), mutPtr: UnsafeMutablePointer<UInt8>.bridgeJSLiftParameter(mutPtr))
+    let ret = makeAPIResultFailure(_: Int.bridgeJSLiftParameter(value))
     return ret.bridgeJSLowerReturn()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-extension DataPoint: _BridgedSwiftStruct {
-    @_spi(BridgeJS) @_transparent public static func bridgeJSStackPop() -> DataPoint {
-        let optFlag = Optional<Bool>.bridgeJSStackPop()
-        let optCount = Optional<Int>.bridgeJSStackPop()
-        let label = String.bridgeJSStackPop()
-        let y = Double.bridgeJSStackPop()
-        let x = Double.bridgeJSStackPop()
-        return DataPoint(x: x, y: y, label: label, optCount: optCount, optFlag: optFlag)
-    }
+@_expose(wasm, "bjs_makeAPIResultInfo")
+@_cdecl("bjs_makeAPIResultInfo")
+public func _bjs_makeAPIResultInfo() -> Void {
+    #if arch(wasm32)
+    let ret = makeAPIResultInfo()
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
 
-    @_spi(BridgeJS) @_transparent public consuming func bridgeJSStackPush() {
-        self.x.bridgeJSStackPush()
-        self.y.bridgeJSStackPush()
-        self.label.bridgeJSStackPush()
-        self.optCount.bridgeJSStackPush()
-        self.optFlag.bridgeJSStackPush()
-    }
+@_expose(wasm, "bjs_makeAPIResultFlag")
+@_cdecl("bjs_makeAPIResultFlag")
+public func _bjs_makeAPIResultFlag(_ value: Int32) -> Void {
+    #if arch(wasm32)
+    let ret = makeAPIResultFlag(_: Bool.bridgeJSLiftParameter(value))
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
 
-    init(unsafelyCopying jsObject: JSObject) {
-        _bjs_struct_lower_DataPoint(jsObject.bridgeJSLowerParameter())
-        self = Self.bridgeJSStackPop()
-    }
+@_expose(wasm, "bjs_makeAPIResultRate")
+@_cdecl("bjs_makeAPIResultRate")
+public func _bjs_makeAPIResultRate(_ value: Float32) -> Void {
+    #if arch(wasm32)
+    let ret = makeAPIResultRate(_: Float.bridgeJSLiftParameter(value))
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
 
-    func toJSObject() -> JSObject {
-        let __bjs_self = self
-        __bjs_self.bridgeJSStackPush()
-        return JSObject(id: UInt32(bitPattern: _bjs_struct_lift_DataPoint()))
-    }
+@_expose(wasm, "bjs_makeAPIResultPrecise")
+@_cdecl("bjs_makeAPIResultPrecise")
+public func _bjs_makeAPIResultPrecise(_ value: Float64) -> Void {
+    #if arch(wasm32)
+    let ret = makeAPIResultPrecise(_: Double.bridgeJSLiftParameter(value))
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
 }
 
-#if arch(wasm32)
-@_extern(wasm, module: "bjs", name: "swift_js_struct_lower_DataPoint")
-fileprivate func _bjs_struct_lower_DataPoint_extern(_ objectId: Int32) -> Void
-#else
-fileprivate func _bjs_struct_lower_DataPoint_extern(_ objectId: Int32) -> Void {
+@_expose(wasm, "bjs_roundtripComplexResult")
+@_cdecl("bjs_roundtripComplexResult")
+public func _bjs_roundtripComplexResult(_ result: Int32) -> Void {
+    #if arch(wasm32)
+    let ret = roundtripComplexResult(_: ComplexResult.bridgeJSLiftParameter(result))
+    return ret.bridgeJSLowerReturn()
+    #else
     fatalError("Only available on WebAssembly")
-}
-#endif
-@inline(never) fileprivate func _bjs_struct_lower_DataPoint(_ objectId: Int32) -> Void {
-    return _bjs_struct_lower_DataPoint_extern(objectId)
+    #endif
 }
 
-#if arch(wasm32)
-@_extern(wasm, module: "bjs", name: "swift_js_struct_lift_DataPoint")
-fileprivate func _bjs_struct_lift_DataPoint_extern() -> Int32
-#else
-fileprivate func _bjs_struct_lift_DataPoint_extern() -> Int32 {
+@_expose(wasm, "bjs_makeComplexResultSuccess")
+@_cdecl("bjs_makeComplexResultSuccess")
+public func _bjs_makeComplexResultSuccess(_ valueBytes: Int32, _ valueLength: Int32) -> Void {
+    #if arch(wasm32)
+    let ret = makeComplexResultSuccess(_: String.bridgeJSLiftParameter(valueBytes, valueLength))
+    return ret.bridgeJSLowerReturn()
+    #else
     fatalError("Only available on WebAssembly")
-}
-#endif
-@inline(never) fileprivate func _bjs_struct_lift_DataPoint() -> Int32 {
-    return _bjs_struct_lift_DataPoint_extern()
+    #endif
 }
 
-@_expose(wasm, "bjs_DataPoint_init")
-@_cdecl("bjs_DataPoint_init")
-public func _bjs_DataPoint_init(_ x: Float64, _ y: Float64, _ labelBytes: Int32, _ labelLength: Int32, _ optCountIsSome: Int32, _ optCountValue: Int32, _ optFlagIsSome: Int32, _ optFlagValue: Int32) -> Void {
+@_expose(wasm, "bjs_makeComplexResultError")
+@_cdecl("bjs_makeComplexResultError")
+public func _bjs_makeComplexResultError(_ messageBytes: Int32, _ messageLength: Int32, _ code: Int32) -> Void {
     #if arch(wasm32)
-    let ret = DataPoint(x: Double.bridgeJSLiftParameter(x), y: Double.bridgeJSLiftParameter(y), label: String.bridgeJSLiftParameter(labelBytes, labelLength), optCount: Optional<Int>.bridgeJSLiftParameter(optCountIsSome, optCountValue), optFlag: Optional<Bool>.bridgeJSLiftParameter(optFlagIsSome, optFlagValue))
+    let ret = makeComplexResultError(_: String.bridgeJSLiftParameter(messageBytes, messageLength), _: Int.bridgeJSLiftParameter(code))
     return ret.bridgeJSLowerReturn()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_DataPoint_static_dimensions_get")
-@_cdecl("bjs_DataPoint_static_dimensions_get")
-public func _bjs_DataPoint_static_dimensions_get() -> Int32 {
+@_expose(wasm, "bjs_makeComplexResultLocation")
+@_cdecl("bjs_makeComplexResultLocation")
+public func _bjs_makeComplexResultLocation(_ lat: Float64, _ lng: Float64, _ nameBytes: Int32, _ nameLength: Int32) -> Void {
     #if arch(wasm32)
-    let ret = DataPoint.dimensions
+    let ret = makeComplexResultLocation(_: Double.bridgeJSLiftParameter(lat), _: Double.bridgeJSLiftParameter(lng), _: String.bridgeJSLiftParameter(nameBytes, nameLength))
     return ret.bridgeJSLowerReturn()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_DataPoint_static_origin")
-@_cdecl("bjs_DataPoint_static_origin")
-public func _bjs_DataPoint_static_origin() -> Void {
+@_expose(wasm, "bjs_makeComplexResultStatus")
+@_cdecl("bjs_makeComplexResultStatus")
+public func _bjs_makeComplexResultStatus(_ active: Int32, _ code: Int32, _ messageBytes: Int32, _ messageLength: Int32) -> Void {
     #if arch(wasm32)
-    let ret = DataPoint.origin()
+    let ret = makeComplexResultStatus(_: Bool.bridgeJSLiftParameter(active), _: Int.bridgeJSLiftParameter(code), _: String.bridgeJSLiftParameter(messageBytes, messageLength))
     return ret.bridgeJSLowerReturn()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-extension PublicPoint: _BridgedSwiftStruct {
-    @_spi(BridgeJS) @_transparent public static func bridgeJSStackPop() -> PublicPoint {
-        let y = Int.bridgeJSStackPop()
-        let x = Int.bridgeJSStackPop()
-        return PublicPoint(x: x, y: y)
-    }
-
-    @_spi(BridgeJS) @_transparent public consuming func bridgeJSStackPush() {
-        self.x.bridgeJSStackPush()
-        self.y.bridgeJSStackPush()
-    }
-
-    public init(unsafelyCopying jsObject: JSObject) {
-        _bjs_struct_lower_PublicPoint(jsObject.bridgeJSLowerParameter())
-        self = Self.bridgeJSStackPop()
-    }
-
-    public func toJSObject() -> JSObject {
-        let __bjs_self = self
-        __bjs_self.bridgeJSStackPush()
-        return JSObject(id: UInt32(bitPattern: _bjs_struct_lift_PublicPoint()))
-    }
+@_expose(wasm, "bjs_makeComplexResultCoordinates")
+@_cdecl("bjs_makeComplexResultCoordinates")
+public func _bjs_makeComplexResultCoordinates(_ x: Float64, _ y: Float64, _ z: Float64) -> Void {
+    #if arch(wasm32)
+    let ret = makeComplexResultCoordinates(_: Double.bridgeJSLiftParameter(x), _: Double.bridgeJSLiftParameter(y), _: Double.bridgeJSLiftParameter(z))
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
 }
 
-#if arch(wasm32)
-@_extern(wasm, module: "bjs", name: "swift_js_struct_lower_PublicPoint")
-fileprivate func _bjs_struct_lower_PublicPoint_extern(_ objectId: Int32) -> Void
-#else
-fileprivate func _bjs_struct_lower_PublicPoint_extern(_ objectId: Int32) -> Void {
+@_expose(wasm, "bjs_makeComplexResultComprehensive")
+@_cdecl("bjs_makeComplexResultComprehensive")
+public func _bjs_makeComplexResultComprehensive(_ flag1: Int32, _ flag2: Int32, _ count1: Int32, _ count2: Int32, _ value1: Float64, _ value2: Float64, _ text1Bytes: Int32, _ text1Length: Int32, _ text2Bytes: Int32, _ text2Length: Int32, _ text3Bytes: Int32, _ text3Length: Int32) -> Void {
+    #if arch(wasm32)
+    let ret = makeComplexResultComprehensive(_: Bool.bridgeJSLiftParameter(flag1), _: Bool.bridgeJSLiftParameter(flag2), _: Int.bridgeJSLiftParameter(count1), _: Int.bridgeJSLiftParameter(count2), _: Double.bridgeJSLiftParameter(value1), _: Double.bridgeJSLiftParameter(value2), _: String.bridgeJSLiftParameter(text1Bytes, text1Length), _: String.bridgeJSLiftParameter(text2Bytes, text2Length), _: String.bridgeJSLiftParameter(text3Bytes, text3Length))
+    return ret.bridgeJSLowerReturn()
+    #else
     fatalError("Only available on WebAssembly")
-}
-#endif
-@inline(never) fileprivate func _bjs_struct_lower_PublicPoint(_ objectId: Int32) -> Void {
-    return _bjs_struct_lower_PublicPoint_extern(objectId)
+    #endif
 }
 
-#if arch(wasm32)
-@_extern(wasm, module: "bjs", name: "swift_js_struct_lift_PublicPoint")
-fileprivate func _bjs_struct_lift_PublicPoint_extern() -> Int32
-#else
-fileprivate func _bjs_struct_lift_PublicPoint_extern() -> Int32 {
+@_expose(wasm, "bjs_makeComplexResultInfo")
+@_cdecl("bjs_makeComplexResultInfo")
+public func _bjs_makeComplexResultInfo() -> Void {
+    #if arch(wasm32)
+    let ret = makeComplexResultInfo()
+    return ret.bridgeJSLowerReturn()
+    #else
     fatalError("Only available on WebAssembly")
-}
-#endif
-@inline(never) fileprivate func _bjs_struct_lift_PublicPoint() -> Int32 {
-    return _bjs_struct_lift_PublicPoint_extern()
+    #endif
 }
 
-@_expose(wasm, "bjs_PublicPoint_init")
-@_cdecl("bjs_PublicPoint_init")
-public func _bjs_PublicPoint_init(_ x: Int32, _ y: Int32) -> Void {
+@_expose(wasm, "bjs_makeUtilitiesResultSuccess")
+@_cdecl("bjs_makeUtilitiesResultSuccess")
+public func _bjs_makeUtilitiesResultSuccess(_ messageBytes: Int32, _ messageLength: Int32) -> Void {
     #if arch(wasm32)
-    let ret = PublicPoint(x: Int.bridgeJSLiftParameter(x), y: Int.bridgeJSLiftParameter(y))
+    let ret = makeUtilitiesResultSuccess(_: String.bridgeJSLiftParameter(messageBytes, messageLength))
     return ret.bridgeJSLowerReturn()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-extension Address: _BridgedSwiftStruct {
-    @_spi(BridgeJS) @_transparent public static func bridgeJSStackPop() -> Address {
-        let zipCode = Optional<Int>.bridgeJSStackPop()
-        let city = String.bridgeJSStackPop()
-        let street = String.bridgeJSStackPop()
-        return Address(street: street, city: city, zipCode: zipCode)
-    }
-
-    @_spi(BridgeJS) @_transparent public consuming func bridgeJSStackPush() {
-        self.street.bridgeJSStackPush()
-        self.city.bridgeJSStackPush()
-        self.zipCode.bridgeJSStackPush()
-    }
-
-    init(unsafelyCopying jsObject: JSObject) {
-        _bjs_struct_lower_Address(jsObject.bridgeJSLowerParameter())
-        self = Self.bridgeJSStackPop()
-    }
-
-    func toJSObject() -> JSObject {
-        let __bjs_self = self
-        __bjs_self.bridgeJSStackPush()
-        return JSObject(id: UInt32(bitPattern: _bjs_struct_lift_Address()))
-    }
+@_expose(wasm, "bjs_makeUtilitiesResultFailure")
+@_cdecl("bjs_makeUtilitiesResultFailure")
+public func _bjs_makeUtilitiesResultFailure(_ errorBytes: Int32, _ errorLength: Int32, _ code: Int32) -> Void {
+    #if arch(wasm32)
+    let ret = makeUtilitiesResultFailure(_: String.bridgeJSLiftParameter(errorBytes, errorLength), _: Int.bridgeJSLiftParameter(code))
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
 }
 
-#if arch(wasm32)
-@_extern(wasm, module: "bjs", name: "swift_js_struct_lower_Address")
-fileprivate func _bjs_struct_lower_Address_extern(_ objectId: Int32) -> Void
-#else
-fileprivate func _bjs_struct_lower_Address_extern(_ objectId: Int32) -> Void {
+@_expose(wasm, "bjs_makeUtilitiesResultStatus")
+@_cdecl("bjs_makeUtilitiesResultStatus")
+public func _bjs_makeUtilitiesResultStatus(_ active: Int32, _ code: Int32, _ messageBytes: Int32, _ messageLength: Int32) -> Void {
+    #if arch(wasm32)
+    let ret = makeUtilitiesResultStatus(_: Bool.bridgeJSLiftParameter(active), _: Int.bridgeJSLiftParameter(code), _: String.bridgeJSLiftParameter(messageBytes, messageLength))
+    return ret.bridgeJSLowerReturn()
+    #else
     fatalError("Only available on WebAssembly")
-}
-#endif
-@inline(never) fileprivate func _bjs_struct_lower_Address(_ objectId: Int32) -> Void {
-    return _bjs_struct_lower_Address_extern(objectId)
+    #endif
 }
 
-#if arch(wasm32)
-@_extern(wasm, module: "bjs", name: "swift_js_struct_lift_Address")
-fileprivate func _bjs_struct_lift_Address_extern() -> Int32
-#else
-fileprivate func _bjs_struct_lift_Address_extern() -> Int32 {
+@_expose(wasm, "bjs_makeAPINetworkingResultSuccess")
+@_cdecl("bjs_makeAPINetworkingResultSuccess")
+public func _bjs_makeAPINetworkingResultSuccess(_ messageBytes: Int32, _ messageLength: Int32) -> Void {
+    #if arch(wasm32)
+    let ret = makeAPINetworkingResultSuccess(_: String.bridgeJSLiftParameter(messageBytes, messageLength))
+    return ret.bridgeJSLowerReturn()
+    #else
     fatalError("Only available on WebAssembly")
+    #endif
 }
-#endif
-@inline(never) fileprivate func _bjs_struct_lift_Address() -> Int32 {
-    return _bjs_struct_lift_Address_extern()
-}
-
-extension Contact: _BridgedSwiftStruct {
-    @_spi(BridgeJS) @_transparent public static func bridgeJSStackPop() -> Contact {
-        let secondaryAddress = Optional<Address>.bridgeJSStackPop()
-        let email = Optional<String>.bridgeJSStackPop()
-        let address = Address.bridgeJSStackPop()
-        let age = Int.bridgeJSStackPop()
-        let name = String.bridgeJSStackPop()
-        return Contact(name: name, age: age, address: address, email: email, secondaryAddress: secondaryAddress)
-    }
 
-    @_spi(BridgeJS) @_transparent public consuming func bridgeJSStackPush() {
-        self.name.bridgeJSStackPush()
-        self.age.bridgeJSStackPush()
-        self.address.bridgeJSStackPush()
-        self.email.bridgeJSStackPush()
-        self.secondaryAddress.bridgeJSStackPush()
-    }
+@_expose(wasm, "bjs_makeAPINetworkingResultFailure")
+@_cdecl("bjs_makeAPINetworkingResultFailure")
+public func _bjs_makeAPINetworkingResultFailure(_ errorBytes: Int32, _ errorLength: Int32, _ code: Int32) -> Void {
+    #if arch(wasm32)
+    let ret = makeAPINetworkingResultFailure(_: String.bridgeJSLiftParameter(errorBytes, errorLength), _: Int.bridgeJSLiftParameter(code))
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
 
-    init(unsafelyCopying jsObject: JSObject) {
-        _bjs_struct_lower_Contact(jsObject.bridgeJSLowerParameter())
-        self = Self.bridgeJSStackPop()
-    }
+@_expose(wasm, "bjs_roundtripUtilitiesResult")
+@_cdecl("bjs_roundtripUtilitiesResult")
+public func _bjs_roundtripUtilitiesResult(_ result: Int32) -> Void {
+    #if arch(wasm32)
+    let ret = roundtripUtilitiesResult(_: Utilities.Result.bridgeJSLiftParameter(result))
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
 
-    func toJSObject() -> JSObject {
-        let __bjs_self = self
-        __bjs_self.bridgeJSStackPush()
-        return JSObject(id: UInt32(bitPattern: _bjs_struct_lift_Contact()))
-    }
+@_expose(wasm, "bjs_roundtripAPINetworkingResult")
+@_cdecl("bjs_roundtripAPINetworkingResult")
+public func _bjs_roundtripAPINetworkingResult(_ result: Int32) -> Void {
+    #if arch(wasm32)
+    let ret = roundtripAPINetworkingResult(_: API.NetworkingResult.bridgeJSLiftParameter(result))
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
 }
 
-#if arch(wasm32)
-@_extern(wasm, module: "bjs", name: "swift_js_struct_lower_Contact")
-fileprivate func _bjs_struct_lower_Contact_extern(_ objectId: Int32) -> Void
-#else
-fileprivate func _bjs_struct_lower_Contact_extern(_ objectId: Int32) -> Void {
+@_expose(wasm, "bjs_roundTripAllTypesResult")
+@_cdecl("bjs_roundTripAllTypesResult")
+public func _bjs_roundTripAllTypesResult(_ result: Int32) -> Void {
+    #if arch(wasm32)
+    let ret = roundTripAllTypesResult(_: AllTypesResult.bridgeJSLiftParameter(result))
+    return ret.bridgeJSLowerReturn()
+    #else
     fatalError("Only available on WebAssembly")
-}
-#endif
-@inline(never) fileprivate func _bjs_struct_lower_Contact(_ objectId: Int32) -> Void {
-    return _bjs_struct_lower_Contact_extern(objectId)
+    #endif
 }
 
-#if arch(wasm32)
-@_extern(wasm, module: "bjs", name: "swift_js_struct_lift_Contact")
-fileprivate func _bjs_struct_lift_Contact_extern() -> Int32
-#else
-fileprivate func _bjs_struct_lift_Contact_extern() -> Int32 {
+@_expose(wasm, "bjs_roundTripTypedPayloadResult")
+@_cdecl("bjs_roundTripTypedPayloadResult")
+public func _bjs_roundTripTypedPayloadResult(_ result: Int32) -> Void {
+    #if arch(wasm32)
+    let ret = roundTripTypedPayloadResult(_: TypedPayloadResult.bridgeJSLiftParameter(result))
+    return ret.bridgeJSLowerReturn()
+    #else
     fatalError("Only available on WebAssembly")
+    #endif
 }
-#endif
-@inline(never) fileprivate func _bjs_struct_lift_Contact() -> Int32 {
-    return _bjs_struct_lift_Contact_extern()
-}
-
-extension Config: _BridgedSwiftStruct {
-    @_spi(BridgeJS) @_transparent public static func bridgeJSStackPop() -> Config {
-        let status = Status.bridgeJSStackPop()
-        let direction = Optional<Direction>.bridgeJSStackPop()
-        let theme = Optional<Theme>.bridgeJSStackPop()
-        let name = String.bridgeJSStackPop()
-        return Config(name: name, theme: theme, direction: direction, status: status)
-    }
-
-    @_spi(BridgeJS) @_transparent public consuming func bridgeJSStackPush() {
-        self.name.bridgeJSStackPush()
-        self.theme.bridgeJSStackPush()
-        self.direction.bridgeJSStackPush()
-        self.status.bridgeJSStackPush()
-    }
-
-    init(unsafelyCopying jsObject: JSObject) {
-        _bjs_struct_lower_Config(jsObject.bridgeJSLowerParameter())
-        self = Self.bridgeJSStackPop()
-    }
 
-    func toJSObject() -> JSObject {
-        let __bjs_self = self
-        __bjs_self.bridgeJSStackPush()
-        return JSObject(id: UInt32(bitPattern: _bjs_struct_lift_Config()))
-    }
+@_expose(wasm, "bjs_createPropertyHolder")
+@_cdecl("bjs_createPropertyHolder")
+public func _bjs_createPropertyHolder(_ intValue: Int32, _ floatValue: Float32, _ doubleValue: Float64, _ boolValue: Int32, _ stringValueBytes: Int32, _ stringValueLength: Int32, _ jsObject: Int32) -> UnsafeMutableRawPointer {
+    #if arch(wasm32)
+    let ret = createPropertyHolder(intValue: Int.bridgeJSLiftParameter(intValue), floatValue: Float.bridgeJSLiftParameter(floatValue), doubleValue: Double.bridgeJSLiftParameter(doubleValue), boolValue: Bool.bridgeJSLiftParameter(boolValue), stringValue: String.bridgeJSLiftParameter(stringValueBytes, stringValueLength), jsObject: JSObject.bridgeJSLiftParameter(jsObject))
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
 }
 
-#if arch(wasm32)
-@_extern(wasm, module: "bjs", name: "swift_js_struct_lower_Config")
-fileprivate func _bjs_struct_lower_Config_extern(_ objectId: Int32) -> Void
-#else
-fileprivate func _bjs_struct_lower_Config_extern(_ objectId: Int32) -> Void {
+@_expose(wasm, "bjs_testPropertyHolder")
+@_cdecl("bjs_testPropertyHolder")
+public func _bjs_testPropertyHolder(_ holder: UnsafeMutableRawPointer) -> Void {
+    #if arch(wasm32)
+    let ret = testPropertyHolder(holder: PropertyHolder.bridgeJSLiftParameter(holder))
+    return ret.bridgeJSLowerReturn()
+    #else
     fatalError("Only available on WebAssembly")
-}
-#endif
-@inline(never) fileprivate func _bjs_struct_lower_Config(_ objectId: Int32) -> Void {
-    return _bjs_struct_lower_Config_extern(objectId)
+    #endif
 }
 
-#if arch(wasm32)
-@_extern(wasm, module: "bjs", name: "swift_js_struct_lift_Config")
-fileprivate func _bjs_struct_lift_Config_extern() -> Int32
-#else
-fileprivate func _bjs_struct_lift_Config_extern() -> Int32 {
+@_expose(wasm, "bjs_resetObserverCounts")
+@_cdecl("bjs_resetObserverCounts")
+public func _bjs_resetObserverCounts() -> Void {
+    #if arch(wasm32)
+    resetObserverCounts()
+    #else
     fatalError("Only available on WebAssembly")
-}
-#endif
-@inline(never) fileprivate func _bjs_struct_lift_Config() -> Int32 {
-    return _bjs_struct_lift_Config_extern()
+    #endif
 }
 
-extension SessionData: _BridgedSwiftStruct {
-    @_spi(BridgeJS) @_transparent public static func bridgeJSStackPop() -> SessionData {
-        let owner = Optional<Greeter>.bridgeJSStackPop()
-        let id = Int.bridgeJSStackPop()
-        return SessionData(id: id, owner: owner)
-    }
+@_expose(wasm, "bjs_getObserverStats")
+@_cdecl("bjs_getObserverStats")
+public func _bjs_getObserverStats() -> Void {
+    #if arch(wasm32)
+    let ret = getObserverStats()
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
 
-    @_spi(BridgeJS) @_transparent public consuming func bridgeJSStackPush() {
-        self.id.bridgeJSStackPush()
-        self.owner.bridgeJSStackPush()
-    }
+@_expose(wasm, "bjs_formatName")
+@_cdecl("bjs_formatName")
+public func _bjs_formatName(_ nameBytes: Int32, _ nameLength: Int32, _ transform: Int32) -> Void {
+    #if arch(wasm32)
+    let ret = formatName(_: String.bridgeJSLiftParameter(nameBytes, nameLength), transform: _BJS_Closure_20BridgeJSRuntimeTestsSS_SS.bridgeJSLift(transform))
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
 
-    init(unsafelyCopying jsObject: JSObject) {
-        _bjs_struct_lower_SessionData(jsObject.bridgeJSLowerParameter())
-        self = Self.bridgeJSStackPop()
-    }
+@_expose(wasm, "bjs_makeFormatter")
+@_cdecl("bjs_makeFormatter")
+public func _bjs_makeFormatter(_ prefixBytes: Int32, _ prefixLength: Int32) -> Int32 {
+    #if arch(wasm32)
+    let ret = makeFormatter(prefix: String.bridgeJSLiftParameter(prefixBytes, prefixLength))
+    return JSTypedClosure(ret).bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
 
-    func toJSObject() -> JSObject {
-        let __bjs_self = self
-        __bjs_self.bridgeJSStackPush()
-        return JSObject(id: UInt32(bitPattern: _bjs_struct_lift_SessionData()))
-    }
+@_expose(wasm, "bjs_makeAdder")
+@_cdecl("bjs_makeAdder")
+public func _bjs_makeAdder(_ base: Int32) -> Int32 {
+    #if arch(wasm32)
+    let ret = makeAdder(base: Int.bridgeJSLiftParameter(base))
+    return JSTypedClosure(ret).bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
 }
 
-#if arch(wasm32)
-@_extern(wasm, module: "bjs", name: "swift_js_struct_lower_SessionData")
-fileprivate func _bjs_struct_lower_SessionData_extern(_ objectId: Int32) -> Void
-#else
-fileprivate func _bjs_struct_lower_SessionData_extern(_ objectId: Int32) -> Void {
+@_expose(wasm, "bjs_roundTripMessage")
+@_cdecl("bjs_roundTripMessage")
+public func _bjs_roundTripMessage(_ message: Int32) -> Void {
+    #if arch(wasm32)
+    let ret = roundTripMessage(_: Message.bridgeJSLiftParameter(message))
+    return ret.bridgeJSLowerReturn()
+    #else
     fatalError("Only available on WebAssembly")
+    #endif
 }
-#endif
-@inline(never) fileprivate func _bjs_struct_lower_SessionData(_ objectId: Int32) -> Void {
-    return _bjs_struct_lower_SessionData_extern(objectId)
+
+@_expose(wasm, "bjs_renamedEcho")
+@_cdecl("bjs_renamedEcho")
+public func _bjs_renamedEcho(_ valueBytes: Int32, _ valueLength: Int32) -> Void {
+    #if arch(wasm32)
+    let ret = jsNameEcho(_: String.bridgeJSLiftParameter(valueBytes, valueLength))
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
 }
 
-#if arch(wasm32)
-@_extern(wasm, module: "bjs", name: "swift_js_struct_lift_SessionData")
-fileprivate func _bjs_struct_lift_SessionData_extern() -> Int32
-#else
-fileprivate func _bjs_struct_lift_SessionData_extern() -> Int32 {
+@_expose(wasm, "bjs_greetName")
+@_cdecl("bjs_greetName")
+public func _bjs_greetName(_ nameBytes: Int32, _ nameLength: Int32) -> Void {
+    #if arch(wasm32)
+    let ret = greet(_: String.bridgeJSLiftParameter(nameBytes, nameLength))
+    return ret.bridgeJSLowerReturn()
+    #else
     fatalError("Only available on WebAssembly")
+    #endif
 }
-#endif
-@inline(never) fileprivate func _bjs_struct_lift_SessionData() -> Int32 {
-    return _bjs_struct_lift_SessionData_extern()
+
+@_expose(wasm, "bjs_greetCount")
+@_cdecl("bjs_greetCount")
+public func _bjs_greetCount(_ count: Int32) -> Void {
+    #if arch(wasm32)
+    let ret = greet(_: Int.bridgeJSLiftParameter(count))
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
 }
 
-extension ValidationReport: _BridgedSwiftStruct {
-    @_spi(BridgeJS) @_transparent public static func bridgeJSStackPop() -> ValidationReport {
-        let outcome = Optional<APIResult>.bridgeJSStackPop()
-        let status = Optional<Status>.bridgeJSStackPop()
-        let result = APIResult.bridgeJSStackPop()
-        let id = Int.bridgeJSStackPop()
-        return ValidationReport(id: id, result: result, status: status, outcome: outcome)
-    }
+@_expose(wasm, "bjs_roundTripPointerFields")
+@_cdecl("bjs_roundTripPointerFields")
+public func _bjs_roundTripPointerFields() -> Void {
+    #if arch(wasm32)
+    let ret = roundTripPointerFields(_: PointerFields.bridgeJSLiftParameter())
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
 
-    @_spi(BridgeJS) @_transparent public consuming func bridgeJSStackPush() {
-        self.id.bridgeJSStackPush()
-        self.result.bridgeJSStackPush()
-        self.status.bridgeJSStackPush()
-        self.outcome.bridgeJSStackPush()
-    }
+@_expose(wasm, "bjs_testStructDefault")
+@_cdecl("bjs_testStructDefault")
+public func _bjs_testStructDefault() -> Void {
+    #if arch(wasm32)
+    let ret = testStructDefault(point: DataPoint.bridgeJSLiftParameter())
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
 
-    init(unsafelyCopying jsObject: JSObject) {
-        _bjs_struct_lower_ValidationReport(jsObject.bridgeJSLowerParameter())
-        self = Self.bridgeJSStackPop()
-    }
+@_expose(wasm, "bjs_cartToJSObject")
+@_cdecl("bjs_cartToJSObject")
+public func _bjs_cartToJSObject() -> Int32 {
+    #if arch(wasm32)
+    let ret = cartToJSObject(_: CopyableCart.bridgeJSLiftParameter())
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
 
-    func toJSObject() -> JSObject {
-        let __bjs_self = self
-        __bjs_self.bridgeJSStackPush()
-        return JSObject(id: UInt32(bitPattern: _bjs_struct_lift_ValidationReport()))
-    }
+@_expose(wasm, "bjs_nestedCartToJSObject")
+@_cdecl("bjs_nestedCartToJSObject")
+public func _bjs_nestedCartToJSObject() -> Int32 {
+    #if arch(wasm32)
+    let ret = nestedCartToJSObject(_: CopyableNestedCart.bridgeJSLiftParameter())
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
 }
 
-#if arch(wasm32)
-@_extern(wasm, module: "bjs", name: "swift_js_struct_lower_ValidationReport")
-fileprivate func _bjs_struct_lower_ValidationReport_extern(_ objectId: Int32) -> Void
-#else
-fileprivate func _bjs_struct_lower_ValidationReport_extern(_ objectId: Int32) -> Void {
+@_expose(wasm, "bjs_roundTripDataPoint")
+@_cdecl("bjs_roundTripDataPoint")
+public func _bjs_roundTripDataPoint() -> Void {
+    #if arch(wasm32)
+    let ret = roundTripDataPoint(_: DataPoint.bridgeJSLiftParameter())
+    return ret.bridgeJSLowerReturn()
+    #else
     fatalError("Only available on WebAssembly")
-}
-#endif
-@inline(never) fileprivate func _bjs_struct_lower_ValidationReport(_ objectId: Int32) -> Void {
-    return _bjs_struct_lower_ValidationReport_extern(objectId)
+    #endif
 }
 
-#if arch(wasm32)
-@_extern(wasm, module: "bjs", name: "swift_js_struct_lift_ValidationReport")
-fileprivate func _bjs_struct_lift_ValidationReport_extern() -> Int32
-#else
-fileprivate func _bjs_struct_lift_ValidationReport_extern() -> Int32 {
+@_expose(wasm, "bjs_roundTripPublicPoint")
+@_cdecl("bjs_roundTripPublicPoint")
+public func _bjs_roundTripPublicPoint() -> Void {
+    #if arch(wasm32)
+    let ret = roundTripPublicPoint(_: PublicPoint.bridgeJSLiftParameter())
+    return ret.bridgeJSLowerReturn()
+    #else
     fatalError("Only available on WebAssembly")
-}
-#endif
-@inline(never) fileprivate func _bjs_struct_lift_ValidationReport() -> Int32 {
-    return _bjs_struct_lift_ValidationReport_extern()
+    #endif
 }
 
-extension AdvancedConfig: _BridgedSwiftStruct {
-    @_spi(BridgeJS) @_transparent public static func bridgeJSStackPop() -> AdvancedConfig {
-        let overrideDefaults = Optional<ConfigStruct>.bridgeJSStackPop()
-        let defaults = ConfigStruct.bridgeJSStackPop()
-        let location = Optional<DataPoint>.bridgeJSStackPop()
-        let metadata = Optional<JSObject>.bridgeJSStackPop()
-        let result = Optional<APIResult>.bridgeJSStackPop()
-        let status = Status.bridgeJSStackPop()
-        let theme = Theme.bridgeJSStackPop()
-        let enabled = Bool.bridgeJSStackPop()
-        let title = String.bridgeJSStackPop()
-        let id = Int.bridgeJSStackPop()
-        return AdvancedConfig(id: id, title: title, enabled: enabled, theme: theme, status: status, result: result, metadata: metadata, location: location, defaults: defaults, overrideDefaults: overrideDefaults)
+@_expose(wasm, "bjs_asyncRoundTripPublicPoint")
+@_cdecl("bjs_asyncRoundTripPublicPoint")
+public func _bjs_asyncRoundTripPublicPoint() -> Int32 {
+    #if arch(wasm32)
+    let _tmp_point = PublicPoint.bridgeJSLiftParameter()
+    return _bjs_makePromise(resolve: Promise_resolve_11PublicPointV, reject: Promise_reject) {
+        return await asyncRoundTripPublicPoint(_: _tmp_point)
     }
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
 
-    @_spi(BridgeJS) @_transparent public consuming func bridgeJSStackPush() {
-        self.id.bridgeJSStackPush()
-        self.title.bridgeJSStackPush()
-        self.enabled.bridgeJSStackPush()
-        self.theme.bridgeJSStackPush()
-        self.status.bridgeJSStackPush()
-        self.result.bridgeJSStackPush()
-        self.metadata.bridgeJSStackPush()
-        self.location.bridgeJSStackPush()
-        self.defaults.bridgeJSStackPush()
-        self.overrideDefaults.bridgeJSStackPush()
+@_expose(wasm, "bjs_asyncRoundTripPublicPointThrows")
+@_cdecl("bjs_asyncRoundTripPublicPointThrows")
+public func _bjs_asyncRoundTripPublicPointThrows() -> Int32 {
+    #if arch(wasm32)
+    let _tmp_point = PublicPoint.bridgeJSLiftParameter()
+    return _bjs_makePromise(resolve: Promise_resolve_11PublicPointV, reject: Promise_reject) { () async throws(JSException) -> PublicPoint in
+        return try await asyncRoundTripPublicPointThrows(_: _tmp_point)
     }
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
 
-    init(unsafelyCopying jsObject: JSObject) {
-        _bjs_struct_lower_AdvancedConfig(jsObject.bridgeJSLowerParameter())
-        self = Self.bridgeJSStackPop()
+@_expose(wasm, "bjs_asyncStructOrThrow")
+@_cdecl("bjs_asyncStructOrThrow")
+public func _bjs_asyncStructOrThrow(_ shouldThrow: Int32) -> Int32 {
+    #if arch(wasm32)
+    return _bjs_makePromise(resolve: Promise_resolve_11PublicPointV, reject: Promise_reject) { () async throws(JSException) -> PublicPoint in
+        return try await asyncStructOrThrow(_: Bool.bridgeJSLiftParameter(shouldThrow))
     }
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
 
-    func toJSObject() -> JSObject {
-        let __bjs_self = self
-        __bjs_self.bridgeJSStackPush()
-        return JSObject(id: UInt32(bitPattern: _bjs_struct_lift_AdvancedConfig()))
+@_expose(wasm, "bjs_asyncCombinePublicPoints")
+@_cdecl("bjs_asyncCombinePublicPoints")
+public func _bjs_asyncCombinePublicPoints() -> Int32 {
+    #if arch(wasm32)
+    let _tmp_b = PublicPoint.bridgeJSLiftParameter()
+    let _tmp_a = PublicPoint.bridgeJSLiftParameter()
+    return _bjs_makePromise(resolve: Promise_resolve_11PublicPointV, reject: Promise_reject) {
+        return await asyncCombinePublicPoints(_: _tmp_a, _: _tmp_b)
     }
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
 }
 
-#if arch(wasm32)
-@_extern(wasm, module: "bjs", name: "swift_js_struct_lower_AdvancedConfig")
-fileprivate func _bjs_struct_lower_AdvancedConfig_extern(_ objectId: Int32) -> Void
-#else
-fileprivate func _bjs_struct_lower_AdvancedConfig_extern(_ objectId: Int32) -> Void {
+@_expose(wasm, "bjs_asyncRoundTripContact")
+@_cdecl("bjs_asyncRoundTripContact")
+public func _bjs_asyncRoundTripContact() -> Int32 {
+    #if arch(wasm32)
+    let _tmp_contact = Contact.bridgeJSLiftParameter()
+    return _bjs_makePromise(resolve: Promise_resolve_7ContactV, reject: Promise_reject) {
+        return await asyncRoundTripContact(_: _tmp_contact)
+    }
+    #else
     fatalError("Only available on WebAssembly")
-}
-#endif
-@inline(never) fileprivate func _bjs_struct_lower_AdvancedConfig(_ objectId: Int32) -> Void {
-    return _bjs_struct_lower_AdvancedConfig_extern(objectId)
+    #endif
 }
 
-#if arch(wasm32)
-@_extern(wasm, module: "bjs", name: "swift_js_struct_lift_AdvancedConfig")
-fileprivate func _bjs_struct_lift_AdvancedConfig_extern() -> Int32
-#else
-fileprivate func _bjs_struct_lift_AdvancedConfig_extern() -> Int32 {
+@_expose(wasm, "bjs_asyncRoundTripPublicPointArray")
+@_cdecl("bjs_asyncRoundTripPublicPointArray")
+public func _bjs_asyncRoundTripPublicPointArray() -> Int32 {
+    #if arch(wasm32)
+    let _tmp_points = [PublicPoint].bridgeJSStackPop()
+    return _bjs_makePromise(resolve: Promise_resolve_Sa11PublicPointV, reject: Promise_reject) {
+        return await asyncRoundTripPublicPointArray(_: _tmp_points)
+    }
+    #else
     fatalError("Only available on WebAssembly")
-}
-#endif
-@inline(never) fileprivate func _bjs_struct_lift_AdvancedConfig() -> Int32 {
-    return _bjs_struct_lift_AdvancedConfig_extern()
+    #endif
 }
 
-extension MeasurementConfig: _BridgedSwiftStruct {
-    @_spi(BridgeJS) @_transparent public static func bridgeJSStackPop() -> MeasurementConfig {
-        let optionalRatio = Optional<Ratio>.bridgeJSStackPop()
-        let optionalPrecision = Optional<Precision>.bridgeJSStackPop()
-        let ratio = Ratio.bridgeJSStackPop()
-        let precision = Precision.bridgeJSStackPop()
-        return MeasurementConfig(precision: precision, ratio: ratio, optionalPrecision: optionalPrecision, optionalRatio: optionalRatio)
+@_expose(wasm, "bjs_asyncRoundTripOptionalPublicPoint")
+@_cdecl("bjs_asyncRoundTripOptionalPublicPoint")
+public func _bjs_asyncRoundTripOptionalPublicPoint() -> Int32 {
+    #if arch(wasm32)
+    let _tmp_point = Optional<PublicPoint>.bridgeJSLiftParameter()
+    return _bjs_makePromise(resolve: Promise_resolve_Sq11PublicPointV, reject: Promise_reject) {
+        return await asyncRoundTripOptionalPublicPoint(_: _tmp_point)
     }
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
 
-    @_spi(BridgeJS) @_transparent public consuming func bridgeJSStackPush() {
-        self.precision.bridgeJSStackPush()
-        self.ratio.bridgeJSStackPush()
-        self.optionalPrecision.bridgeJSStackPush()
-        self.optionalRatio.bridgeJSStackPush()
+@_expose(wasm, "bjs_asyncRoundTripPublicPointDict")
+@_cdecl("bjs_asyncRoundTripPublicPointDict")
+public func _bjs_asyncRoundTripPublicPointDict() -> Int32 {
+    #if arch(wasm32)
+    let _tmp_points = [String: PublicPoint].bridgeJSLiftParameter()
+    return _bjs_makePromise(resolve: Promise_resolve_SD11PublicPointV, reject: Promise_reject) {
+        return await asyncRoundTripPublicPointDict(_: _tmp_points)
     }
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
 
-    init(unsafelyCopying jsObject: JSObject) {
-        _bjs_struct_lower_MeasurementConfig(jsObject.bridgeJSLowerParameter())
-        self = Self.bridgeJSStackPop()
-    }
+@_expose(wasm, "bjs_roundTripContact")
+@_cdecl("bjs_roundTripContact")
+public func _bjs_roundTripContact() -> Void {
+    #if arch(wasm32)
+    let ret = roundTripContact(_: Contact.bridgeJSLiftParameter())
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
 
-    func toJSObject() -> JSObject {
-        let __bjs_self = self
-        __bjs_self.bridgeJSStackPush()
-        return JSObject(id: UInt32(bitPattern: _bjs_struct_lift_MeasurementConfig()))
-    }
+@_expose(wasm, "bjs_roundTripConfig")
+@_cdecl("bjs_roundTripConfig")
+public func _bjs_roundTripConfig() -> Void {
+    #if arch(wasm32)
+    let ret = roundTripConfig(_: Config.bridgeJSLiftParameter())
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
 }
 
-#if arch(wasm32)
-@_extern(wasm, module: "bjs", name: "swift_js_struct_lower_MeasurementConfig")
-fileprivate func _bjs_struct_lower_MeasurementConfig_extern(_ objectId: Int32) -> Void
-#else
-fileprivate func _bjs_struct_lower_MeasurementConfig_extern(_ objectId: Int32) -> Void {
+@_expose(wasm, "bjs_roundTripSessionData")
+@_cdecl("bjs_roundTripSessionData")
+public func _bjs_roundTripSessionData() -> Void {
+    #if arch(wasm32)
+    let ret = roundTripSessionData(_: SessionData.bridgeJSLiftParameter())
+    return ret.bridgeJSLowerReturn()
+    #else
     fatalError("Only available on WebAssembly")
+    #endif
 }
-#endif
-@inline(never) fileprivate func _bjs_struct_lower_MeasurementConfig(_ objectId: Int32) -> Void {
-    return _bjs_struct_lower_MeasurementConfig_extern(objectId)
+
+@_expose(wasm, "bjs_roundTripValidationReport")
+@_cdecl("bjs_roundTripValidationReport")
+public func _bjs_roundTripValidationReport() -> Void {
+    #if arch(wasm32)
+    let ret = roundTripValidationReport(_: ValidationReport.bridgeJSLiftParameter())
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
 }
 
-#if arch(wasm32)
-@_extern(wasm, module: "bjs", name: "swift_js_struct_lift_MeasurementConfig")
-fileprivate func _bjs_struct_lift_MeasurementConfig_extern() -> Int32
-#else
-fileprivate func _bjs_struct_lift_MeasurementConfig_extern() -> Int32 {
+@_expose(wasm, "bjs_roundTripAdvancedConfig")
+@_cdecl("bjs_roundTripAdvancedConfig")
+public func _bjs_roundTripAdvancedConfig() -> Void {
+    #if arch(wasm32)
+    let ret = roundTripAdvancedConfig(_: AdvancedConfig.bridgeJSLiftParameter())
+    return ret.bridgeJSLowerReturn()
+    #else
     fatalError("Only available on WebAssembly")
+    #endif
 }
-#endif
-@inline(never) fileprivate func _bjs_struct_lift_MeasurementConfig() -> Int32 {
-    return _bjs_struct_lift_MeasurementConfig_extern()
+
+@_expose(wasm, "bjs_roundTripMeasurementConfig")
+@_cdecl("bjs_roundTripMeasurementConfig")
+public func _bjs_roundTripMeasurementConfig() -> Void {
+    #if arch(wasm32)
+    let ret = roundTripMeasurementConfig(_: MeasurementConfig.bridgeJSLiftParameter())
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
 }
 
-extension MathOperations: _BridgedSwiftStruct {
-    @_spi(BridgeJS) @_transparent public static func bridgeJSStackPop() -> MathOperations {
-        let baseValue = Double.bridgeJSStackPop()
-        return MathOperations(baseValue: baseValue)
-    }
+@_expose(wasm, "bjs_updateValidationReport")
+@_cdecl("bjs_updateValidationReport")
+public func _bjs_updateValidationReport(_ newResultIsSome: Int32, _ newResultCaseId: Int32) -> Void {
+    #if arch(wasm32)
+    let _tmp_report = ValidationReport.bridgeJSLiftParameter()
+    let _tmp_newResult = Optional<APIResult>.bridgeJSLiftParameter(newResultIsSome, newResultCaseId)
+    let ret = updateValidationReport(_: _tmp_newResult, _: _tmp_report)
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
 
-    @_spi(BridgeJS) @_transparent public consuming func bridgeJSStackPush() {
-        self.baseValue.bridgeJSStackPush()
-    }
+@_expose(wasm, "bjs_testContainerWithStruct")
+@_cdecl("bjs_testContainerWithStruct")
+public func _bjs_testContainerWithStruct() -> UnsafeMutableRawPointer {
+    #if arch(wasm32)
+    let ret = testContainerWithStruct(_: DataPoint.bridgeJSLiftParameter())
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
 
-    init(unsafelyCopying jsObject: JSObject) {
-        _bjs_struct_lower_MathOperations(jsObject.bridgeJSLowerParameter())
-        self = Self.bridgeJSStackPop()
-    }
+@_expose(wasm, "bjs_roundTripJSObjectContainer")
+@_cdecl("bjs_roundTripJSObjectContainer")
+public func _bjs_roundTripJSObjectContainer() -> Void {
+    #if arch(wasm32)
+    let ret = roundTripJSObjectContainer(_: JSObjectContainer.bridgeJSLiftParameter())
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
 
-    func toJSObject() -> JSObject {
-        let __bjs_self = self
-        __bjs_self.bridgeJSStackPush()
-        return JSObject(id: UInt32(bitPattern: _bjs_struct_lift_MathOperations()))
-    }
+@_expose(wasm, "bjs_roundTripFooContainer")
+@_cdecl("bjs_roundTripFooContainer")
+public func _bjs_roundTripFooContainer() -> Void {
+    #if arch(wasm32)
+    let ret = roundTripFooContainer(_: FooContainer.bridgeJSLiftParameter())
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
 }
 
-#if arch(wasm32)
-@_extern(wasm, module: "bjs", name: "swift_js_struct_lower_MathOperations")
-fileprivate func _bjs_struct_lower_MathOperations_extern(_ objectId: Int32) -> Void
-#else
-fileprivate func _bjs_struct_lower_MathOperations_extern(_ objectId: Int32) -> Void {
+@_expose(wasm, "bjs_roundTripArrayMembers")
+@_cdecl("bjs_roundTripArrayMembers")
+public func _bjs_roundTripArrayMembers() -> Void {
+    #if arch(wasm32)
+    let ret = roundTripArrayMembers(_: ArrayMembers.bridgeJSLiftParameter())
+    return ret.bridgeJSLowerReturn()
+    #else
     fatalError("Only available on WebAssembly")
+    #endif
 }
-#endif
-@inline(never) fileprivate func _bjs_struct_lower_MathOperations(_ objectId: Int32) -> Void {
-    return _bjs_struct_lower_MathOperations_extern(objectId)
+
+@_expose(wasm, "bjs_arrayMembersSum")
+@_cdecl("bjs_arrayMembersSum")
+public func _bjs_arrayMembersSum() -> Int32 {
+    #if arch(wasm32)
+    let _tmp_values = [Int].bridgeJSStackPop()
+    let _tmp_value = ArrayMembers.bridgeJSLiftParameter()
+    let ret = arrayMembersSum(_: _tmp_value, _: _tmp_values)
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
 }
 
-#if arch(wasm32)
-@_extern(wasm, module: "bjs", name: "swift_js_struct_lift_MathOperations")
-fileprivate func _bjs_struct_lift_MathOperations_extern() -> Int32
-#else
-fileprivate func _bjs_struct_lift_MathOperations_extern() -> Int32 {
+@_expose(wasm, "bjs_arrayMembersFirst")
+@_cdecl("bjs_arrayMembersFirst")
+public func _bjs_arrayMembersFirst() -> Void {
+    #if arch(wasm32)
+    let _tmp_values = [String].bridgeJSStackPop()
+    let _tmp_value = ArrayMembers.bridgeJSLiftParameter()
+    let ret = arrayMembersFirst(_: _tmp_value, _: _tmp_values)
+    return ret.bridgeJSLowerReturn()
+    #else
     fatalError("Only available on WebAssembly")
+    #endif
 }
-#endif
-@inline(never) fileprivate func _bjs_struct_lift_MathOperations() -> Int32 {
-    return _bjs_struct_lift_MathOperations_extern()
+
+@_expose(wasm, "bjs_PolygonReference_init")
+@_cdecl("bjs_PolygonReference_init")
+public func _bjs_PolygonReference_init(_ labelBytes: Int32, _ labelLength: Int32) -> UnsafeMutableRawPointer {
+    #if arch(wasm32)
+    let ret = PolygonReference(verticesData: [Double].bridgeJSStackPop(), label: String.bridgeJSLiftParameter(labelBytes, labelLength))
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
 }
 
-@_expose(wasm, "bjs_MathOperations_init")
-@_cdecl("bjs_MathOperations_init")
-public func _bjs_MathOperations_init(_ baseValue: Float64) -> Void {
+@_expose(wasm, "bjs_PolygonReference_vertexCount")
+@_cdecl("bjs_PolygonReference_vertexCount")
+public func _bjs_PolygonReference_vertexCount(_ _self: UnsafeMutableRawPointer) -> Int32 {
     #if arch(wasm32)
-    let ret = MathOperations(baseValue: Double.bridgeJSLiftParameter(baseValue))
+    let ret = PolygonReference.bridgeJSLiftParameter(_self).vertexCount()
     return ret.bridgeJSLowerReturn()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_MathOperations_add")
-@_cdecl("bjs_MathOperations_add")
-public func _bjs_MathOperations_add(_ a: Float64, _ b: Float64) -> Float64 {
+@_expose(wasm, "bjs_PolygonReference_summary")
+@_cdecl("bjs_PolygonReference_summary")
+public func _bjs_PolygonReference_summary(_ _self: UnsafeMutableRawPointer) -> Void {
     #if arch(wasm32)
-    let ret = MathOperations.bridgeJSLiftParameter().add(a: Double.bridgeJSLiftParameter(a), b: Double.bridgeJSLiftParameter(b))
+    let ret = PolygonReference.bridgeJSLiftParameter(_self).summary()
     return ret.bridgeJSLowerReturn()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_MathOperations_multiply")
-@_cdecl("bjs_MathOperations_multiply")
-public func _bjs_MathOperations_multiply(_ a: Float64, _ b: Float64) -> Float64 {
+@_expose(wasm, "bjs_PolygonReference_snapshot")
+@_cdecl("bjs_PolygonReference_snapshot")
+public func _bjs_PolygonReference_snapshot(_ _self: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer {
     #if arch(wasm32)
-    let ret = MathOperations.bridgeJSLiftParameter().multiply(a: Double.bridgeJSLiftParameter(a), b: Double.bridgeJSLiftParameter(b))
+    let ret = PolygonReference.bridgeJSLiftParameter(_self).snapshot()
     return ret.bridgeJSLowerReturn()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_MathOperations_static_subtract")
-@_cdecl("bjs_MathOperations_static_subtract")
-public func _bjs_MathOperations_static_subtract(_ a: Float64, _ b: Float64) -> Float64 {
+@_expose(wasm, "bjs_PolygonReference_merge")
+@_cdecl("bjs_PolygonReference_merge")
+public func _bjs_PolygonReference_merge(_ _self: UnsafeMutableRawPointer, _ other: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer {
     #if arch(wasm32)
-    let ret = MathOperations.subtract(a: Double.bridgeJSLiftParameter(a), b: Double.bridgeJSLiftParameter(b))
+    let ret = PolygonReference.bridgeJSLiftParameter(_self).merge(_: Polygon.bridgeJSLiftParameter(other))
     return ret.bridgeJSLowerReturn()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-extension CopyableCart: _BridgedSwiftStruct {
-    @_spi(BridgeJS) @_transparent public static func bridgeJSStackPop() -> CopyableCart {
-        let note = Optional<String>.bridgeJSStackPop()
-        let x = Int.bridgeJSStackPop()
-        return CopyableCart(x: x, note: note)
-    }
+@_expose(wasm, "bjs_PolygonReference_static_origin")
+@_cdecl("bjs_PolygonReference_static_origin")
+public func _bjs_PolygonReference_static_origin(_ labelBytes: Int32, _ labelLength: Int32) -> UnsafeMutableRawPointer {
+    #if arch(wasm32)
+    let ret = PolygonReference.origin(label: String.bridgeJSLiftParameter(labelBytes, labelLength))
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
 
-    @_spi(BridgeJS) @_transparent public consuming func bridgeJSStackPush() {
-        self.x.bridgeJSStackPush()
-        self.note.bridgeJSStackPush()
-    }
+@_expose(wasm, "bjs_PolygonReference_deinit")
+@_cdecl("bjs_PolygonReference_deinit")
+public func _bjs_PolygonReference_deinit(_ pointer: UnsafeMutableRawPointer) -> Void {
+    #if arch(wasm32)
+    Unmanaged<PolygonReference>.fromOpaque(pointer).release()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
 
-    init(unsafelyCopying jsObject: JSObject) {
-        _bjs_struct_lower_CopyableCart(jsObject.bridgeJSLowerParameter())
-        self = Self.bridgeJSStackPop()
+extension PolygonReference: ConvertibleToJSValue, _BridgedSwiftHeapObject, _BridgedSwiftProtocolExportable {
+    var jsValue: JSValue {
+        return .object(JSObject(id: UInt32(bitPattern: _bjs_PolygonReference_wrap(Unmanaged.passRetained(self).toOpaque()))))
     }
-
-    func toJSObject() -> JSObject {
-        let __bjs_self = self
-        __bjs_self.bridgeJSStackPush()
-        return JSObject(id: UInt32(bitPattern: _bjs_struct_lift_CopyableCart()))
+    consuming func bridgeJSLowerAsProtocolReturn() -> Int32 {
+        _bjs_PolygonReference_wrap(Unmanaged.passRetained(self).toOpaque())
     }
 }
 
 #if arch(wasm32)
-@_extern(wasm, module: "bjs", name: "swift_js_struct_lower_CopyableCart")
-fileprivate func _bjs_struct_lower_CopyableCart_extern(_ objectId: Int32) -> Void
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_PolygonReference_wrap")
+fileprivate func _bjs_PolygonReference_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32
 #else
-fileprivate func _bjs_struct_lower_CopyableCart_extern(_ objectId: Int32) -> Void {
+fileprivate func _bjs_PolygonReference_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 {
     fatalError("Only available on WebAssembly")
 }
 #endif
-@inline(never) fileprivate func _bjs_struct_lower_CopyableCart(_ objectId: Int32) -> Void {
-    return _bjs_struct_lower_CopyableCart_extern(objectId)
+@inline(never) fileprivate func _bjs_PolygonReference_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 {
+    return _bjs_PolygonReference_wrap_extern(pointer)
 }
 
-#if arch(wasm32)
-@_extern(wasm, module: "bjs", name: "swift_js_struct_lift_CopyableCart")
-fileprivate func _bjs_struct_lift_CopyableCart_extern() -> Int32
-#else
-fileprivate func _bjs_struct_lift_CopyableCart_extern() -> Int32 {
+@_expose(wasm, "bjs_TagReference_describe")
+@_cdecl("bjs_TagReference_describe")
+public func _bjs_TagReference_describe(_ _self: UnsafeMutableRawPointer) -> Void {
+    #if arch(wasm32)
+    let ret = TagReference.bridgeJSLiftParameter(_self).describe()
+    return ret.bridgeJSLowerReturn()
+    #else
     fatalError("Only available on WebAssembly")
-}
-#endif
-@inline(never) fileprivate func _bjs_struct_lift_CopyableCart() -> Int32 {
-    return _bjs_struct_lift_CopyableCart_extern()
+    #endif
 }
 
-@_expose(wasm, "bjs_CopyableCart_static_fromJSObject")
-@_cdecl("bjs_CopyableCart_static_fromJSObject")
-public func _bjs_CopyableCart_static_fromJSObject(_ object: Int32) -> Void {
+@_expose(wasm, "bjs_TagReference_deinit")
+@_cdecl("bjs_TagReference_deinit")
+public func _bjs_TagReference_deinit(_ pointer: UnsafeMutableRawPointer) -> Void {
     #if arch(wasm32)
-    let ret = CopyableCart.fromJSObject(_: JSObject.bridgeJSLiftParameter(object))
-    return ret.bridgeJSLowerReturn()
+    Unmanaged<TagReference>.fromOpaque(pointer).release()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-extension CopyableCartItem: _BridgedSwiftStruct {
-    @_spi(BridgeJS) @_transparent public static func bridgeJSStackPop() -> CopyableCartItem {
-        let quantity = Int.bridgeJSStackPop()
-        let sku = String.bridgeJSStackPop()
-        return CopyableCartItem(sku: sku, quantity: quantity)
-    }
-
-    @_spi(BridgeJS) @_transparent public consuming func bridgeJSStackPush() {
-        self.sku.bridgeJSStackPush()
-        self.quantity.bridgeJSStackPush()
-    }
-
-    init(unsafelyCopying jsObject: JSObject) {
-        _bjs_struct_lower_CopyableCartItem(jsObject.bridgeJSLowerParameter())
-        self = Self.bridgeJSStackPop()
+extension TagReference: ConvertibleToJSValue, _BridgedSwiftHeapObject, _BridgedSwiftProtocolExportable {
+    var jsValue: JSValue {
+        return .object(JSObject(id: UInt32(bitPattern: _bjs_TagReference_wrap(Unmanaged.passRetained(self).toOpaque()))))
     }
-
-    func toJSObject() -> JSObject {
-        let __bjs_self = self
-        __bjs_self.bridgeJSStackPush()
-        return JSObject(id: UInt32(bitPattern: _bjs_struct_lift_CopyableCartItem()))
+    consuming func bridgeJSLowerAsProtocolReturn() -> Int32 {
+        _bjs_TagReference_wrap(Unmanaged.passRetained(self).toOpaque())
     }
 }
 
 #if arch(wasm32)
-@_extern(wasm, module: "bjs", name: "swift_js_struct_lower_CopyableCartItem")
-fileprivate func _bjs_struct_lower_CopyableCartItem_extern(_ objectId: Int32) -> Void
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_TagReference_wrap")
+fileprivate func _bjs_TagReference_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32
 #else
-fileprivate func _bjs_struct_lower_CopyableCartItem_extern(_ objectId: Int32) -> Void {
+fileprivate func _bjs_TagReference_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 {
     fatalError("Only available on WebAssembly")
 }
 #endif
-@inline(never) fileprivate func _bjs_struct_lower_CopyableCartItem(_ objectId: Int32) -> Void {
-    return _bjs_struct_lower_CopyableCartItem_extern(objectId)
+@inline(never) fileprivate func _bjs_TagReference_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 {
+    return _bjs_TagReference_wrap_extern(pointer)
 }
 
-#if arch(wasm32)
-@_extern(wasm, module: "bjs", name: "swift_js_struct_lift_CopyableCartItem")
-fileprivate func _bjs_struct_lift_CopyableCartItem_extern() -> Int32
-#else
-fileprivate func _bjs_struct_lift_CopyableCartItem_extern() -> Int32 {
+@_expose(wasm, "bjs_TagHolderReference_init")
+@_cdecl("bjs_TagHolderReference_init")
+public func _bjs_TagHolderReference_init(_ tag: UnsafeMutableRawPointer, _ version: Int32) -> UnsafeMutableRawPointer {
+    #if arch(wasm32)
+    let ret = TagHolderReference(tag: Tag.bridgeJSLiftParameter(tag), version: Int.bridgeJSLiftParameter(version))
+    return ret.bridgeJSLowerReturn()
+    #else
     fatalError("Only available on WebAssembly")
+    #endif
 }
-#endif
-@inline(never) fileprivate func _bjs_struct_lift_CopyableCartItem() -> Int32 {
-    return _bjs_struct_lift_CopyableCartItem_extern()
+
+@_expose(wasm, "bjs_TagHolderReference_describe")
+@_cdecl("bjs_TagHolderReference_describe")
+public func _bjs_TagHolderReference_describe(_ _self: UnsafeMutableRawPointer) -> Void {
+    #if arch(wasm32)
+    let ret = TagHolderReference.bridgeJSLiftParameter(_self).describe()
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
 }
 
-extension CopyableNestedCart: _BridgedSwiftStruct {
-    @_spi(BridgeJS) @_transparent public static func bridgeJSStackPop() -> CopyableNestedCart {
-        let shippingAddress = Optional<Address>.bridgeJSStackPop()
-        let item = CopyableCartItem.bridgeJSStackPop()
-        let id = Int.bridgeJSStackPop()
-        return CopyableNestedCart(id: id, item: item, shippingAddress: shippingAddress)
-    }
+@_expose(wasm, "bjs_TagHolderReference_tag_get")
+@_cdecl("bjs_TagHolderReference_tag_get")
+public func _bjs_TagHolderReference_tag_get(_ _self: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer {
+    #if arch(wasm32)
+    let ret = TagHolderReference.bridgeJSLiftParameter(_self).tag
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
 
-    @_spi(BridgeJS) @_transparent public consuming func bridgeJSStackPush() {
-        self.id.bridgeJSStackPush()
-        self.item.bridgeJSStackPush()
-        self.shippingAddress.bridgeJSStackPush()
-    }
+@_expose(wasm, "bjs_TagHolderReference_tag_set")
+@_cdecl("bjs_TagHolderReference_tag_set")
+public func _bjs_TagHolderReference_tag_set(_ _self: UnsafeMutableRawPointer, _ value: UnsafeMutableRawPointer) -> Void {
+    #if arch(wasm32)
+    TagHolderReference.bridgeJSLiftParameter(_self).tag = Tag.bridgeJSLiftParameter(value)
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
 
-    init(unsafelyCopying jsObject: JSObject) {
-        _bjs_struct_lower_CopyableNestedCart(jsObject.bridgeJSLowerParameter())
-        self = Self.bridgeJSStackPop()
-    }
+@_expose(wasm, "bjs_TagHolderReference_version_get")
+@_cdecl("bjs_TagHolderReference_version_get")
+public func _bjs_TagHolderReference_version_get(_ _self: UnsafeMutableRawPointer) -> Int32 {
+    #if arch(wasm32)
+    let ret = TagHolderReference.bridgeJSLiftParameter(_self).version
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
 
-    func toJSObject() -> JSObject {
-        let __bjs_self = self
-        __bjs_self.bridgeJSStackPush()
-        return JSObject(id: UInt32(bitPattern: _bjs_struct_lift_CopyableNestedCart()))
+@_expose(wasm, "bjs_TagHolderReference_version_set")
+@_cdecl("bjs_TagHolderReference_version_set")
+public func _bjs_TagHolderReference_version_set(_ _self: UnsafeMutableRawPointer, _ value: Int32) -> Void {
+    #if arch(wasm32)
+    TagHolderReference.bridgeJSLiftParameter(_self).version = Int.bridgeJSLiftParameter(value)
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_TagHolderReference_deinit")
+@_cdecl("bjs_TagHolderReference_deinit")
+public func _bjs_TagHolderReference_deinit(_ pointer: UnsafeMutableRawPointer) -> Void {
+    #if arch(wasm32)
+    Unmanaged<TagHolderReference>.fromOpaque(pointer).release()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+extension TagHolderReference: ConvertibleToJSValue, _BridgedSwiftHeapObject, _BridgedSwiftProtocolExportable {
+    var jsValue: JSValue {
+        return .object(JSObject(id: UInt32(bitPattern: _bjs_TagHolderReference_wrap(Unmanaged.passRetained(self).toOpaque()))))
+    }
+    consuming func bridgeJSLowerAsProtocolReturn() -> Int32 {
+        _bjs_TagHolderReference_wrap(Unmanaged.passRetained(self).toOpaque())
     }
 }
 
 #if arch(wasm32)
-@_extern(wasm, module: "bjs", name: "swift_js_struct_lower_CopyableNestedCart")
-fileprivate func _bjs_struct_lower_CopyableNestedCart_extern(_ objectId: Int32) -> Void
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_TagHolderReference_wrap")
+fileprivate func _bjs_TagHolderReference_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32
 #else
-fileprivate func _bjs_struct_lower_CopyableNestedCart_extern(_ objectId: Int32) -> Void {
+fileprivate func _bjs_TagHolderReference_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 {
     fatalError("Only available on WebAssembly")
 }
 #endif
-@inline(never) fileprivate func _bjs_struct_lower_CopyableNestedCart(_ objectId: Int32) -> Void {
-    return _bjs_struct_lower_CopyableNestedCart_extern(objectId)
+@inline(never) fileprivate func _bjs_TagHolderReference_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 {
+    return _bjs_TagHolderReference_wrap_extern(pointer)
 }
 
-#if arch(wasm32)
-@_extern(wasm, module: "bjs", name: "swift_js_struct_lift_CopyableNestedCart")
-fileprivate func _bjs_struct_lift_CopyableNestedCart_extern() -> Int32
-#else
-fileprivate func _bjs_struct_lift_CopyableNestedCart_extern() -> Int32 {
+@_expose(wasm, "bjs_PriorityReference_describe")
+@_cdecl("bjs_PriorityReference_describe")
+public func _bjs_PriorityReference_describe(_ _self: UnsafeMutableRawPointer) -> Void {
+    #if arch(wasm32)
+    let ret = PriorityReference.bridgeJSLiftParameter(_self).describe()
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_PriorityReference_weight")
+@_cdecl("bjs_PriorityReference_weight")
+public func _bjs_PriorityReference_weight(_ _self: UnsafeMutableRawPointer) -> Int32 {
+    #if arch(wasm32)
+    let ret = PriorityReference.bridgeJSLiftParameter(_self).weight()
+    return ret.bridgeJSLowerReturn()
+    #else
     fatalError("Only available on WebAssembly")
+    #endif
 }
-#endif
-@inline(never) fileprivate func _bjs_struct_lift_CopyableNestedCart() -> Int32 {
-    return _bjs_struct_lift_CopyableNestedCart_extern()
+
+@_expose(wasm, "bjs_PriorityReference_static_low")
+@_cdecl("bjs_PriorityReference_static_low")
+public func _bjs_PriorityReference_static_low() -> UnsafeMutableRawPointer {
+    #if arch(wasm32)
+    let ret = PriorityReference.low()
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
 }
 
-@_expose(wasm, "bjs_CopyableNestedCart_static_fromJSObject")
-@_cdecl("bjs_CopyableNestedCart_static_fromJSObject")
-public func _bjs_CopyableNestedCart_static_fromJSObject(_ object: Int32) -> Void {
+@_expose(wasm, "bjs_PriorityReference_static_medium")
+@_cdecl("bjs_PriorityReference_static_medium")
+public func _bjs_PriorityReference_static_medium() -> UnsafeMutableRawPointer {
     #if arch(wasm32)
-    let ret = CopyableNestedCart.fromJSObject(_: JSObject.bridgeJSLiftParameter(object))
+    let ret = PriorityReference.medium()
     return ret.bridgeJSLowerReturn()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-extension ConfigStruct: _BridgedSwiftStruct {
-    @_spi(BridgeJS) @_transparent public static func bridgeJSStackPop() -> ConfigStruct {
-        let value = Int.bridgeJSStackPop()
-        let name = String.bridgeJSStackPop()
-        return ConfigStruct(name: name, value: value)
-    }
+@_expose(wasm, "bjs_PriorityReference_static_high")
+@_cdecl("bjs_PriorityReference_static_high")
+public func _bjs_PriorityReference_static_high() -> UnsafeMutableRawPointer {
+    #if arch(wasm32)
+    let ret = PriorityReference.high()
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
 
-    @_spi(BridgeJS) @_transparent public consuming func bridgeJSStackPush() {
-        self.name.bridgeJSStackPush()
-        self.value.bridgeJSStackPush()
-    }
+@_expose(wasm, "bjs_PriorityReference_deinit")
+@_cdecl("bjs_PriorityReference_deinit")
+public func _bjs_PriorityReference_deinit(_ pointer: UnsafeMutableRawPointer) -> Void {
+    #if arch(wasm32)
+    Unmanaged<PriorityReference>.fromOpaque(pointer).release()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
 
-    init(unsafelyCopying jsObject: JSObject) {
-        _bjs_struct_lower_ConfigStruct(jsObject.bridgeJSLowerParameter())
-        self = Self.bridgeJSStackPop()
+extension PriorityReference: ConvertibleToJSValue, _BridgedSwiftHeapObject, _BridgedSwiftProtocolExportable {
+    var jsValue: JSValue {
+        return .object(JSObject(id: UInt32(bitPattern: _bjs_PriorityReference_wrap(Unmanaged.passRetained(self).toOpaque()))))
     }
-
-    func toJSObject() -> JSObject {
-        let __bjs_self = self
-        __bjs_self.bridgeJSStackPush()
-        return JSObject(id: UInt32(bitPattern: _bjs_struct_lift_ConfigStruct()))
+    consuming func bridgeJSLowerAsProtocolReturn() -> Int32 {
+        _bjs_PriorityReference_wrap(Unmanaged.passRetained(self).toOpaque())
     }
 }
 
 #if arch(wasm32)
-@_extern(wasm, module: "bjs", name: "swift_js_struct_lower_ConfigStruct")
-fileprivate func _bjs_struct_lower_ConfigStruct_extern(_ objectId: Int32) -> Void
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_PriorityReference_wrap")
+fileprivate func _bjs_PriorityReference_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32
 #else
-fileprivate func _bjs_struct_lower_ConfigStruct_extern(_ objectId: Int32) -> Void {
+fileprivate func _bjs_PriorityReference_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 {
     fatalError("Only available on WebAssembly")
 }
 #endif
-@inline(never) fileprivate func _bjs_struct_lower_ConfigStruct(_ objectId: Int32) -> Void {
-    return _bjs_struct_lower_ConfigStruct_extern(objectId)
+@inline(never) fileprivate func _bjs_PriorityReference_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 {
+    return _bjs_PriorityReference_wrap_extern(pointer)
 }
 
-#if arch(wasm32)
-@_extern(wasm, module: "bjs", name: "swift_js_struct_lift_ConfigStruct")
-fileprivate func _bjs_struct_lift_ConfigStruct_extern() -> Int32
-#else
-fileprivate func _bjs_struct_lift_ConfigStruct_extern() -> Int32 {
+@_expose(wasm, "bjs_ClosureSupportExports_static_makeIntToInt")
+@_cdecl("bjs_ClosureSupportExports_static_makeIntToInt")
+public func _bjs_ClosureSupportExports_static_makeIntToInt(_ base: Int32) -> Int32 {
+    #if arch(wasm32)
+    let ret = ClosureSupportExports.makeIntToInt(_: Int.bridgeJSLiftParameter(base))
+    return JSTypedClosure(ret).bridgeJSLowerReturn()
+    #else
     fatalError("Only available on WebAssembly")
-}
-#endif
-@inline(never) fileprivate func _bjs_struct_lift_ConfigStruct() -> Int32 {
-    return _bjs_struct_lift_ConfigStruct_extern()
+    #endif
 }
 
-@_expose(wasm, "bjs_ConfigStruct_static_defaultConfig_get")
-@_cdecl("bjs_ConfigStruct_static_defaultConfig_get")
-public func _bjs_ConfigStruct_static_defaultConfig_get() -> Void {
+@_expose(wasm, "bjs_ClosureSupportExports_static_makeDoubleToDouble")
+@_cdecl("bjs_ClosureSupportExports_static_makeDoubleToDouble")
+public func _bjs_ClosureSupportExports_static_makeDoubleToDouble(_ base: Float64) -> Int32 {
     #if arch(wasm32)
-    let ret = ConfigStruct.defaultConfig
-    return ret.bridgeJSLowerReturn()
+    let ret = ClosureSupportExports.makeDoubleToDouble(_: Double.bridgeJSLiftParameter(base))
+    return JSTypedClosure(ret).bridgeJSLowerReturn()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_ConfigStruct_static_defaultConfig_set")
-@_cdecl("bjs_ConfigStruct_static_defaultConfig_set")
-public func _bjs_ConfigStruct_static_defaultConfig_set(_ valueBytes: Int32, _ valueLength: Int32) -> Void {
+@_expose(wasm, "bjs_ClosureSupportExports_static_makeStringToString")
+@_cdecl("bjs_ClosureSupportExports_static_makeStringToString")
+public func _bjs_ClosureSupportExports_static_makeStringToString(_ prefixBytes: Int32, _ prefixLength: Int32) -> Int32 {
     #if arch(wasm32)
-    ConfigStruct.defaultConfig = String.bridgeJSLiftParameter(valueBytes, valueLength)
+    let ret = ClosureSupportExports.makeStringToString(_: String.bridgeJSLiftParameter(prefixBytes, prefixLength))
+    return JSTypedClosure(ret).bridgeJSLowerReturn()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_ConfigStruct_static_maxRetries_get")
-@_cdecl("bjs_ConfigStruct_static_maxRetries_get")
-public func _bjs_ConfigStruct_static_maxRetries_get() -> Int32 {
+@_expose(wasm, "bjs_ClosureSupportExports_static_makeJSIntToInt")
+@_cdecl("bjs_ClosureSupportExports_static_makeJSIntToInt")
+public func _bjs_ClosureSupportExports_static_makeJSIntToInt(_ base: Int32) -> Int32 {
     #if arch(wasm32)
-    let ret = ConfigStruct.maxRetries
+    let ret = ClosureSupportExports.makeJSIntToInt(_: Int.bridgeJSLiftParameter(base))
     return ret.bridgeJSLowerReturn()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_ConfigStruct_static_timeout_get")
-@_cdecl("bjs_ConfigStruct_static_timeout_get")
-public func _bjs_ConfigStruct_static_timeout_get() -> Float64 {
+@_expose(wasm, "bjs_ClosureSupportExports_static_makeJSDoubleToDouble")
+@_cdecl("bjs_ClosureSupportExports_static_makeJSDoubleToDouble")
+public func _bjs_ClosureSupportExports_static_makeJSDoubleToDouble(_ base: Float64) -> Int32 {
     #if arch(wasm32)
-    let ret = ConfigStruct.timeout
+    let ret = ClosureSupportExports.makeJSDoubleToDouble(_: Double.bridgeJSLiftParameter(base))
     return ret.bridgeJSLowerReturn()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_ConfigStruct_static_timeout_set")
-@_cdecl("bjs_ConfigStruct_static_timeout_set")
-public func _bjs_ConfigStruct_static_timeout_set(_ value: Float64) -> Void {
+@_expose(wasm, "bjs_ClosureSupportExports_static_makeJSStringToString")
+@_cdecl("bjs_ClosureSupportExports_static_makeJSStringToString")
+public func _bjs_ClosureSupportExports_static_makeJSStringToString(_ prefixBytes: Int32, _ prefixLength: Int32) -> Int32 {
     #if arch(wasm32)
-    ConfigStruct.timeout = Double.bridgeJSLiftParameter(value)
+    let ret = ClosureSupportExports.makeJSStringToString(_: String.bridgeJSLiftParameter(prefixBytes, prefixLength))
+    return ret.bridgeJSLowerReturn()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_ConfigStruct_static_computedSetting_get")
-@_cdecl("bjs_ConfigStruct_static_computedSetting_get")
-public func _bjs_ConfigStruct_static_computedSetting_get() -> Void {
+@_expose(wasm, "bjs_ClosureSupportExports_deinit")
+@_cdecl("bjs_ClosureSupportExports_deinit")
+public func _bjs_ClosureSupportExports_deinit(_ pointer: UnsafeMutableRawPointer) -> Void {
     #if arch(wasm32)
-    let ret = ConfigStruct.computedSetting
-    return ret.bridgeJSLowerReturn()
+    Unmanaged<ClosureSupportExports>.fromOpaque(pointer).release()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-extension Vector2D: _BridgedSwiftStruct {
-    @_spi(BridgeJS) @_transparent public static func bridgeJSStackPop() -> Vector2D {
-        let dy = Double.bridgeJSStackPop()
-        let dx = Double.bridgeJSStackPop()
-        return Vector2D(dx: dx, dy: dy)
-    }
-
-    @_spi(BridgeJS) @_transparent public consuming func bridgeJSStackPush() {
-        self.dx.bridgeJSStackPush()
-        self.dy.bridgeJSStackPush()
-    }
-
-    init(unsafelyCopying jsObject: JSObject) {
-        _bjs_struct_lower_Vector2D(jsObject.bridgeJSLowerParameter())
-        self = Self.bridgeJSStackPop()
+extension ClosureSupportExports: ConvertibleToJSValue, _BridgedSwiftHeapObject, _BridgedSwiftProtocolExportable {
+    var jsValue: JSValue {
+        return .object(JSObject(id: UInt32(bitPattern: _bjs_ClosureSupportExports_wrap(Unmanaged.passRetained(self).toOpaque()))))
     }
-
-    func toJSObject() -> JSObject {
-        let __bjs_self = self
-        __bjs_self.bridgeJSStackPush()
-        return JSObject(id: UInt32(bitPattern: _bjs_struct_lift_Vector2D()))
+    consuming func bridgeJSLowerAsProtocolReturn() -> Int32 {
+        _bjs_ClosureSupportExports_wrap(Unmanaged.passRetained(self).toOpaque())
     }
 }
 
 #if arch(wasm32)
-@_extern(wasm, module: "bjs", name: "swift_js_struct_lower_Vector2D")
-fileprivate func _bjs_struct_lower_Vector2D_extern(_ objectId: Int32) -> Void
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_ClosureSupportExports_wrap")
+fileprivate func _bjs_ClosureSupportExports_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32
 #else
-fileprivate func _bjs_struct_lower_Vector2D_extern(_ objectId: Int32) -> Void {
+fileprivate func _bjs_ClosureSupportExports_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 {
     fatalError("Only available on WebAssembly")
 }
 #endif
-@inline(never) fileprivate func _bjs_struct_lower_Vector2D(_ objectId: Int32) -> Void {
-    return _bjs_struct_lower_Vector2D_extern(objectId)
+@inline(never) fileprivate func _bjs_ClosureSupportExports_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 {
+    return _bjs_ClosureSupportExports_wrap_extern(pointer)
+}
+
+@_expose(wasm, "bjs_Workspace_init")
+@_cdecl("bjs_Workspace_init")
+public func _bjs_Workspace_init(_ nameBytes: Int32, _ nameLength: Int32) -> UnsafeMutableRawPointer {
+    #if arch(wasm32)
+    let ret = Workspace(name: String.bridgeJSLiftParameter(nameBytes, nameLength))
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_Workspace_describe")
+@_cdecl("bjs_Workspace_describe")
+public func _bjs_Workspace_describe(_ _self: UnsafeMutableRawPointer) -> Void {
+    #if arch(wasm32)
+    let ret = Workspace.bridgeJSLiftParameter(_self).describe()
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_Workspace_deinit")
+@_cdecl("bjs_Workspace_deinit")
+public func _bjs_Workspace_deinit(_ pointer: UnsafeMutableRawPointer) -> Void {
+    #if arch(wasm32)
+    Unmanaged<Workspace>.fromOpaque(pointer).release()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+extension Workspace: ConvertibleToJSValue, _BridgedSwiftHeapObject, _BridgedSwiftProtocolExportable {
+    var jsValue: JSValue {
+        return .object(JSObject(id: UInt32(bitPattern: _bjs_Workspace_wrap(Unmanaged.passRetained(self).toOpaque()))))
+    }
+    consuming func bridgeJSLowerAsProtocolReturn() -> Int32 {
+        _bjs_Workspace_wrap(Unmanaged.passRetained(self).toOpaque())
+    }
 }
 
 #if arch(wasm32)
-@_extern(wasm, module: "bjs", name: "swift_js_struct_lift_Vector2D")
-fileprivate func _bjs_struct_lift_Vector2D_extern() -> Int32
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_Workspace_wrap")
+fileprivate func _bjs_Workspace_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32
 #else
-fileprivate func _bjs_struct_lift_Vector2D_extern() -> Int32 {
+fileprivate func _bjs_Workspace_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 {
     fatalError("Only available on WebAssembly")
 }
 #endif
-@inline(never) fileprivate func _bjs_struct_lift_Vector2D() -> Int32 {
-    return _bjs_struct_lift_Vector2D_extern()
+@inline(never) fileprivate func _bjs_Workspace_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 {
+    return _bjs_Workspace_wrap_extern(pointer)
 }
 
-@_expose(wasm, "bjs_Vector2D_init")
-@_cdecl("bjs_Vector2D_init")
-public func _bjs_Vector2D_init(_ dx: Float64, _ dy: Float64) -> Void {
+@_expose(wasm, "bjs_DefaultArgumentConstructorDefaults_init")
+@_cdecl("bjs_DefaultArgumentConstructorDefaults_init")
+public func _bjs_DefaultArgumentConstructorDefaults_init(_ nameBytes: Int32, _ nameLength: Int32, _ count: Int32, _ enabled: Int32, _ status: Int32, _ tagIsSome: Int32, _ tagBytes: Int32, _ tagLength: Int32) -> UnsafeMutableRawPointer {
     #if arch(wasm32)
-    let ret = Vector2D(dx: Double.bridgeJSLiftParameter(dx), dy: Double.bridgeJSLiftParameter(dy))
+    let ret = DefaultArgumentConstructorDefaults(name: String.bridgeJSLiftParameter(nameBytes, nameLength), count: Int.bridgeJSLiftParameter(count), enabled: Bool.bridgeJSLiftParameter(enabled), status: Status.bridgeJSLiftParameter(status), tag: Optional<String>.bridgeJSLiftParameter(tagIsSome, tagBytes, tagLength))
     return ret.bridgeJSLowerReturn()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_Vector2D_magnitude")
-@_cdecl("bjs_Vector2D_magnitude")
-public func _bjs_Vector2D_magnitude() -> Float64 {
+@_expose(wasm, "bjs_DefaultArgumentConstructorDefaults_describe")
+@_cdecl("bjs_DefaultArgumentConstructorDefaults_describe")
+public func _bjs_DefaultArgumentConstructorDefaults_describe(_ _self: UnsafeMutableRawPointer) -> Void {
     #if arch(wasm32)
-    let ret = Vector2D.bridgeJSLiftParameter().magnitude()
+    let ret = DefaultArgumentConstructorDefaults.bridgeJSLiftParameter(_self).describe()
     return ret.bridgeJSLowerReturn()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_Vector2D_scaled")
-@_cdecl("bjs_Vector2D_scaled")
-public func _bjs_Vector2D_scaled(_ factor: Float64) -> Void {
+@_expose(wasm, "bjs_DefaultArgumentConstructorDefaults_name_get")
+@_cdecl("bjs_DefaultArgumentConstructorDefaults_name_get")
+public func _bjs_DefaultArgumentConstructorDefaults_name_get(_ _self: UnsafeMutableRawPointer) -> Void {
     #if arch(wasm32)
-    let ret = Vector2D.bridgeJSLiftParameter().scaled(by: Double.bridgeJSLiftParameter(factor))
+    let ret = DefaultArgumentConstructorDefaults.bridgeJSLiftParameter(_self).name
     return ret.bridgeJSLowerReturn()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-extension JSObjectContainer: _BridgedSwiftStruct {
-    @_spi(BridgeJS) @_transparent public static func bridgeJSStackPop() -> JSObjectContainer {
-        let optionalObject = Optional<JSObject>.bridgeJSStackPop()
-        let object = JSObject.bridgeJSStackPop()
-        return JSObjectContainer(object: object, optionalObject: optionalObject)
-    }
-
-    @_spi(BridgeJS) @_transparent public consuming func bridgeJSStackPush() {
-        self.object.bridgeJSStackPush()
-        self.optionalObject.bridgeJSStackPush()
-    }
+@_expose(wasm, "bjs_DefaultArgumentConstructorDefaults_name_set")
+@_cdecl("bjs_DefaultArgumentConstructorDefaults_name_set")
+public func _bjs_DefaultArgumentConstructorDefaults_name_set(_ _self: UnsafeMutableRawPointer, _ valueBytes: Int32, _ valueLength: Int32) -> Void {
+    #if arch(wasm32)
+    DefaultArgumentConstructorDefaults.bridgeJSLiftParameter(_self).name = String.bridgeJSLiftParameter(valueBytes, valueLength)
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
 
-    init(unsafelyCopying jsObject: JSObject) {
-        _bjs_struct_lower_JSObjectContainer(jsObject.bridgeJSLowerParameter())
-        self = Self.bridgeJSStackPop()
-    }
+@_expose(wasm, "bjs_DefaultArgumentConstructorDefaults_count_get")
+@_cdecl("bjs_DefaultArgumentConstructorDefaults_count_get")
+public func _bjs_DefaultArgumentConstructorDefaults_count_get(_ _self: UnsafeMutableRawPointer) -> Int32 {
+    #if arch(wasm32)
+    let ret = DefaultArgumentConstructorDefaults.bridgeJSLiftParameter(_self).count
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
 
-    func toJSObject() -> JSObject {
-        let __bjs_self = self
-        __bjs_self.bridgeJSStackPush()
-        return JSObject(id: UInt32(bitPattern: _bjs_struct_lift_JSObjectContainer()))
-    }
+@_expose(wasm, "bjs_DefaultArgumentConstructorDefaults_count_set")
+@_cdecl("bjs_DefaultArgumentConstructorDefaults_count_set")
+public func _bjs_DefaultArgumentConstructorDefaults_count_set(_ _self: UnsafeMutableRawPointer, _ value: Int32) -> Void {
+    #if arch(wasm32)
+    DefaultArgumentConstructorDefaults.bridgeJSLiftParameter(_self).count = Int.bridgeJSLiftParameter(value)
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
 }
 
-#if arch(wasm32)
-@_extern(wasm, module: "bjs", name: "swift_js_struct_lower_JSObjectContainer")
-fileprivate func _bjs_struct_lower_JSObjectContainer_extern(_ objectId: Int32) -> Void
-#else
-fileprivate func _bjs_struct_lower_JSObjectContainer_extern(_ objectId: Int32) -> Void {
+@_expose(wasm, "bjs_DefaultArgumentConstructorDefaults_enabled_get")
+@_cdecl("bjs_DefaultArgumentConstructorDefaults_enabled_get")
+public func _bjs_DefaultArgumentConstructorDefaults_enabled_get(_ _self: UnsafeMutableRawPointer) -> Int32 {
+    #if arch(wasm32)
+    let ret = DefaultArgumentConstructorDefaults.bridgeJSLiftParameter(_self).enabled
+    return ret.bridgeJSLowerReturn()
+    #else
     fatalError("Only available on WebAssembly")
-}
-#endif
-@inline(never) fileprivate func _bjs_struct_lower_JSObjectContainer(_ objectId: Int32) -> Void {
-    return _bjs_struct_lower_JSObjectContainer_extern(objectId)
+    #endif
 }
 
-#if arch(wasm32)
-@_extern(wasm, module: "bjs", name: "swift_js_struct_lift_JSObjectContainer")
-fileprivate func _bjs_struct_lift_JSObjectContainer_extern() -> Int32
-#else
-fileprivate func _bjs_struct_lift_JSObjectContainer_extern() -> Int32 {
+@_expose(wasm, "bjs_DefaultArgumentConstructorDefaults_enabled_set")
+@_cdecl("bjs_DefaultArgumentConstructorDefaults_enabled_set")
+public func _bjs_DefaultArgumentConstructorDefaults_enabled_set(_ _self: UnsafeMutableRawPointer, _ value: Int32) -> Void {
+    #if arch(wasm32)
+    DefaultArgumentConstructorDefaults.bridgeJSLiftParameter(_self).enabled = Bool.bridgeJSLiftParameter(value)
+    #else
     fatalError("Only available on WebAssembly")
+    #endif
 }
-#endif
-@inline(never) fileprivate func _bjs_struct_lift_JSObjectContainer() -> Int32 {
-    return _bjs_struct_lift_JSObjectContainer_extern()
-}
-
-extension FooContainer: _BridgedSwiftStruct {
-    @_spi(BridgeJS) @_transparent public static func bridgeJSStackPop() -> FooContainer {
-        let optionalFoo = Optional<JSObject>.bridgeJSStackPop().map { Foo(unsafelyWrapping: $0) }
-        let foo = Foo(unsafelyWrapping: JSObject.bridgeJSStackPop())
-        return FooContainer(foo: foo, optionalFoo: optionalFoo)
-    }
-
-    @_spi(BridgeJS) @_transparent public consuming func bridgeJSStackPush() {
-        self.foo.jsObject.bridgeJSStackPush()
-        self.optionalFoo.bridgeJSStackPush()
-    }
-
-    init(unsafelyCopying jsObject: JSObject) {
-        _bjs_struct_lower_FooContainer(jsObject.bridgeJSLowerParameter())
-        self = Self.bridgeJSStackPop()
-    }
 
-    func toJSObject() -> JSObject {
-        let __bjs_self = self
-        __bjs_self.bridgeJSStackPush()
-        return JSObject(id: UInt32(bitPattern: _bjs_struct_lift_FooContainer()))
-    }
+@_expose(wasm, "bjs_DefaultArgumentConstructorDefaults_status_get")
+@_cdecl("bjs_DefaultArgumentConstructorDefaults_status_get")
+public func _bjs_DefaultArgumentConstructorDefaults_status_get(_ _self: UnsafeMutableRawPointer) -> Int32 {
+    #if arch(wasm32)
+    let ret = DefaultArgumentConstructorDefaults.bridgeJSLiftParameter(_self).status
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
 }
 
-#if arch(wasm32)
-@_extern(wasm, module: "bjs", name: "swift_js_struct_lower_FooContainer")
-fileprivate func _bjs_struct_lower_FooContainer_extern(_ objectId: Int32) -> Void
-#else
-fileprivate func _bjs_struct_lower_FooContainer_extern(_ objectId: Int32) -> Void {
+@_expose(wasm, "bjs_DefaultArgumentConstructorDefaults_status_set")
+@_cdecl("bjs_DefaultArgumentConstructorDefaults_status_set")
+public func _bjs_DefaultArgumentConstructorDefaults_status_set(_ _self: UnsafeMutableRawPointer, _ value: Int32) -> Void {
+    #if arch(wasm32)
+    DefaultArgumentConstructorDefaults.bridgeJSLiftParameter(_self).status = Status.bridgeJSLiftParameter(value)
+    #else
     fatalError("Only available on WebAssembly")
-}
-#endif
-@inline(never) fileprivate func _bjs_struct_lower_FooContainer(_ objectId: Int32) -> Void {
-    return _bjs_struct_lower_FooContainer_extern(objectId)
+    #endif
 }
 
-#if arch(wasm32)
-@_extern(wasm, module: "bjs", name: "swift_js_struct_lift_FooContainer")
-fileprivate func _bjs_struct_lift_FooContainer_extern() -> Int32
-#else
-fileprivate func _bjs_struct_lift_FooContainer_extern() -> Int32 {
+@_expose(wasm, "bjs_DefaultArgumentConstructorDefaults_tag_get")
+@_cdecl("bjs_DefaultArgumentConstructorDefaults_tag_get")
+public func _bjs_DefaultArgumentConstructorDefaults_tag_get(_ _self: UnsafeMutableRawPointer) -> Void {
+    #if arch(wasm32)
+    let ret = DefaultArgumentConstructorDefaults.bridgeJSLiftParameter(_self).tag
+    return ret.bridgeJSLowerReturn()
+    #else
     fatalError("Only available on WebAssembly")
+    #endif
 }
-#endif
-@inline(never) fileprivate func _bjs_struct_lift_FooContainer() -> Int32 {
-    return _bjs_struct_lift_FooContainer_extern()
-}
-
-extension ArrayMembers: _BridgedSwiftStruct {
-    @_spi(BridgeJS) @_transparent public static func bridgeJSStackPop() -> ArrayMembers {
-        let optStrings = Optional<[String]>.bridgeJSStackPop()
-        let ints = [Int].bridgeJSStackPop()
-        return ArrayMembers(ints: ints, optStrings: optStrings)
-    }
-
-    @_spi(BridgeJS) @_transparent public consuming func bridgeJSStackPush() {
-        self.ints.bridgeJSStackPush()
-        self.optStrings.bridgeJSStackPush()
-    }
-
-    init(unsafelyCopying jsObject: JSObject) {
-        _bjs_struct_lower_ArrayMembers(jsObject.bridgeJSLowerParameter())
-        self = Self.bridgeJSStackPop()
-    }
 
-    func toJSObject() -> JSObject {
-        let __bjs_self = self
-        __bjs_self.bridgeJSStackPush()
-        return JSObject(id: UInt32(bitPattern: _bjs_struct_lift_ArrayMembers()))
-    }
+@_expose(wasm, "bjs_DefaultArgumentConstructorDefaults_tag_set")
+@_cdecl("bjs_DefaultArgumentConstructorDefaults_tag_set")
+public func _bjs_DefaultArgumentConstructorDefaults_tag_set(_ _self: UnsafeMutableRawPointer, _ valueIsSome: Int32, _ valueBytes: Int32, _ valueLength: Int32) -> Void {
+    #if arch(wasm32)
+    DefaultArgumentConstructorDefaults.bridgeJSLiftParameter(_self).tag = Optional<String>.bridgeJSLiftParameter(valueIsSome, valueBytes, valueLength)
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
 }
 
-#if arch(wasm32)
-@_extern(wasm, module: "bjs", name: "swift_js_struct_lower_ArrayMembers")
-fileprivate func _bjs_struct_lower_ArrayMembers_extern(_ objectId: Int32) -> Void
-#else
-fileprivate func _bjs_struct_lower_ArrayMembers_extern(_ objectId: Int32) -> Void {
+@_expose(wasm, "bjs_DefaultArgumentConstructorDefaults_deinit")
+@_cdecl("bjs_DefaultArgumentConstructorDefaults_deinit")
+public func _bjs_DefaultArgumentConstructorDefaults_deinit(_ pointer: UnsafeMutableRawPointer) -> Void {
+    #if arch(wasm32)
+    Unmanaged<DefaultArgumentConstructorDefaults>.fromOpaque(pointer).release()
+    #else
     fatalError("Only available on WebAssembly")
+    #endif
 }
-#endif
-@inline(never) fileprivate func _bjs_struct_lower_ArrayMembers(_ objectId: Int32) -> Void {
-    return _bjs_struct_lower_ArrayMembers_extern(objectId)
+
+extension DefaultArgumentConstructorDefaults: ConvertibleToJSValue, _BridgedSwiftHeapObject, _BridgedSwiftProtocolExportable {
+    var jsValue: JSValue {
+        return .object(JSObject(id: UInt32(bitPattern: _bjs_DefaultArgumentConstructorDefaults_wrap(Unmanaged.passRetained(self).toOpaque()))))
+    }
+    consuming func bridgeJSLowerAsProtocolReturn() -> Int32 {
+        _bjs_DefaultArgumentConstructorDefaults_wrap(Unmanaged.passRetained(self).toOpaque())
+    }
 }
 
 #if arch(wasm32)
-@_extern(wasm, module: "bjs", name: "swift_js_struct_lift_ArrayMembers")
-fileprivate func _bjs_struct_lift_ArrayMembers_extern() -> Int32
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DefaultArgumentConstructorDefaults_wrap")
+fileprivate func _bjs_DefaultArgumentConstructorDefaults_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32
 #else
-fileprivate func _bjs_struct_lift_ArrayMembers_extern() -> Int32 {
+fileprivate func _bjs_DefaultArgumentConstructorDefaults_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 {
     fatalError("Only available on WebAssembly")
 }
 #endif
-@inline(never) fileprivate func _bjs_struct_lift_ArrayMembers() -> Int32 {
-    return _bjs_struct_lift_ArrayMembers_extern()
+@inline(never) fileprivate func _bjs_DefaultArgumentConstructorDefaults_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 {
+    return _bjs_DefaultArgumentConstructorDefaults_wrap_extern(pointer)
 }
 
-@_expose(wasm, "bjs_ArrayMembers_sumValues")
-@_cdecl("bjs_ArrayMembers_sumValues")
-public func _bjs_ArrayMembers_sumValues() -> Int32 {
+@_expose(wasm, "bjs_Greeter_init")
+@_cdecl("bjs_Greeter_init")
+public func _bjs_Greeter_init(_ nameBytes: Int32, _ nameLength: Int32) -> UnsafeMutableRawPointer {
     #if arch(wasm32)
-    let ret = ArrayMembers.bridgeJSLiftParameter().sumValues(_: [Int].bridgeJSStackPop())
+    let ret = Greeter(name: String.bridgeJSLiftParameter(nameBytes, nameLength))
     return ret.bridgeJSLowerReturn()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_ArrayMembers_firstString")
-@_cdecl("bjs_ArrayMembers_firstString")
-public func _bjs_ArrayMembers_firstString() -> Void {
+@_expose(wasm, "bjs_Greeter_greet")
+@_cdecl("bjs_Greeter_greet")
+public func _bjs_Greeter_greet(_ _self: UnsafeMutableRawPointer) -> Void {
     #if arch(wasm32)
-    let ret = ArrayMembers.bridgeJSLiftParameter().firstString(_: [String].bridgeJSStackPop())
+    let ret = Greeter.bridgeJSLiftParameter(_self).greet()
     return ret.bridgeJSLowerReturn()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_roundTripVoid")
-@_cdecl("bjs_roundTripVoid")
-public func _bjs_roundTripVoid() -> Void {
+@_expose(wasm, "bjs_Greeter_changeName")
+@_cdecl("bjs_Greeter_changeName")
+public func _bjs_Greeter_changeName(_ _self: UnsafeMutableRawPointer, _ nameBytes: Int32, _ nameLength: Int32) -> Void {
     #if arch(wasm32)
-    roundTripVoid()
+    Greeter.bridgeJSLiftParameter(_self).changeName(name: String.bridgeJSLiftParameter(nameBytes, nameLength))
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_roundTripFloat")
-@_cdecl("bjs_roundTripFloat")
-public func _bjs_roundTripFloat(_ v: Float32) -> Float32 {
+@_expose(wasm, "bjs_Greeter_greetWith")
+@_cdecl("bjs_Greeter_greetWith")
+public func _bjs_Greeter_greetWith(_ _self: UnsafeMutableRawPointer, _ greeter: UnsafeMutableRawPointer, _ customGreeting: Int32) -> Void {
     #if arch(wasm32)
-    let ret = roundTripFloat(v: Float.bridgeJSLiftParameter(v))
+    let ret = Greeter.bridgeJSLiftParameter(_self).greetWith(greeter: Greeter.bridgeJSLiftParameter(greeter), customGreeting: _BJS_Closure_20BridgeJSRuntimeTests7GreeterC_SS.bridgeJSLift(customGreeting))
     return ret.bridgeJSLowerReturn()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_roundTripDouble")
-@_cdecl("bjs_roundTripDouble")
-public func _bjs_roundTripDouble(_ v: Float64) -> Float64 {
+@_expose(wasm, "bjs_Greeter_makeFormatter")
+@_cdecl("bjs_Greeter_makeFormatter")
+public func _bjs_Greeter_makeFormatter(_ _self: UnsafeMutableRawPointer, _ suffixBytes: Int32, _ suffixLength: Int32) -> Int32 {
     #if arch(wasm32)
-    let ret = roundTripDouble(v: Double.bridgeJSLiftParameter(v))
-    return ret.bridgeJSLowerReturn()
+    let ret = Greeter.bridgeJSLiftParameter(_self).makeFormatter(suffix: String.bridgeJSLiftParameter(suffixBytes, suffixLength))
+    return JSTypedClosure(ret).bridgeJSLowerReturn()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_roundTripBool")
-@_cdecl("bjs_roundTripBool")
-public func _bjs_roundTripBool(_ v: Int32) -> Int32 {
+@_expose(wasm, "bjs_Greeter_static_makeCreator")
+@_cdecl("bjs_Greeter_static_makeCreator")
+public func _bjs_Greeter_static_makeCreator(_ defaultNameBytes: Int32, _ defaultNameLength: Int32) -> Int32 {
     #if arch(wasm32)
-    let ret = roundTripBool(v: Bool.bridgeJSLiftParameter(v))
-    return ret.bridgeJSLowerReturn()
+    let ret = Greeter.makeCreator(defaultName: String.bridgeJSLiftParameter(defaultNameBytes, defaultNameLength))
+    return JSTypedClosure(ret).bridgeJSLowerReturn()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_roundTripString")
-@_cdecl("bjs_roundTripString")
-public func _bjs_roundTripString(_ vBytes: Int32, _ vLength: Int32) -> Void {
+@_expose(wasm, "bjs_Greeter_makeCustomGreeter")
+@_cdecl("bjs_Greeter_makeCustomGreeter")
+public func _bjs_Greeter_makeCustomGreeter(_ _self: UnsafeMutableRawPointer) -> Int32 {
     #if arch(wasm32)
-    let ret = roundTripString(v: String.bridgeJSLiftParameter(vBytes, vLength))
-    return ret.bridgeJSLowerReturn()
+    let ret = Greeter.bridgeJSLiftParameter(_self).makeCustomGreeter()
+    return JSTypedClosure(ret).bridgeJSLowerReturn()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_roundTripSwiftHeapObject")
-@_cdecl("bjs_roundTripSwiftHeapObject")
-public func _bjs_roundTripSwiftHeapObject(_ v: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer {
+@_expose(wasm, "bjs_Greeter_greetEnthusiastically")
+@_cdecl("bjs_Greeter_greetEnthusiastically")
+public func _bjs_Greeter_greetEnthusiastically(_ _self: UnsafeMutableRawPointer) -> Void {
     #if arch(wasm32)
-    let ret = roundTripSwiftHeapObject(v: Greeter.bridgeJSLiftParameter(v))
+    let ret = Greeter.bridgeJSLiftParameter(_self).greetEnthusiastically()
     return ret.bridgeJSLowerReturn()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_roundTripUnsafeRawPointer")
-@_cdecl("bjs_roundTripUnsafeRawPointer")
-public func _bjs_roundTripUnsafeRawPointer(_ v: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer {
+@_expose(wasm, "bjs_Greeter_static_greetAnonymously")
+@_cdecl("bjs_Greeter_static_greetAnonymously")
+public func _bjs_Greeter_static_greetAnonymously() -> Void {
     #if arch(wasm32)
-    let ret = roundTripUnsafeRawPointer(v: UnsafeRawPointer.bridgeJSLiftParameter(v))
+    let ret = Greeter.greetAnonymously()
     return ret.bridgeJSLowerReturn()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_roundTripUnsafeMutableRawPointer")
-@_cdecl("bjs_roundTripUnsafeMutableRawPointer")
-public func _bjs_roundTripUnsafeMutableRawPointer(_ v: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer {
+@_expose(wasm, "bjs_Greeter_name_get")
+@_cdecl("bjs_Greeter_name_get")
+public func _bjs_Greeter_name_get(_ _self: UnsafeMutableRawPointer) -> Void {
     #if arch(wasm32)
-    let ret = roundTripUnsafeMutableRawPointer(v: UnsafeMutableRawPointer.bridgeJSLiftParameter(v))
+    let ret = Greeter.bridgeJSLiftParameter(_self).name
     return ret.bridgeJSLowerReturn()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_roundTripOpaquePointer")
-@_cdecl("bjs_roundTripOpaquePointer")
-public func _bjs_roundTripOpaquePointer(_ v: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer {
+@_expose(wasm, "bjs_Greeter_name_set")
+@_cdecl("bjs_Greeter_name_set")
+public func _bjs_Greeter_name_set(_ _self: UnsafeMutableRawPointer, _ valueBytes: Int32, _ valueLength: Int32) -> Void {
     #if arch(wasm32)
-    let ret = roundTripOpaquePointer(v: OpaquePointer.bridgeJSLiftParameter(v))
-    return ret.bridgeJSLowerReturn()
+    Greeter.bridgeJSLiftParameter(_self).name = String.bridgeJSLiftParameter(valueBytes, valueLength)
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_roundTripUnsafePointer")
-@_cdecl("bjs_roundTripUnsafePointer")
-public func _bjs_roundTripUnsafePointer(_ v: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer {
+@_expose(wasm, "bjs_Greeter_prefix_get")
+@_cdecl("bjs_Greeter_prefix_get")
+public func _bjs_Greeter_prefix_get(_ _self: UnsafeMutableRawPointer) -> Void {
     #if arch(wasm32)
-    let ret = roundTripUnsafePointer(v: UnsafePointer<UInt8>.bridgeJSLiftParameter(v))
+    let ret = Greeter.bridgeJSLiftParameter(_self).prefix
     return ret.bridgeJSLowerReturn()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_roundTripUnsafeMutablePointer")
-@_cdecl("bjs_roundTripUnsafeMutablePointer")
-public func _bjs_roundTripUnsafeMutablePointer(_ v: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer {
+@_expose(wasm, "bjs_Greeter_nameCount_get")
+@_cdecl("bjs_Greeter_nameCount_get")
+public func _bjs_Greeter_nameCount_get(_ _self: UnsafeMutableRawPointer) -> Int32 {
     #if arch(wasm32)
-    let ret = roundTripUnsafeMutablePointer(v: UnsafeMutablePointer<UInt8>.bridgeJSLiftParameter(v))
+    let ret = Greeter.bridgeJSLiftParameter(_self).nameCount
     return ret.bridgeJSLowerReturn()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_roundTripJSObject")
-@_cdecl("bjs_roundTripJSObject")
-public func _bjs_roundTripJSObject(_ v: Int32) -> Int32 {
+@_expose(wasm, "bjs_Greeter_static_defaultGreeting_get")
+@_cdecl("bjs_Greeter_static_defaultGreeting_get")
+public func _bjs_Greeter_static_defaultGreeting_get() -> Void {
     #if arch(wasm32)
-    let ret = roundTripJSObject(v: JSObject.bridgeJSLiftParameter(v))
+    let ret = Greeter.defaultGreeting
     return ret.bridgeJSLowerReturn()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_roundTripDictionaryExport")
-@_cdecl("bjs_roundTripDictionaryExport")
-public func _bjs_roundTripDictionaryExport() -> Void {
+@_expose(wasm, "bjs_Greeter_deinit")
+@_cdecl("bjs_Greeter_deinit")
+public func _bjs_Greeter_deinit(_ pointer: UnsafeMutableRawPointer) -> Void {
     #if arch(wasm32)
-    let ret = roundTripDictionaryExport(v: [String: Int].bridgeJSLiftParameter())
-    return ret.bridgeJSLowerReturn()
+    Unmanaged<Greeter>.fromOpaque(pointer).release()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_roundTripOptionalDictionaryExport")
-@_cdecl("bjs_roundTripOptionalDictionaryExport")
-public func _bjs_roundTripOptionalDictionaryExport() -> Void {
-    #if arch(wasm32)
-    let ret = roundTripOptionalDictionaryExport(v: Optional<[String: String]>.bridgeJSLiftParameter())
-    return ret.bridgeJSLowerReturn()
-    #else
+extension Greeter: ConvertibleToJSValue, _BridgedSwiftHeapObject, _BridgedSwiftProtocolExportable {
+    public var jsValue: JSValue {
+        return .object(JSObject(id: UInt32(bitPattern: _bjs_Greeter_wrap(Unmanaged.passRetained(self).toOpaque()))))
+    }
+    public consuming func bridgeJSLowerAsProtocolReturn() -> Int32 {
+        _bjs_Greeter_wrap(Unmanaged.passRetained(self).toOpaque())
+    }
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_Greeter_wrap")
+fileprivate func _bjs_Greeter_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32
+#else
+fileprivate func _bjs_Greeter_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 {
     fatalError("Only available on WebAssembly")
-    #endif
+}
+#endif
+@inline(never) fileprivate func _bjs_Greeter_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 {
+    return _bjs_Greeter_wrap_extern(pointer)
 }
 
-@_expose(wasm, "bjs_roundTripJSValue")
-@_cdecl("bjs_roundTripJSValue")
-public func _bjs_roundTripJSValue(_ vKind: Int32, _ vPayload1: Int32, _ vPayload2: Float64) -> Void {
+@_expose(wasm, "bjs_Calculator_square")
+@_cdecl("bjs_Calculator_square")
+public func _bjs_Calculator_square(_ _self: UnsafeMutableRawPointer, _ value: Int32) -> Int32 {
     #if arch(wasm32)
-    let ret = roundTripJSValue(v: JSValue.bridgeJSLiftParameter(vKind, vPayload1, vPayload2))
+    let ret = Calculator.bridgeJSLiftParameter(_self).square(value: Int.bridgeJSLiftParameter(value))
     return ret.bridgeJSLowerReturn()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_roundTripOptionalJSValue")
-@_cdecl("bjs_roundTripOptionalJSValue")
-public func _bjs_roundTripOptionalJSValue(_ vIsSome: Int32, _ vKind: Int32, _ vPayload1: Int32, _ vPayload2: Float64) -> Void {
+@_expose(wasm, "bjs_Calculator_add")
+@_cdecl("bjs_Calculator_add")
+public func _bjs_Calculator_add(_ _self: UnsafeMutableRawPointer, _ a: Int32, _ b: Int32) -> Int32 {
     #if arch(wasm32)
-    let ret = roundTripOptionalJSValue(v: Optional<JSValue>.bridgeJSLiftParameter(vIsSome, vKind, vPayload1, vPayload2))
+    let ret = Calculator.bridgeJSLiftParameter(_self).add(a: Int.bridgeJSLiftParameter(a), b: Int.bridgeJSLiftParameter(b))
     return ret.bridgeJSLowerReturn()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_roundTripOptionalJSValueArray")
-@_cdecl("bjs_roundTripOptionalJSValueArray")
-public func _bjs_roundTripOptionalJSValueArray() -> Void {
+@_expose(wasm, "bjs_Calculator_asyncMakePoint")
+@_cdecl("bjs_Calculator_asyncMakePoint")
+public func _bjs_Calculator_asyncMakePoint(_ _self: UnsafeMutableRawPointer, _ x: Int32, _ y: Int32) -> Int32 {
     #if arch(wasm32)
-    let ret = roundTripOptionalJSValueArray(v: Optional<[JSValue]>.bridgeJSLiftParameter())
-    ret.bridgeJSStackPush()
+    return _bjs_makePromise(resolve: Promise_resolve_11PublicPointV, reject: Promise_reject) {
+        return await Calculator.bridgeJSLiftParameter(_self).asyncMakePoint(x: Int.bridgeJSLiftParameter(x), y: Int.bridgeJSLiftParameter(y))
+    }
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_makeImportedFoo")
-@_cdecl("bjs_makeImportedFoo")
-public func _bjs_makeImportedFoo(_ valueBytes: Int32, _ valueLength: Int32) -> Int32 {
+@_expose(wasm, "bjs_Calculator_deinit")
+@_cdecl("bjs_Calculator_deinit")
+public func _bjs_Calculator_deinit(_ pointer: UnsafeMutableRawPointer) -> Void {
     #if arch(wasm32)
-    do {
-        let ret = try makeImportedFoo(value: String.bridgeJSLiftParameter(valueBytes, valueLength))
-        return ret.bridgeJSLowerReturn()
-    } catch let error {
-        if let error = error.thrownValue.object {
-            withExtendedLifetime(error) {
-                _swift_js_throw(Int32(bitPattern: $0.id))
-            }
-        } else {
-            let jsError = JSError(message: String(describing: error))
-            withExtendedLifetime(jsError.jsObject) {
-                _swift_js_throw(Int32(bitPattern: $0.id))
-            }
-        }
-        return 0
-    }
+    Unmanaged<Calculator>.fromOpaque(pointer).release()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_throwsSwiftError")
-@_cdecl("bjs_throwsSwiftError")
-public func _bjs_throwsSwiftError(_ shouldThrow: Int32) -> Void {
-    #if arch(wasm32)
-    do {
-        try throwsSwiftError(shouldThrow: Bool.bridgeJSLiftParameter(shouldThrow))
-    } catch let error {
-        if let error = error.thrownValue.object {
-            withExtendedLifetime(error) {
-                _swift_js_throw(Int32(bitPattern: $0.id))
-            }
-        } else {
-            let jsError = JSError(message: String(describing: error))
-            withExtendedLifetime(jsError.jsObject) {
-                _swift_js_throw(Int32(bitPattern: $0.id))
-            }
-        }
-        return
+extension Calculator: ConvertibleToJSValue, _BridgedSwiftHeapObject, _BridgedSwiftProtocolExportable {
+    var jsValue: JSValue {
+        return .object(JSObject(id: UInt32(bitPattern: _bjs_Calculator_wrap(Unmanaged.passRetained(self).toOpaque()))))
     }
-    #else
+    consuming func bridgeJSLowerAsProtocolReturn() -> Int32 {
+        _bjs_Calculator_wrap(Unmanaged.passRetained(self).toOpaque())
+    }
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_Calculator_wrap")
+fileprivate func _bjs_Calculator_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32
+#else
+fileprivate func _bjs_Calculator_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 {
     fatalError("Only available on WebAssembly")
-    #endif
+}
+#endif
+@inline(never) fileprivate func _bjs_Calculator_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 {
+    return _bjs_Calculator_wrap_extern(pointer)
 }
 
-@_expose(wasm, "bjs_throwsWithIntResult")
-@_cdecl("bjs_throwsWithIntResult")
-public func _bjs_throwsWithIntResult() -> Int32 {
+@_expose(wasm, "bjs_InternalGreeter_deinit")
+@_cdecl("bjs_InternalGreeter_deinit")
+public func _bjs_InternalGreeter_deinit(_ pointer: UnsafeMutableRawPointer) -> Void {
     #if arch(wasm32)
-    do {
-        let ret = try throwsWithIntResult()
-        return ret.bridgeJSLowerReturn()
-    } catch let error {
-        if let error = error.thrownValue.object {
-            withExtendedLifetime(error) {
-                _swift_js_throw(Int32(bitPattern: $0.id))
-            }
-        } else {
-            let jsError = JSError(message: String(describing: error))
-            withExtendedLifetime(jsError.jsObject) {
-                _swift_js_throw(Int32(bitPattern: $0.id))
-            }
-        }
-        return 0
-    }
+    Unmanaged<InternalGreeter>.fromOpaque(pointer).release()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_throwsWithStringResult")
-@_cdecl("bjs_throwsWithStringResult")
-public func _bjs_throwsWithStringResult() -> Void {
-    #if arch(wasm32)
-    do {
-        let ret = try throwsWithStringResult()
-        return ret.bridgeJSLowerReturn()
-    } catch let error {
-        if let error = error.thrownValue.object {
-            withExtendedLifetime(error) {
-                _swift_js_throw(Int32(bitPattern: $0.id))
-            }
-        } else {
-            let jsError = JSError(message: String(describing: error))
-            withExtendedLifetime(jsError.jsObject) {
-                _swift_js_throw(Int32(bitPattern: $0.id))
-            }
-        }
-        return
+extension InternalGreeter: ConvertibleToJSValue, _BridgedSwiftHeapObject, _BridgedSwiftProtocolExportable {
+    internal var jsValue: JSValue {
+        return .object(JSObject(id: UInt32(bitPattern: _bjs_InternalGreeter_wrap(Unmanaged.passRetained(self).toOpaque()))))
     }
-    #else
+    internal consuming func bridgeJSLowerAsProtocolReturn() -> Int32 {
+        _bjs_InternalGreeter_wrap(Unmanaged.passRetained(self).toOpaque())
+    }
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_InternalGreeter_wrap")
+fileprivate func _bjs_InternalGreeter_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32
+#else
+fileprivate func _bjs_InternalGreeter_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 {
     fatalError("Only available on WebAssembly")
-    #endif
+}
+#endif
+@inline(never) fileprivate func _bjs_InternalGreeter_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 {
+    return _bjs_InternalGreeter_wrap_extern(pointer)
 }
 
-@_expose(wasm, "bjs_throwsWithBoolResult")
-@_cdecl("bjs_throwsWithBoolResult")
-public func _bjs_throwsWithBoolResult() -> Int32 {
+@_expose(wasm, "bjs_PublicGreeter_deinit")
+@_cdecl("bjs_PublicGreeter_deinit")
+public func _bjs_PublicGreeter_deinit(_ pointer: UnsafeMutableRawPointer) -> Void {
     #if arch(wasm32)
-    do {
-        let ret = try throwsWithBoolResult()
-        return ret.bridgeJSLowerReturn()
-    } catch let error {
-        if let error = error.thrownValue.object {
-            withExtendedLifetime(error) {
-                _swift_js_throw(Int32(bitPattern: $0.id))
-            }
-        } else {
-            let jsError = JSError(message: String(describing: error))
-            withExtendedLifetime(jsError.jsObject) {
-                _swift_js_throw(Int32(bitPattern: $0.id))
-            }
-        }
-        return 0
-    }
+    Unmanaged<PublicGreeter>.fromOpaque(pointer).release()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_throwsWithFloatResult")
-@_cdecl("bjs_throwsWithFloatResult")
-public func _bjs_throwsWithFloatResult() -> Float32 {
-    #if arch(wasm32)
-    do {
-        let ret = try throwsWithFloatResult()
-        return ret.bridgeJSLowerReturn()
-    } catch let error {
-        if let error = error.thrownValue.object {
-            withExtendedLifetime(error) {
-                _swift_js_throw(Int32(bitPattern: $0.id))
-            }
-        } else {
-            let jsError = JSError(message: String(describing: error))
-            withExtendedLifetime(jsError.jsObject) {
-                _swift_js_throw(Int32(bitPattern: $0.id))
-            }
-        }
-        return 0.0
+extension PublicGreeter: ConvertibleToJSValue, _BridgedSwiftHeapObject, _BridgedSwiftProtocolExportable {
+    public var jsValue: JSValue {
+        return .object(JSObject(id: UInt32(bitPattern: _bjs_PublicGreeter_wrap(Unmanaged.passRetained(self).toOpaque()))))
+    }
+    public consuming func bridgeJSLowerAsProtocolReturn() -> Int32 {
+        _bjs_PublicGreeter_wrap(Unmanaged.passRetained(self).toOpaque())
     }
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_PublicGreeter_wrap")
+fileprivate func _bjs_PublicGreeter_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32
+#else
+fileprivate func _bjs_PublicGreeter_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func _bjs_PublicGreeter_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 {
+    return _bjs_PublicGreeter_wrap_extern(pointer)
+}
+
+@_expose(wasm, "bjs_PackageGreeter_deinit")
+@_cdecl("bjs_PackageGreeter_deinit")
+public func _bjs_PackageGreeter_deinit(_ pointer: UnsafeMutableRawPointer) -> Void {
+    #if arch(wasm32)
+    Unmanaged<PackageGreeter>.fromOpaque(pointer).release()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_throwsWithDoubleResult")
-@_cdecl("bjs_throwsWithDoubleResult")
-public func _bjs_throwsWithDoubleResult() -> Float64 {
-    #if arch(wasm32)
-    do {
-        let ret = try throwsWithDoubleResult()
-        return ret.bridgeJSLowerReturn()
-    } catch let error {
-        if let error = error.thrownValue.object {
-            withExtendedLifetime(error) {
-                _swift_js_throw(Int32(bitPattern: $0.id))
-            }
-        } else {
-            let jsError = JSError(message: String(describing: error))
-            withExtendedLifetime(jsError.jsObject) {
-                _swift_js_throw(Int32(bitPattern: $0.id))
-            }
-        }
-        return 0.0
+extension PackageGreeter: ConvertibleToJSValue, _BridgedSwiftHeapObject, _BridgedSwiftProtocolExportable {
+    package var jsValue: JSValue {
+        return .object(JSObject(id: UInt32(bitPattern: _bjs_PackageGreeter_wrap(Unmanaged.passRetained(self).toOpaque()))))
     }
-    #else
+    package consuming func bridgeJSLowerAsProtocolReturn() -> Int32 {
+        _bjs_PackageGreeter_wrap(Unmanaged.passRetained(self).toOpaque())
+    }
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_PackageGreeter_wrap")
+fileprivate func _bjs_PackageGreeter_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32
+#else
+fileprivate func _bjs_PackageGreeter_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 {
     fatalError("Only available on WebAssembly")
-    #endif
+}
+#endif
+@inline(never) fileprivate func _bjs_PackageGreeter_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 {
+    return _bjs_PackageGreeter_wrap_extern(pointer)
 }
 
-@_expose(wasm, "bjs_throwsWithSwiftHeapObjectResult")
-@_cdecl("bjs_throwsWithSwiftHeapObjectResult")
-public func _bjs_throwsWithSwiftHeapObjectResult() -> UnsafeMutableRawPointer {
+@_expose(wasm, "bjs_Utils_Converter_init")
+@_cdecl("bjs_Utils_Converter_init")
+public func _bjs_Utils_Converter_init() -> UnsafeMutableRawPointer {
     #if arch(wasm32)
-    do {
-        let ret = try throwsWithSwiftHeapObjectResult()
-        return ret.bridgeJSLowerReturn()
-    } catch let error {
-        if let error = error.thrownValue.object {
-            withExtendedLifetime(error) {
-                _swift_js_throw(Int32(bitPattern: $0.id))
-            }
-        } else {
-            let jsError = JSError(message: String(describing: error))
-            withExtendedLifetime(jsError.jsObject) {
-                _swift_js_throw(Int32(bitPattern: $0.id))
-            }
-        }
-        return UnsafeMutableRawPointer(bitPattern: -1).unsafelyUnwrapped
-    }
+    let ret = Utils.Converter()
+    return ret.bridgeJSLowerReturn()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_throwsWithJSObjectResult")
-@_cdecl("bjs_throwsWithJSObjectResult")
-public func _bjs_throwsWithJSObjectResult() -> Int32 {
+@_expose(wasm, "bjs_Utils_Converter_toString")
+@_cdecl("bjs_Utils_Converter_toString")
+public func _bjs_Utils_Converter_toString(_ _self: UnsafeMutableRawPointer, _ value: Int32) -> Void {
     #if arch(wasm32)
-    do {
-        let ret = try throwsWithJSObjectResult()
-        return ret.bridgeJSLowerReturn()
-    } catch let error {
-        if let error = error.thrownValue.object {
-            withExtendedLifetime(error) {
-                _swift_js_throw(Int32(bitPattern: $0.id))
-            }
-        } else {
-            let jsError = JSError(message: String(describing: error))
-            withExtendedLifetime(jsError.jsObject) {
-                _swift_js_throw(Int32(bitPattern: $0.id))
-            }
-        }
-        return 0
-    }
+    let ret = Utils.Converter.bridgeJSLiftParameter(_self).toString(value: Int.bridgeJSLiftParameter(value))
+    return ret.bridgeJSLowerReturn()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_asyncRoundTripVoid")
-@_cdecl("bjs_asyncRoundTripVoid")
-public func _bjs_asyncRoundTripVoid() -> Int32 {
+@_expose(wasm, "bjs_Utils_Converter_precision_get")
+@_cdecl("bjs_Utils_Converter_precision_get")
+public func _bjs_Utils_Converter_precision_get(_ _self: UnsafeMutableRawPointer) -> Int32 {
     #if arch(wasm32)
-    let ret = JSPromise.async {
-        await asyncRoundTripVoid()
-    }.jsObject
+    let ret = Utils.Converter.bridgeJSLiftParameter(_self).precision
     return ret.bridgeJSLowerReturn()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_asyncRoundTripInt")
-@_cdecl("bjs_asyncRoundTripInt")
-public func _bjs_asyncRoundTripInt(_ v: Int32) -> Int32 {
+@_expose(wasm, "bjs_Utils_Converter_precision_set")
+@_cdecl("bjs_Utils_Converter_precision_set")
+public func _bjs_Utils_Converter_precision_set(_ _self: UnsafeMutableRawPointer, _ value: Int32) -> Void {
     #if arch(wasm32)
-    let ret = JSPromise.async {
-        return await asyncRoundTripInt(v: Int.bridgeJSLiftParameter(v)).jsValue
-    }.jsObject
-    return ret.bridgeJSLowerReturn()
+    Utils.Converter.bridgeJSLiftParameter(_self).precision = Int.bridgeJSLiftParameter(value)
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_asyncRoundTripFloat")
-@_cdecl("bjs_asyncRoundTripFloat")
-public func _bjs_asyncRoundTripFloat(_ v: Float32) -> Int32 {
+@_expose(wasm, "bjs_Utils_Converter_deinit")
+@_cdecl("bjs_Utils_Converter_deinit")
+public func _bjs_Utils_Converter_deinit(_ pointer: UnsafeMutableRawPointer) -> Void {
     #if arch(wasm32)
-    let ret = JSPromise.async {
-        return await asyncRoundTripFloat(v: Float.bridgeJSLiftParameter(v)).jsValue
-    }.jsObject
-    return ret.bridgeJSLowerReturn()
+    Unmanaged<Utils.Converter>.fromOpaque(pointer).release()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_asyncRoundTripDouble")
-@_cdecl("bjs_asyncRoundTripDouble")
-public func _bjs_asyncRoundTripDouble(_ v: Float64) -> Int32 {
+extension Utils.Converter: ConvertibleToJSValue, _BridgedSwiftHeapObject, _BridgedSwiftProtocolExportable {
+    var jsValue: JSValue {
+        return .object(JSObject(id: UInt32(bitPattern: _bjs_Utils_Converter_wrap(Unmanaged.passRetained(self).toOpaque()))))
+    }
+    consuming func bridgeJSLowerAsProtocolReturn() -> Int32 {
+        _bjs_Utils_Converter_wrap(Unmanaged.passRetained(self).toOpaque())
+    }
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_Utils_Converter_wrap")
+fileprivate func _bjs_Utils_Converter_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32
+#else
+fileprivate func _bjs_Utils_Converter_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func _bjs_Utils_Converter_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 {
+    return _bjs_Utils_Converter_wrap_extern(pointer)
+}
+
+@_expose(wasm, "bjs_Networking_API_HTTPServer_init")
+@_cdecl("bjs_Networking_API_HTTPServer_init")
+public func _bjs_Networking_API_HTTPServer_init() -> UnsafeMutableRawPointer {
     #if arch(wasm32)
-    let ret = JSPromise.async {
-        return await asyncRoundTripDouble(v: Double.bridgeJSLiftParameter(v)).jsValue
-    }.jsObject
+    let ret = Networking.API.HTTPServer()
     return ret.bridgeJSLowerReturn()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_asyncRoundTripBool")
-@_cdecl("bjs_asyncRoundTripBool")
-public func _bjs_asyncRoundTripBool(_ v: Int32) -> Int32 {
+@_expose(wasm, "bjs_Networking_API_HTTPServer_call")
+@_cdecl("bjs_Networking_API_HTTPServer_call")
+public func _bjs_Networking_API_HTTPServer_call(_ _self: UnsafeMutableRawPointer, _ method: Int32) -> Void {
     #if arch(wasm32)
-    let ret = JSPromise.async {
-        return await asyncRoundTripBool(v: Bool.bridgeJSLiftParameter(v)).jsValue
-    }.jsObject
-    return ret.bridgeJSLowerReturn()
+    Networking.API.HTTPServer.bridgeJSLiftParameter(_self).call(_: Networking.API.Method.bridgeJSLiftParameter(method))
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_asyncRoundTripString")
-@_cdecl("bjs_asyncRoundTripString")
-public func _bjs_asyncRoundTripString(_ vBytes: Int32, _ vLength: Int32) -> Int32 {
+@_expose(wasm, "bjs_Networking_API_HTTPServer_deinit")
+@_cdecl("bjs_Networking_API_HTTPServer_deinit")
+public func _bjs_Networking_API_HTTPServer_deinit(_ pointer: UnsafeMutableRawPointer) -> Void {
     #if arch(wasm32)
-    let ret = JSPromise.async {
-        return await asyncRoundTripString(v: String.bridgeJSLiftParameter(vBytes, vLength)).jsValue
-    }.jsObject
-    return ret.bridgeJSLowerReturn()
+    Unmanaged<Networking.API.HTTPServer>.fromOpaque(pointer).release()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_asyncRoundTripSwiftHeapObject")
-@_cdecl("bjs_asyncRoundTripSwiftHeapObject")
-public func _bjs_asyncRoundTripSwiftHeapObject(_ v: UnsafeMutableRawPointer) -> Int32 {
+extension Networking.API.HTTPServer: ConvertibleToJSValue, _BridgedSwiftHeapObject, _BridgedSwiftProtocolExportable {
+    var jsValue: JSValue {
+        return .object(JSObject(id: UInt32(bitPattern: _bjs_Networking_API_HTTPServer_wrap(Unmanaged.passRetained(self).toOpaque()))))
+    }
+    consuming func bridgeJSLowerAsProtocolReturn() -> Int32 {
+        _bjs_Networking_API_HTTPServer_wrap(Unmanaged.passRetained(self).toOpaque())
+    }
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_Networking_API_HTTPServer_wrap")
+fileprivate func _bjs_Networking_API_HTTPServer_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32
+#else
+fileprivate func _bjs_Networking_API_HTTPServer_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func _bjs_Networking_API_HTTPServer_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 {
+    return _bjs_Networking_API_HTTPServer_wrap_extern(pointer)
+}
+
+@_expose(wasm, "bjs___Swift_Foundation_UUID_init")
+@_cdecl("bjs___Swift_Foundation_UUID_init")
+public func _bjs___Swift_Foundation_UUID_init(_ valueBytes: Int32, _ valueLength: Int32) -> UnsafeMutableRawPointer {
     #if arch(wasm32)
-    let ret = JSPromise.async {
-        return await asyncRoundTripSwiftHeapObject(v: Greeter.bridgeJSLiftParameter(v)).jsValue
-    }.jsObject
+    let ret = UUID(value: String.bridgeJSLiftParameter(valueBytes, valueLength))
     return ret.bridgeJSLowerReturn()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_asyncRoundTripJSObject")
-@_cdecl("bjs_asyncRoundTripJSObject")
-public func _bjs_asyncRoundTripJSObject(_ v: Int32) -> Int32 {
+@_expose(wasm, "bjs___Swift_Foundation_UUID_uuidString")
+@_cdecl("bjs___Swift_Foundation_UUID_uuidString")
+public func _bjs___Swift_Foundation_UUID_uuidString(_ _self: UnsafeMutableRawPointer) -> Void {
     #if arch(wasm32)
-    let ret = JSPromise.async {
-        return await asyncRoundTripJSObject(v: JSObject.bridgeJSLiftParameter(v)).jsValue
-    }.jsObject
+    let ret = UUID.bridgeJSLiftParameter(_self).uuidString()
     return ret.bridgeJSLowerReturn()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_takeGreeter")
-@_cdecl("bjs_takeGreeter")
-public func _bjs_takeGreeter(_ g: UnsafeMutableRawPointer, _ nameBytes: Int32, _ nameLength: Int32) -> Void {
+@_expose(wasm, "bjs___Swift_Foundation_UUID_static_fromValue")
+@_cdecl("bjs___Swift_Foundation_UUID_static_fromValue")
+public func _bjs___Swift_Foundation_UUID_static_fromValue(_ valueBytes: Int32, _ valueLength: Int32) -> UnsafeMutableRawPointer {
     #if arch(wasm32)
-    takeGreeter(g: Greeter.bridgeJSLiftParameter(g), name: String.bridgeJSLiftParameter(nameBytes, nameLength))
+    let ret = UUID.fromValue(_: String.bridgeJSLiftParameter(valueBytes, valueLength))
+    return ret.bridgeJSLowerReturn()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_createCalculator")
-@_cdecl("bjs_createCalculator")
-public func _bjs_createCalculator() -> UnsafeMutableRawPointer {
+@_expose(wasm, "bjs___Swift_Foundation_UUID_static_placeholder_get")
+@_cdecl("bjs___Swift_Foundation_UUID_static_placeholder_get")
+public func _bjs___Swift_Foundation_UUID_static_placeholder_get() -> Void {
     #if arch(wasm32)
-    let ret = createCalculator()
+    let ret = UUID.placeholder
     return ret.bridgeJSLowerReturn()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_useCalculator")
-@_cdecl("bjs_useCalculator")
-public func _bjs_useCalculator(_ calc: UnsafeMutableRawPointer, _ x: Int32, _ y: Int32) -> Int32 {
+@_expose(wasm, "bjs___Swift_Foundation_UUID_deinit")
+@_cdecl("bjs___Swift_Foundation_UUID_deinit")
+public func _bjs___Swift_Foundation_UUID_deinit(_ pointer: UnsafeMutableRawPointer) -> Void {
     #if arch(wasm32)
-    let ret = useCalculator(calc: Calculator.bridgeJSLiftParameter(calc), x: Int.bridgeJSLiftParameter(x), y: Int.bridgeJSLiftParameter(y))
-    return ret.bridgeJSLowerReturn()
+    Unmanaged<UUID>.fromOpaque(pointer).release()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_testGreeterToJSValue")
-@_cdecl("bjs_testGreeterToJSValue")
-public func _bjs_testGreeterToJSValue() -> Int32 {
+extension UUID: ConvertibleToJSValue, _BridgedSwiftHeapObject, _BridgedSwiftProtocolExportable {
+    var jsValue: JSValue {
+        return .object(JSObject(id: UInt32(bitPattern: _bjs___Swift_Foundation_UUID_wrap(Unmanaged.passRetained(self).toOpaque()))))
+    }
+    consuming func bridgeJSLowerAsProtocolReturn() -> Int32 {
+        _bjs___Swift_Foundation_UUID_wrap(Unmanaged.passRetained(self).toOpaque())
+    }
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs___Swift_Foundation_UUID_wrap")
+fileprivate func _bjs___Swift_Foundation_UUID_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32
+#else
+fileprivate func _bjs___Swift_Foundation_UUID_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func _bjs___Swift_Foundation_UUID_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 {
+    return _bjs___Swift_Foundation_UUID_wrap_extern(pointer)
+}
+
+@_expose(wasm, "bjs_Networking_APIV2_Internal_TestServer_init")
+@_cdecl("bjs_Networking_APIV2_Internal_TestServer_init")
+public func _bjs_Networking_APIV2_Internal_TestServer_init() -> UnsafeMutableRawPointer {
     #if arch(wasm32)
-    let ret = testGreeterToJSValue()
+    let ret = Internal.TestServer()
     return ret.bridgeJSLowerReturn()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_testCalculatorToJSValue")
-@_cdecl("bjs_testCalculatorToJSValue")
-public func _bjs_testCalculatorToJSValue() -> Int32 {
+@_expose(wasm, "bjs_Networking_APIV2_Internal_TestServer_call")
+@_cdecl("bjs_Networking_APIV2_Internal_TestServer_call")
+public func _bjs_Networking_APIV2_Internal_TestServer_call(_ _self: UnsafeMutableRawPointer, _ method: Int32) -> Void {
     #if arch(wasm32)
-    let ret = testCalculatorToJSValue()
-    return ret.bridgeJSLowerReturn()
+    Internal.TestServer.bridgeJSLiftParameter(_self).call(_: Internal.SupportedMethod.bridgeJSLiftParameter(method))
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_testSwiftClassAsJSValue")
-@_cdecl("bjs_testSwiftClassAsJSValue")
-public func _bjs_testSwiftClassAsJSValue(_ greeter: UnsafeMutableRawPointer) -> Int32 {
+@_expose(wasm, "bjs_Networking_APIV2_Internal_TestServer_deinit")
+@_cdecl("bjs_Networking_APIV2_Internal_TestServer_deinit")
+public func _bjs_Networking_APIV2_Internal_TestServer_deinit(_ pointer: UnsafeMutableRawPointer) -> Void {
     #if arch(wasm32)
-    let ret = testSwiftClassAsJSValue(greeter: Greeter.bridgeJSLiftParameter(greeter))
-    return ret.bridgeJSLowerReturn()
+    Unmanaged<Internal.TestServer>.fromOpaque(pointer).release()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_setDirection")
-@_cdecl("bjs_setDirection")
-public func _bjs_setDirection(_ direction: Int32) -> Int32 {
-    #if arch(wasm32)
-    let ret = setDirection(_: Direction.bridgeJSLiftParameter(direction))
-    return ret.bridgeJSLowerReturn()
-    #else
+extension Internal.TestServer: ConvertibleToJSValue, _BridgedSwiftHeapObject, _BridgedSwiftProtocolExportable {
+    var jsValue: JSValue {
+        return .object(JSObject(id: UInt32(bitPattern: _bjs_Networking_APIV2_Internal_TestServer_wrap(Unmanaged.passRetained(self).toOpaque()))))
+    }
+    consuming func bridgeJSLowerAsProtocolReturn() -> Int32 {
+        _bjs_Networking_APIV2_Internal_TestServer_wrap(Unmanaged.passRetained(self).toOpaque())
+    }
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_Networking_APIV2_Internal_TestServer_wrap")
+fileprivate func _bjs_Networking_APIV2_Internal_TestServer_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32
+#else
+fileprivate func _bjs_Networking_APIV2_Internal_TestServer_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 {
     fatalError("Only available on WebAssembly")
-    #endif
+}
+#endif
+@inline(never) fileprivate func _bjs_Networking_APIV2_Internal_TestServer_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 {
+    return _bjs_Networking_APIV2_Internal_TestServer_wrap_extern(pointer)
 }
 
-@_expose(wasm, "bjs_getDirection")
-@_cdecl("bjs_getDirection")
-public func _bjs_getDirection() -> Int32 {
+@_expose(wasm, "bjs_SimplePropertyHolder_init")
+@_cdecl("bjs_SimplePropertyHolder_init")
+public func _bjs_SimplePropertyHolder_init(_ value: Int32) -> UnsafeMutableRawPointer {
     #if arch(wasm32)
-    let ret = getDirection()
+    let ret = SimplePropertyHolder(value: Int.bridgeJSLiftParameter(value))
     return ret.bridgeJSLowerReturn()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_processDirection")
-@_cdecl("bjs_processDirection")
-public func _bjs_processDirection(_ input: Int32) -> Int32 {
+@_expose(wasm, "bjs_SimplePropertyHolder_value_get")
+@_cdecl("bjs_SimplePropertyHolder_value_get")
+public func _bjs_SimplePropertyHolder_value_get(_ _self: UnsafeMutableRawPointer) -> Int32 {
     #if arch(wasm32)
-    let ret = processDirection(_: Direction.bridgeJSLiftParameter(input))
+    let ret = SimplePropertyHolder.bridgeJSLiftParameter(_self).value
     return ret.bridgeJSLowerReturn()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_setTheme")
-@_cdecl("bjs_setTheme")
-public func _bjs_setTheme(_ themeBytes: Int32, _ themeLength: Int32) -> Void {
+@_expose(wasm, "bjs_SimplePropertyHolder_value_set")
+@_cdecl("bjs_SimplePropertyHolder_value_set")
+public func _bjs_SimplePropertyHolder_value_set(_ _self: UnsafeMutableRawPointer, _ value: Int32) -> Void {
     #if arch(wasm32)
-    let ret = setTheme(_: Theme.bridgeJSLiftParameter(themeBytes, themeLength))
-    return ret.bridgeJSLowerReturn()
+    SimplePropertyHolder.bridgeJSLiftParameter(_self).value = Int.bridgeJSLiftParameter(value)
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_getTheme")
-@_cdecl("bjs_getTheme")
-public func _bjs_getTheme() -> Void {
+@_expose(wasm, "bjs_SimplePropertyHolder_deinit")
+@_cdecl("bjs_SimplePropertyHolder_deinit")
+public func _bjs_SimplePropertyHolder_deinit(_ pointer: UnsafeMutableRawPointer) -> Void {
     #if arch(wasm32)
-    let ret = getTheme()
-    return ret.bridgeJSLowerReturn()
+    Unmanaged<SimplePropertyHolder>.fromOpaque(pointer).release()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_setHttpStatus")
-@_cdecl("bjs_setHttpStatus")
-public func _bjs_setHttpStatus(_ status: Int32) -> Int32 {
+extension SimplePropertyHolder: ConvertibleToJSValue, _BridgedSwiftHeapObject, _BridgedSwiftProtocolExportable {
+    var jsValue: JSValue {
+        return .object(JSObject(id: UInt32(bitPattern: _bjs_SimplePropertyHolder_wrap(Unmanaged.passRetained(self).toOpaque()))))
+    }
+    consuming func bridgeJSLowerAsProtocolReturn() -> Int32 {
+        _bjs_SimplePropertyHolder_wrap(Unmanaged.passRetained(self).toOpaque())
+    }
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_SimplePropertyHolder_wrap")
+fileprivate func _bjs_SimplePropertyHolder_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32
+#else
+fileprivate func _bjs_SimplePropertyHolder_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func _bjs_SimplePropertyHolder_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 {
+    return _bjs_SimplePropertyHolder_wrap_extern(pointer)
+}
+
+@_expose(wasm, "bjs_PropertyHolder_init")
+@_cdecl("bjs_PropertyHolder_init")
+public func _bjs_PropertyHolder_init(_ intValue: Int32, _ floatValue: Float32, _ doubleValue: Float64, _ boolValue: Int32, _ stringValueBytes: Int32, _ stringValueLength: Int32, _ jsObject: Int32, _ sibling: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer {
     #if arch(wasm32)
-    let ret = setHttpStatus(_: HttpStatus.bridgeJSLiftParameter(status))
+    let ret = PropertyHolder(intValue: Int.bridgeJSLiftParameter(intValue), floatValue: Float.bridgeJSLiftParameter(floatValue), doubleValue: Double.bridgeJSLiftParameter(doubleValue), boolValue: Bool.bridgeJSLiftParameter(boolValue), stringValue: String.bridgeJSLiftParameter(stringValueBytes, stringValueLength), jsObject: JSObject.bridgeJSLiftParameter(jsObject), sibling: SimplePropertyHolder.bridgeJSLiftParameter(sibling))
     return ret.bridgeJSLowerReturn()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_getHttpStatus")
-@_cdecl("bjs_getHttpStatus")
-public func _bjs_getHttpStatus() -> Int32 {
+@_expose(wasm, "bjs_PropertyHolder_getAllValues")
+@_cdecl("bjs_PropertyHolder_getAllValues")
+public func _bjs_PropertyHolder_getAllValues(_ _self: UnsafeMutableRawPointer) -> Void {
     #if arch(wasm32)
-    let ret = getHttpStatus()
+    let ret = PropertyHolder.bridgeJSLiftParameter(_self).getAllValues()
     return ret.bridgeJSLowerReturn()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_setFileSize")
-@_cdecl("bjs_setFileSize")
-public func _bjs_setFileSize(_ size: Int64) -> Int64 {
+@_expose(wasm, "bjs_PropertyHolder_intValue_get")
+@_cdecl("bjs_PropertyHolder_intValue_get")
+public func _bjs_PropertyHolder_intValue_get(_ _self: UnsafeMutableRawPointer) -> Int32 {
     #if arch(wasm32)
-    let ret = setFileSize(_: FileSize.bridgeJSLiftParameter(size))
+    let ret = PropertyHolder.bridgeJSLiftParameter(_self).intValue
     return ret.bridgeJSLowerReturn()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_getFileSize")
-@_cdecl("bjs_getFileSize")
-public func _bjs_getFileSize() -> Int64 {
+@_expose(wasm, "bjs_PropertyHolder_intValue_set")
+@_cdecl("bjs_PropertyHolder_intValue_set")
+public func _bjs_PropertyHolder_intValue_set(_ _self: UnsafeMutableRawPointer, _ value: Int32) -> Void {
     #if arch(wasm32)
-    let ret = getFileSize()
-    return ret.bridgeJSLowerReturn()
+    PropertyHolder.bridgeJSLiftParameter(_self).intValue = Int.bridgeJSLiftParameter(value)
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_setSessionId")
-@_cdecl("bjs_setSessionId")
-public func _bjs_setSessionId(_ session: Int64) -> Int64 {
+@_expose(wasm, "bjs_PropertyHolder_floatValue_get")
+@_cdecl("bjs_PropertyHolder_floatValue_get")
+public func _bjs_PropertyHolder_floatValue_get(_ _self: UnsafeMutableRawPointer) -> Float32 {
     #if arch(wasm32)
-    let ret = setSessionId(_: SessionId.bridgeJSLiftParameter(session))
+    let ret = PropertyHolder.bridgeJSLiftParameter(_self).floatValue
     return ret.bridgeJSLowerReturn()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_getSessionId")
-@_cdecl("bjs_getSessionId")
-public func _bjs_getSessionId() -> Int64 {
+@_expose(wasm, "bjs_PropertyHolder_floatValue_set")
+@_cdecl("bjs_PropertyHolder_floatValue_set")
+public func _bjs_PropertyHolder_floatValue_set(_ _self: UnsafeMutableRawPointer, _ value: Float32) -> Void {
     #if arch(wasm32)
-    let ret = getSessionId()
-    return ret.bridgeJSLowerReturn()
+    PropertyHolder.bridgeJSLiftParameter(_self).floatValue = Float.bridgeJSLiftParameter(value)
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_processTheme")
-@_cdecl("bjs_processTheme")
-public func _bjs_processTheme(_ themeBytes: Int32, _ themeLength: Int32) -> Int32 {
+@_expose(wasm, "bjs_PropertyHolder_doubleValue_get")
+@_cdecl("bjs_PropertyHolder_doubleValue_get")
+public func _bjs_PropertyHolder_doubleValue_get(_ _self: UnsafeMutableRawPointer) -> Float64 {
     #if arch(wasm32)
-    let ret = processTheme(_: Theme.bridgeJSLiftParameter(themeBytes, themeLength))
+    let ret = PropertyHolder.bridgeJSLiftParameter(_self).doubleValue
     return ret.bridgeJSLowerReturn()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_setTSDirection")
-@_cdecl("bjs_setTSDirection")
-public func _bjs_setTSDirection(_ direction: Int32) -> Int32 {
+@_expose(wasm, "bjs_PropertyHolder_doubleValue_set")
+@_cdecl("bjs_PropertyHolder_doubleValue_set")
+public func _bjs_PropertyHolder_doubleValue_set(_ _self: UnsafeMutableRawPointer, _ value: Float64) -> Void {
     #if arch(wasm32)
-    let ret = setTSDirection(_: TSDirection.bridgeJSLiftParameter(direction))
-    return ret.bridgeJSLowerReturn()
+    PropertyHolder.bridgeJSLiftParameter(_self).doubleValue = Double.bridgeJSLiftParameter(value)
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_getTSDirection")
-@_cdecl("bjs_getTSDirection")
-public func _bjs_getTSDirection() -> Int32 {
+@_expose(wasm, "bjs_PropertyHolder_boolValue_get")
+@_cdecl("bjs_PropertyHolder_boolValue_get")
+public func _bjs_PropertyHolder_boolValue_get(_ _self: UnsafeMutableRawPointer) -> Int32 {
     #if arch(wasm32)
-    let ret = getTSDirection()
+    let ret = PropertyHolder.bridgeJSLiftParameter(_self).boolValue
     return ret.bridgeJSLowerReturn()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_setTSTheme")
-@_cdecl("bjs_setTSTheme")
-public func _bjs_setTSTheme(_ themeBytes: Int32, _ themeLength: Int32) -> Void {
+@_expose(wasm, "bjs_PropertyHolder_boolValue_set")
+@_cdecl("bjs_PropertyHolder_boolValue_set")
+public func _bjs_PropertyHolder_boolValue_set(_ _self: UnsafeMutableRawPointer, _ value: Int32) -> Void {
     #if arch(wasm32)
-    let ret = setTSTheme(_: TSTheme.bridgeJSLiftParameter(themeBytes, themeLength))
-    return ret.bridgeJSLowerReturn()
+    PropertyHolder.bridgeJSLiftParameter(_self).boolValue = Bool.bridgeJSLiftParameter(value)
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_getTSTheme")
-@_cdecl("bjs_getTSTheme")
-public func _bjs_getTSTheme() -> Void {
+@_expose(wasm, "bjs_PropertyHolder_stringValue_get")
+@_cdecl("bjs_PropertyHolder_stringValue_get")
+public func _bjs_PropertyHolder_stringValue_get(_ _self: UnsafeMutableRawPointer) -> Void {
     #if arch(wasm32)
-    let ret = getTSTheme()
+    let ret = PropertyHolder.bridgeJSLiftParameter(_self).stringValue
     return ret.bridgeJSLowerReturn()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_createConverter")
-@_cdecl("bjs_createConverter")
-public func _bjs_createConverter() -> UnsafeMutableRawPointer {
+@_expose(wasm, "bjs_PropertyHolder_stringValue_set")
+@_cdecl("bjs_PropertyHolder_stringValue_set")
+public func _bjs_PropertyHolder_stringValue_set(_ _self: UnsafeMutableRawPointer, _ valueBytes: Int32, _ valueLength: Int32) -> Void {
     #if arch(wasm32)
-    let ret = createConverter()
-    return ret.bridgeJSLowerReturn()
+    PropertyHolder.bridgeJSLiftParameter(_self).stringValue = String.bridgeJSLiftParameter(valueBytes, valueLength)
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_useConverter")
-@_cdecl("bjs_useConverter")
-public func _bjs_useConverter(_ converter: UnsafeMutableRawPointer, _ value: Int32) -> Void {
+@_expose(wasm, "bjs_PropertyHolder_readonlyInt_get")
+@_cdecl("bjs_PropertyHolder_readonlyInt_get")
+public func _bjs_PropertyHolder_readonlyInt_get(_ _self: UnsafeMutableRawPointer) -> Int32 {
     #if arch(wasm32)
-    let ret = useConverter(converter: Utils.Converter.bridgeJSLiftParameter(converter), value: Int.bridgeJSLiftParameter(value))
+    let ret = PropertyHolder.bridgeJSLiftParameter(_self).readonlyInt
     return ret.bridgeJSLowerReturn()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_roundTripConverterArray")
-@_cdecl("bjs_roundTripConverterArray")
-public func _bjs_roundTripConverterArray() -> Void {
+@_expose(wasm, "bjs_PropertyHolder_readonlyFloat_get")
+@_cdecl("bjs_PropertyHolder_readonlyFloat_get")
+public func _bjs_PropertyHolder_readonlyFloat_get(_ _self: UnsafeMutableRawPointer) -> Float32 {
     #if arch(wasm32)
-    let ret = roundTripConverterArray(_: [Utils.Converter].bridgeJSStackPop())
-    ret.bridgeJSStackPush()
+    let ret = PropertyHolder.bridgeJSLiftParameter(_self).readonlyFloat
+    return ret.bridgeJSLowerReturn()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_createHTTPServer")
-@_cdecl("bjs_createHTTPServer")
-public func _bjs_createHTTPServer() -> UnsafeMutableRawPointer {
+@_expose(wasm, "bjs_PropertyHolder_readonlyDouble_get")
+@_cdecl("bjs_PropertyHolder_readonlyDouble_get")
+public func _bjs_PropertyHolder_readonlyDouble_get(_ _self: UnsafeMutableRawPointer) -> Float64 {
     #if arch(wasm32)
-    let ret = createHTTPServer()
+    let ret = PropertyHolder.bridgeJSLiftParameter(_self).readonlyDouble
     return ret.bridgeJSLowerReturn()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_createUUID")
-@_cdecl("bjs_createUUID")
-public func _bjs_createUUID(_ valueBytes: Int32, _ valueLength: Int32) -> UnsafeMutableRawPointer {
+@_expose(wasm, "bjs_PropertyHolder_readonlyBool_get")
+@_cdecl("bjs_PropertyHolder_readonlyBool_get")
+public func _bjs_PropertyHolder_readonlyBool_get(_ _self: UnsafeMutableRawPointer) -> Int32 {
     #if arch(wasm32)
-    let ret = createUUID(value: String.bridgeJSLiftParameter(valueBytes, valueLength))
+    let ret = PropertyHolder.bridgeJSLiftParameter(_self).readonlyBool
     return ret.bridgeJSLowerReturn()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_roundTripUUID")
-@_cdecl("bjs_roundTripUUID")
-public func _bjs_roundTripUUID(_ uuid: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer {
+@_expose(wasm, "bjs_PropertyHolder_readonlyString_get")
+@_cdecl("bjs_PropertyHolder_readonlyString_get")
+public func _bjs_PropertyHolder_readonlyString_get(_ _self: UnsafeMutableRawPointer) -> Void {
     #if arch(wasm32)
-    let ret = roundTripUUID(_: UUID.bridgeJSLiftParameter(uuid))
+    let ret = PropertyHolder.bridgeJSLiftParameter(_self).readonlyString
     return ret.bridgeJSLowerReturn()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_roundtripNetworkingAPIMethod")
-@_cdecl("bjs_roundtripNetworkingAPIMethod")
-public func _bjs_roundtripNetworkingAPIMethod(_ method: Int32) -> Int32 {
+@_expose(wasm, "bjs_PropertyHolder_jsObject_get")
+@_cdecl("bjs_PropertyHolder_jsObject_get")
+public func _bjs_PropertyHolder_jsObject_get(_ _self: UnsafeMutableRawPointer) -> Int32 {
     #if arch(wasm32)
-    let ret = roundtripNetworkingAPIMethod(_: Networking.API.Method.bridgeJSLiftParameter(method))
+    let ret = PropertyHolder.bridgeJSLiftParameter(_self).jsObject
     return ret.bridgeJSLowerReturn()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_roundtripConfigurationLogLevel")
-@_cdecl("bjs_roundtripConfigurationLogLevel")
-public func _bjs_roundtripConfigurationLogLevel(_ levelBytes: Int32, _ levelLength: Int32) -> Void {
+@_expose(wasm, "bjs_PropertyHolder_jsObject_set")
+@_cdecl("bjs_PropertyHolder_jsObject_set")
+public func _bjs_PropertyHolder_jsObject_set(_ _self: UnsafeMutableRawPointer, _ value: Int32) -> Void {
     #if arch(wasm32)
-    let ret = roundtripConfigurationLogLevel(_: Configuration.LogLevel.bridgeJSLiftParameter(levelBytes, levelLength))
-    return ret.bridgeJSLowerReturn()
+    PropertyHolder.bridgeJSLiftParameter(_self).jsObject = JSObject.bridgeJSLiftParameter(value)
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_roundtripConfigurationPort")
-@_cdecl("bjs_roundtripConfigurationPort")
-public func _bjs_roundtripConfigurationPort(_ port: Int32) -> Int32 {
+@_expose(wasm, "bjs_PropertyHolder_sibling_get")
+@_cdecl("bjs_PropertyHolder_sibling_get")
+public func _bjs_PropertyHolder_sibling_get(_ _self: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer {
     #if arch(wasm32)
-    let ret = roundtripConfigurationPort(_: Configuration.Port.bridgeJSLiftParameter(port))
+    let ret = PropertyHolder.bridgeJSLiftParameter(_self).sibling
     return ret.bridgeJSLowerReturn()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_processConfigurationLogLevel")
-@_cdecl("bjs_processConfigurationLogLevel")
-public func _bjs_processConfigurationLogLevel(_ levelBytes: Int32, _ levelLength: Int32) -> Int32 {
+@_expose(wasm, "bjs_PropertyHolder_sibling_set")
+@_cdecl("bjs_PropertyHolder_sibling_set")
+public func _bjs_PropertyHolder_sibling_set(_ _self: UnsafeMutableRawPointer, _ value: UnsafeMutableRawPointer) -> Void {
     #if arch(wasm32)
-    let ret = processConfigurationLogLevel(_: Configuration.LogLevel.bridgeJSLiftParameter(levelBytes, levelLength))
-    return ret.bridgeJSLowerReturn()
+    PropertyHolder.bridgeJSLiftParameter(_self).sibling = SimplePropertyHolder.bridgeJSLiftParameter(value)
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_roundtripInternalSupportedMethod")
-@_cdecl("bjs_roundtripInternalSupportedMethod")
-public func _bjs_roundtripInternalSupportedMethod(_ method: Int32) -> Int32 {
+@_expose(wasm, "bjs_PropertyHolder_lazyValue_get")
+@_cdecl("bjs_PropertyHolder_lazyValue_get")
+public func _bjs_PropertyHolder_lazyValue_get(_ _self: UnsafeMutableRawPointer) -> Void {
     #if arch(wasm32)
-    let ret = roundtripInternalSupportedMethod(_: Internal.SupportedMethod.bridgeJSLiftParameter(method))
+    let ret = PropertyHolder.bridgeJSLiftParameter(_self).lazyValue
     return ret.bridgeJSLowerReturn()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_roundtripAPIResult")
-@_cdecl("bjs_roundtripAPIResult")
-public func _bjs_roundtripAPIResult(_ result: Int32) -> Void {
+@_expose(wasm, "bjs_PropertyHolder_lazyValue_set")
+@_cdecl("bjs_PropertyHolder_lazyValue_set")
+public func _bjs_PropertyHolder_lazyValue_set(_ _self: UnsafeMutableRawPointer, _ valueBytes: Int32, _ valueLength: Int32) -> Void {
     #if arch(wasm32)
-    let ret = roundtripAPIResult(result: APIResult.bridgeJSLiftParameter(result))
-    return ret.bridgeJSLowerReturn()
+    PropertyHolder.bridgeJSLiftParameter(_self).lazyValue = String.bridgeJSLiftParameter(valueBytes, valueLength)
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_makeAPIResultSuccess")
-@_cdecl("bjs_makeAPIResultSuccess")
-public func _bjs_makeAPIResultSuccess(_ valueBytes: Int32, _ valueLength: Int32) -> Void {
+@_expose(wasm, "bjs_PropertyHolder_computedReadonly_get")
+@_cdecl("bjs_PropertyHolder_computedReadonly_get")
+public func _bjs_PropertyHolder_computedReadonly_get(_ _self: UnsafeMutableRawPointer) -> Int32 {
     #if arch(wasm32)
-    let ret = makeAPIResultSuccess(_: String.bridgeJSLiftParameter(valueBytes, valueLength))
+    let ret = PropertyHolder.bridgeJSLiftParameter(_self).computedReadonly
     return ret.bridgeJSLowerReturn()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_makeAPIResultFailure")
-@_cdecl("bjs_makeAPIResultFailure")
-public func _bjs_makeAPIResultFailure(_ value: Int32) -> Void {
+@_expose(wasm, "bjs_PropertyHolder_computedReadWrite_get")
+@_cdecl("bjs_PropertyHolder_computedReadWrite_get")
+public func _bjs_PropertyHolder_computedReadWrite_get(_ _self: UnsafeMutableRawPointer) -> Void {
     #if arch(wasm32)
-    let ret = makeAPIResultFailure(_: Int.bridgeJSLiftParameter(value))
+    let ret = PropertyHolder.bridgeJSLiftParameter(_self).computedReadWrite
     return ret.bridgeJSLowerReturn()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_makeAPIResultInfo")
-@_cdecl("bjs_makeAPIResultInfo")
-public func _bjs_makeAPIResultInfo() -> Void {
+@_expose(wasm, "bjs_PropertyHolder_computedReadWrite_set")
+@_cdecl("bjs_PropertyHolder_computedReadWrite_set")
+public func _bjs_PropertyHolder_computedReadWrite_set(_ _self: UnsafeMutableRawPointer, _ valueBytes: Int32, _ valueLength: Int32) -> Void {
     #if arch(wasm32)
-    let ret = makeAPIResultInfo()
-    return ret.bridgeJSLowerReturn()
+    PropertyHolder.bridgeJSLiftParameter(_self).computedReadWrite = String.bridgeJSLiftParameter(valueBytes, valueLength)
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_makeAPIResultFlag")
-@_cdecl("bjs_makeAPIResultFlag")
-public func _bjs_makeAPIResultFlag(_ value: Int32) -> Void {
+@_expose(wasm, "bjs_PropertyHolder_observedProperty_get")
+@_cdecl("bjs_PropertyHolder_observedProperty_get")
+public func _bjs_PropertyHolder_observedProperty_get(_ _self: UnsafeMutableRawPointer) -> Int32 {
     #if arch(wasm32)
-    let ret = makeAPIResultFlag(_: Bool.bridgeJSLiftParameter(value))
+    let ret = PropertyHolder.bridgeJSLiftParameter(_self).observedProperty
     return ret.bridgeJSLowerReturn()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_makeAPIResultRate")
-@_cdecl("bjs_makeAPIResultRate")
-public func _bjs_makeAPIResultRate(_ value: Float32) -> Void {
+@_expose(wasm, "bjs_PropertyHolder_observedProperty_set")
+@_cdecl("bjs_PropertyHolder_observedProperty_set")
+public func _bjs_PropertyHolder_observedProperty_set(_ _self: UnsafeMutableRawPointer, _ value: Int32) -> Void {
     #if arch(wasm32)
-    let ret = makeAPIResultRate(_: Float.bridgeJSLiftParameter(value))
-    return ret.bridgeJSLowerReturn()
+    PropertyHolder.bridgeJSLiftParameter(_self).observedProperty = Int.bridgeJSLiftParameter(value)
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_makeAPIResultPrecise")
-@_cdecl("bjs_makeAPIResultPrecise")
-public func _bjs_makeAPIResultPrecise(_ value: Float64) -> Void {
+@_expose(wasm, "bjs_PropertyHolder_deinit")
+@_cdecl("bjs_PropertyHolder_deinit")
+public func _bjs_PropertyHolder_deinit(_ pointer: UnsafeMutableRawPointer) -> Void {
     #if arch(wasm32)
-    let ret = makeAPIResultPrecise(_: Double.bridgeJSLiftParameter(value))
-    return ret.bridgeJSLowerReturn()
+    Unmanaged<PropertyHolder>.fromOpaque(pointer).release()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_roundtripComplexResult")
-@_cdecl("bjs_roundtripComplexResult")
-public func _bjs_roundtripComplexResult(_ result: Int32) -> Void {
+extension PropertyHolder: ConvertibleToJSValue, _BridgedSwiftHeapObject, _BridgedSwiftProtocolExportable {
+    var jsValue: JSValue {
+        return .object(JSObject(id: UInt32(bitPattern: _bjs_PropertyHolder_wrap(Unmanaged.passRetained(self).toOpaque()))))
+    }
+    consuming func bridgeJSLowerAsProtocolReturn() -> Int32 {
+        _bjs_PropertyHolder_wrap(Unmanaged.passRetained(self).toOpaque())
+    }
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_PropertyHolder_wrap")
+fileprivate func _bjs_PropertyHolder_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32
+#else
+fileprivate func _bjs_PropertyHolder_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func _bjs_PropertyHolder_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 {
+    return _bjs_PropertyHolder_wrap_extern(pointer)
+}
+
+@_expose(wasm, "bjs_MathUtils_static_add")
+@_cdecl("bjs_MathUtils_static_add")
+public func _bjs_MathUtils_static_add(_ a: Int32, _ b: Int32) -> Int32 {
     #if arch(wasm32)
-    let ret = roundtripComplexResult(_: ComplexResult.bridgeJSLiftParameter(result))
+    let ret = MathUtils.add(a: Int.bridgeJSLiftParameter(a), b: Int.bridgeJSLiftParameter(b))
     return ret.bridgeJSLowerReturn()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_makeComplexResultSuccess")
-@_cdecl("bjs_makeComplexResultSuccess")
-public func _bjs_makeComplexResultSuccess(_ valueBytes: Int32, _ valueLength: Int32) -> Void {
+@_expose(wasm, "bjs_MathUtils_static_substract")
+@_cdecl("bjs_MathUtils_static_substract")
+public func _bjs_MathUtils_static_substract(_ a: Int32, _ b: Int32) -> Int32 {
     #if arch(wasm32)
-    let ret = makeComplexResultSuccess(_: String.bridgeJSLiftParameter(valueBytes, valueLength))
+    let ret = MathUtils.substract(a: Int.bridgeJSLiftParameter(a), b: Int.bridgeJSLiftParameter(b))
     return ret.bridgeJSLowerReturn()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_makeComplexResultError")
-@_cdecl("bjs_makeComplexResultError")
-public func _bjs_makeComplexResultError(_ messageBytes: Int32, _ messageLength: Int32, _ code: Int32) -> Void {
+@_expose(wasm, "bjs_MathUtils_deinit")
+@_cdecl("bjs_MathUtils_deinit")
+public func _bjs_MathUtils_deinit(_ pointer: UnsafeMutableRawPointer) -> Void {
     #if arch(wasm32)
-    let ret = makeComplexResultError(_: String.bridgeJSLiftParameter(messageBytes, messageLength), _: Int.bridgeJSLiftParameter(code))
-    return ret.bridgeJSLowerReturn()
+    Unmanaged<MathUtils>.fromOpaque(pointer).release()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_makeComplexResultLocation")
-@_cdecl("bjs_makeComplexResultLocation")
-public func _bjs_makeComplexResultLocation(_ lat: Float64, _ lng: Float64, _ nameBytes: Int32, _ nameLength: Int32) -> Void {
+extension MathUtils: ConvertibleToJSValue, _BridgedSwiftHeapObject, _BridgedSwiftProtocolExportable {
+    var jsValue: JSValue {
+        return .object(JSObject(id: UInt32(bitPattern: _bjs_MathUtils_wrap(Unmanaged.passRetained(self).toOpaque()))))
+    }
+    consuming func bridgeJSLowerAsProtocolReturn() -> Int32 {
+        _bjs_MathUtils_wrap(Unmanaged.passRetained(self).toOpaque())
+    }
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_MathUtils_wrap")
+fileprivate func _bjs_MathUtils_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32
+#else
+fileprivate func _bjs_MathUtils_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func _bjs_MathUtils_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 {
+    return _bjs_MathUtils_wrap_extern(pointer)
+}
+
+@_expose(wasm, "bjs_StaticPropertyHolder_init")
+@_cdecl("bjs_StaticPropertyHolder_init")
+public func _bjs_StaticPropertyHolder_init() -> UnsafeMutableRawPointer {
     #if arch(wasm32)
-    let ret = makeComplexResultLocation(_: Double.bridgeJSLiftParameter(lat), _: Double.bridgeJSLiftParameter(lng), _: String.bridgeJSLiftParameter(nameBytes, nameLength))
+    let ret = StaticPropertyHolder()
     return ret.bridgeJSLowerReturn()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_makeComplexResultStatus")
-@_cdecl("bjs_makeComplexResultStatus")
-public func _bjs_makeComplexResultStatus(_ active: Int32, _ code: Int32, _ messageBytes: Int32, _ messageLength: Int32) -> Void {
+@_expose(wasm, "bjs_StaticPropertyHolder_static_staticConstant_get")
+@_cdecl("bjs_StaticPropertyHolder_static_staticConstant_get")
+public func _bjs_StaticPropertyHolder_static_staticConstant_get() -> Void {
     #if arch(wasm32)
-    let ret = makeComplexResultStatus(_: Bool.bridgeJSLiftParameter(active), _: Int.bridgeJSLiftParameter(code), _: String.bridgeJSLiftParameter(messageBytes, messageLength))
+    let ret = StaticPropertyHolder.staticConstant
     return ret.bridgeJSLowerReturn()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_makeComplexResultCoordinates")
-@_cdecl("bjs_makeComplexResultCoordinates")
-public func _bjs_makeComplexResultCoordinates(_ x: Float64, _ y: Float64, _ z: Float64) -> Void {
+@_expose(wasm, "bjs_StaticPropertyHolder_static_staticVariable_get")
+@_cdecl("bjs_StaticPropertyHolder_static_staticVariable_get")
+public func _bjs_StaticPropertyHolder_static_staticVariable_get() -> Int32 {
     #if arch(wasm32)
-    let ret = makeComplexResultCoordinates(_: Double.bridgeJSLiftParameter(x), _: Double.bridgeJSLiftParameter(y), _: Double.bridgeJSLiftParameter(z))
+    let ret = StaticPropertyHolder.staticVariable
     return ret.bridgeJSLowerReturn()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_makeComplexResultComprehensive")
-@_cdecl("bjs_makeComplexResultComprehensive")
-public func _bjs_makeComplexResultComprehensive(_ flag1: Int32, _ flag2: Int32, _ count1: Int32, _ count2: Int32, _ value1: Float64, _ value2: Float64, _ text1Bytes: Int32, _ text1Length: Int32, _ text2Bytes: Int32, _ text2Length: Int32, _ text3Bytes: Int32, _ text3Length: Int32) -> Void {
+@_expose(wasm, "bjs_StaticPropertyHolder_static_staticVariable_set")
+@_cdecl("bjs_StaticPropertyHolder_static_staticVariable_set")
+public func _bjs_StaticPropertyHolder_static_staticVariable_set(_ value: Int32) -> Void {
     #if arch(wasm32)
-    let ret = makeComplexResultComprehensive(_: Bool.bridgeJSLiftParameter(flag1), _: Bool.bridgeJSLiftParameter(flag2), _: Int.bridgeJSLiftParameter(count1), _: Int.bridgeJSLiftParameter(count2), _: Double.bridgeJSLiftParameter(value1), _: Double.bridgeJSLiftParameter(value2), _: String.bridgeJSLiftParameter(text1Bytes, text1Length), _: String.bridgeJSLiftParameter(text2Bytes, text2Length), _: String.bridgeJSLiftParameter(text3Bytes, text3Length))
-    return ret.bridgeJSLowerReturn()
+    StaticPropertyHolder.staticVariable = Int.bridgeJSLiftParameter(value)
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_makeComplexResultInfo")
-@_cdecl("bjs_makeComplexResultInfo")
-public func _bjs_makeComplexResultInfo() -> Void {
+@_expose(wasm, "bjs_StaticPropertyHolder_static_staticString_get")
+@_cdecl("bjs_StaticPropertyHolder_static_staticString_get")
+public func _bjs_StaticPropertyHolder_static_staticString_get() -> Void {
     #if arch(wasm32)
-    let ret = makeComplexResultInfo()
+    let ret = StaticPropertyHolder.staticString
     return ret.bridgeJSLowerReturn()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_makeUtilitiesResultSuccess")
-@_cdecl("bjs_makeUtilitiesResultSuccess")
-public func _bjs_makeUtilitiesResultSuccess(_ messageBytes: Int32, _ messageLength: Int32) -> Void {
+@_expose(wasm, "bjs_StaticPropertyHolder_static_staticString_set")
+@_cdecl("bjs_StaticPropertyHolder_static_staticString_set")
+public func _bjs_StaticPropertyHolder_static_staticString_set(_ valueBytes: Int32, _ valueLength: Int32) -> Void {
     #if arch(wasm32)
-    let ret = makeUtilitiesResultSuccess(_: String.bridgeJSLiftParameter(messageBytes, messageLength))
-    return ret.bridgeJSLowerReturn()
+    StaticPropertyHolder.staticString = String.bridgeJSLiftParameter(valueBytes, valueLength)
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_makeUtilitiesResultFailure")
-@_cdecl("bjs_makeUtilitiesResultFailure")
-public func _bjs_makeUtilitiesResultFailure(_ errorBytes: Int32, _ errorLength: Int32, _ code: Int32) -> Void {
+@_expose(wasm, "bjs_StaticPropertyHolder_static_staticBool_get")
+@_cdecl("bjs_StaticPropertyHolder_static_staticBool_get")
+public func _bjs_StaticPropertyHolder_static_staticBool_get() -> Int32 {
     #if arch(wasm32)
-    let ret = makeUtilitiesResultFailure(_: String.bridgeJSLiftParameter(errorBytes, errorLength), _: Int.bridgeJSLiftParameter(code))
+    let ret = StaticPropertyHolder.staticBool
     return ret.bridgeJSLowerReturn()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_makeUtilitiesResultStatus")
-@_cdecl("bjs_makeUtilitiesResultStatus")
-public func _bjs_makeUtilitiesResultStatus(_ active: Int32, _ code: Int32, _ messageBytes: Int32, _ messageLength: Int32) -> Void {
+@_expose(wasm, "bjs_StaticPropertyHolder_static_staticBool_set")
+@_cdecl("bjs_StaticPropertyHolder_static_staticBool_set")
+public func _bjs_StaticPropertyHolder_static_staticBool_set(_ value: Int32) -> Void {
     #if arch(wasm32)
-    let ret = makeUtilitiesResultStatus(_: Bool.bridgeJSLiftParameter(active), _: Int.bridgeJSLiftParameter(code), _: String.bridgeJSLiftParameter(messageBytes, messageLength))
-    return ret.bridgeJSLowerReturn()
+    StaticPropertyHolder.staticBool = Bool.bridgeJSLiftParameter(value)
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_makeAPINetworkingResultSuccess")
-@_cdecl("bjs_makeAPINetworkingResultSuccess")
-public func _bjs_makeAPINetworkingResultSuccess(_ messageBytes: Int32, _ messageLength: Int32) -> Void {
+@_expose(wasm, "bjs_StaticPropertyHolder_static_staticFloat_get")
+@_cdecl("bjs_StaticPropertyHolder_static_staticFloat_get")
+public func _bjs_StaticPropertyHolder_static_staticFloat_get() -> Float32 {
     #if arch(wasm32)
-    let ret = makeAPINetworkingResultSuccess(_: String.bridgeJSLiftParameter(messageBytes, messageLength))
+    let ret = StaticPropertyHolder.staticFloat
     return ret.bridgeJSLowerReturn()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_makeAPINetworkingResultFailure")
-@_cdecl("bjs_makeAPINetworkingResultFailure")
-public func _bjs_makeAPINetworkingResultFailure(_ errorBytes: Int32, _ errorLength: Int32, _ code: Int32) -> Void {
+@_expose(wasm, "bjs_StaticPropertyHolder_static_staticFloat_set")
+@_cdecl("bjs_StaticPropertyHolder_static_staticFloat_set")
+public func _bjs_StaticPropertyHolder_static_staticFloat_set(_ value: Float32) -> Void {
     #if arch(wasm32)
-    let ret = makeAPINetworkingResultFailure(_: String.bridgeJSLiftParameter(errorBytes, errorLength), _: Int.bridgeJSLiftParameter(code))
-    return ret.bridgeJSLowerReturn()
+    StaticPropertyHolder.staticFloat = Float.bridgeJSLiftParameter(value)
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_roundtripUtilitiesResult")
-@_cdecl("bjs_roundtripUtilitiesResult")
-public func _bjs_roundtripUtilitiesResult(_ result: Int32) -> Void {
+@_expose(wasm, "bjs_StaticPropertyHolder_static_staticDouble_get")
+@_cdecl("bjs_StaticPropertyHolder_static_staticDouble_get")
+public func _bjs_StaticPropertyHolder_static_staticDouble_get() -> Float64 {
     #if arch(wasm32)
-    let ret = roundtripUtilitiesResult(_: Utilities.Result.bridgeJSLiftParameter(result))
+    let ret = StaticPropertyHolder.staticDouble
     return ret.bridgeJSLowerReturn()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_roundtripAPINetworkingResult")
-@_cdecl("bjs_roundtripAPINetworkingResult")
-public func _bjs_roundtripAPINetworkingResult(_ result: Int32) -> Void {
+@_expose(wasm, "bjs_StaticPropertyHolder_static_staticDouble_set")
+@_cdecl("bjs_StaticPropertyHolder_static_staticDouble_set")
+public func _bjs_StaticPropertyHolder_static_staticDouble_set(_ value: Float64) -> Void {
     #if arch(wasm32)
-    let ret = roundtripAPINetworkingResult(_: API.NetworkingResult.bridgeJSLiftParameter(result))
-    return ret.bridgeJSLowerReturn()
+    StaticPropertyHolder.staticDouble = Double.bridgeJSLiftParameter(value)
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_roundTripAllTypesResult")
-@_cdecl("bjs_roundTripAllTypesResult")
-public func _bjs_roundTripAllTypesResult(_ result: Int32) -> Void {
+@_expose(wasm, "bjs_StaticPropertyHolder_static_computedProperty_get")
+@_cdecl("bjs_StaticPropertyHolder_static_computedProperty_get")
+public func _bjs_StaticPropertyHolder_static_computedProperty_get() -> Void {
     #if arch(wasm32)
-    let ret = roundTripAllTypesResult(_: AllTypesResult.bridgeJSLiftParameter(result))
+    let ret = StaticPropertyHolder.computedProperty
     return ret.bridgeJSLowerReturn()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_roundTripTypedPayloadResult")
-@_cdecl("bjs_roundTripTypedPayloadResult")
-public func _bjs_roundTripTypedPayloadResult(_ result: Int32) -> Void {
+@_expose(wasm, "bjs_StaticPropertyHolder_static_computedProperty_set")
+@_cdecl("bjs_StaticPropertyHolder_static_computedProperty_set")
+public func _bjs_StaticPropertyHolder_static_computedProperty_set(_ valueBytes: Int32, _ valueLength: Int32) -> Void {
     #if arch(wasm32)
-    let ret = roundTripTypedPayloadResult(_: TypedPayloadResult.bridgeJSLiftParameter(result))
-    return ret.bridgeJSLowerReturn()
+    StaticPropertyHolder.computedProperty = String.bridgeJSLiftParameter(valueBytes, valueLength)
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_createPropertyHolder")
-@_cdecl("bjs_createPropertyHolder")
-public func _bjs_createPropertyHolder(_ intValue: Int32, _ floatValue: Float32, _ doubleValue: Float64, _ boolValue: Int32, _ stringValueBytes: Int32, _ stringValueLength: Int32, _ jsObject: Int32) -> UnsafeMutableRawPointer {
+@_expose(wasm, "bjs_StaticPropertyHolder_static_readOnlyComputed_get")
+@_cdecl("bjs_StaticPropertyHolder_static_readOnlyComputed_get")
+public func _bjs_StaticPropertyHolder_static_readOnlyComputed_get() -> Int32 {
     #if arch(wasm32)
-    let ret = createPropertyHolder(intValue: Int.bridgeJSLiftParameter(intValue), floatValue: Float.bridgeJSLiftParameter(floatValue), doubleValue: Double.bridgeJSLiftParameter(doubleValue), boolValue: Bool.bridgeJSLiftParameter(boolValue), stringValue: String.bridgeJSLiftParameter(stringValueBytes, stringValueLength), jsObject: JSObject.bridgeJSLiftParameter(jsObject))
+    let ret = StaticPropertyHolder.readOnlyComputed
     return ret.bridgeJSLowerReturn()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_testPropertyHolder")
-@_cdecl("bjs_testPropertyHolder")
-public func _bjs_testPropertyHolder(_ holder: UnsafeMutableRawPointer) -> Void {
+@_expose(wasm, "bjs_StaticPropertyHolder_static_optionalString_get")
+@_cdecl("bjs_StaticPropertyHolder_static_optionalString_get")
+public func _bjs_StaticPropertyHolder_static_optionalString_get() -> Void {
     #if arch(wasm32)
-    let ret = testPropertyHolder(holder: PropertyHolder.bridgeJSLiftParameter(holder))
+    let ret = StaticPropertyHolder.optionalString
     return ret.bridgeJSLowerReturn()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_resetObserverCounts")
-@_cdecl("bjs_resetObserverCounts")
-public func _bjs_resetObserverCounts() -> Void {
+@_expose(wasm, "bjs_StaticPropertyHolder_static_optionalString_set")
+@_cdecl("bjs_StaticPropertyHolder_static_optionalString_set")
+public func _bjs_StaticPropertyHolder_static_optionalString_set(_ valueIsSome: Int32, _ valueBytes: Int32, _ valueLength: Int32) -> Void {
     #if arch(wasm32)
-    resetObserverCounts()
+    StaticPropertyHolder.optionalString = Optional<String>.bridgeJSLiftParameter(valueIsSome, valueBytes, valueLength)
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_getObserverStats")
-@_cdecl("bjs_getObserverStats")
-public func _bjs_getObserverStats() -> Void {
+@_expose(wasm, "bjs_StaticPropertyHolder_static_optionalInt_get")
+@_cdecl("bjs_StaticPropertyHolder_static_optionalInt_get")
+public func _bjs_StaticPropertyHolder_static_optionalInt_get() -> Void {
     #if arch(wasm32)
-    let ret = getObserverStats()
+    let ret = StaticPropertyHolder.optionalInt
     return ret.bridgeJSLowerReturn()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_formatName")
-@_cdecl("bjs_formatName")
-public func _bjs_formatName(_ nameBytes: Int32, _ nameLength: Int32, _ transform: Int32) -> Void {
+@_expose(wasm, "bjs_StaticPropertyHolder_static_optionalInt_set")
+@_cdecl("bjs_StaticPropertyHolder_static_optionalInt_set")
+public func _bjs_StaticPropertyHolder_static_optionalInt_set(_ valueIsSome: Int32, _ valueValue: Int32) -> Void {
     #if arch(wasm32)
-    let ret = formatName(_: String.bridgeJSLiftParameter(nameBytes, nameLength), transform: _BJS_Closure_20BridgeJSRuntimeTestsSS_SS.bridgeJSLift(transform))
-    return ret.bridgeJSLowerReturn()
+    StaticPropertyHolder.optionalInt = Optional<Int>.bridgeJSLiftParameter(valueIsSome, valueValue)
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_makeFormatter")
-@_cdecl("bjs_makeFormatter")
-public func _bjs_makeFormatter(_ prefixBytes: Int32, _ prefixLength: Int32) -> Int32 {
+@_expose(wasm, "bjs_StaticPropertyHolder_static_jsObjectProperty_get")
+@_cdecl("bjs_StaticPropertyHolder_static_jsObjectProperty_get")
+public func _bjs_StaticPropertyHolder_static_jsObjectProperty_get() -> Int32 {
     #if arch(wasm32)
-    let ret = makeFormatter(prefix: String.bridgeJSLiftParameter(prefixBytes, prefixLength))
-    return JSTypedClosure(ret).bridgeJSLowerReturn()
+    let ret = StaticPropertyHolder.jsObjectProperty
+    return ret.bridgeJSLowerReturn()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_makeAdder")
-@_cdecl("bjs_makeAdder")
-public func _bjs_makeAdder(_ base: Int32) -> Int32 {
+@_expose(wasm, "bjs_StaticPropertyHolder_static_jsObjectProperty_set")
+@_cdecl("bjs_StaticPropertyHolder_static_jsObjectProperty_set")
+public func _bjs_StaticPropertyHolder_static_jsObjectProperty_set(_ value: Int32) -> Void {
     #if arch(wasm32)
-    let ret = makeAdder(base: Int.bridgeJSLiftParameter(base))
-    return JSTypedClosure(ret).bridgeJSLowerReturn()
+    StaticPropertyHolder.jsObjectProperty = JSObject.bridgeJSLiftParameter(value)
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_roundTripPointerFields")
-@_cdecl("bjs_roundTripPointerFields")
-public func _bjs_roundTripPointerFields() -> Void {
+@_expose(wasm, "bjs_StaticPropertyHolder_deinit")
+@_cdecl("bjs_StaticPropertyHolder_deinit")
+public func _bjs_StaticPropertyHolder_deinit(_ pointer: UnsafeMutableRawPointer) -> Void {
     #if arch(wasm32)
-    let ret = roundTripPointerFields(_: PointerFields.bridgeJSLiftParameter())
-    return ret.bridgeJSLowerReturn()
+    Unmanaged<StaticPropertyHolder>.fromOpaque(pointer).release()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_testStructDefault")
-@_cdecl("bjs_testStructDefault")
-public func _bjs_testStructDefault() -> Void {
+extension StaticPropertyHolder: ConvertibleToJSValue, _BridgedSwiftHeapObject, _BridgedSwiftProtocolExportable {
+    var jsValue: JSValue {
+        return .object(JSObject(id: UInt32(bitPattern: _bjs_StaticPropertyHolder_wrap(Unmanaged.passRetained(self).toOpaque()))))
+    }
+    consuming func bridgeJSLowerAsProtocolReturn() -> Int32 {
+        _bjs_StaticPropertyHolder_wrap(Unmanaged.passRetained(self).toOpaque())
+    }
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_StaticPropertyHolder_wrap")
+fileprivate func _bjs_StaticPropertyHolder_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32
+#else
+fileprivate func _bjs_StaticPropertyHolder_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func _bjs_StaticPropertyHolder_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 {
+    return _bjs_StaticPropertyHolder_wrap_extern(pointer)
+}
+
+@_expose(wasm, "bjs_DataProcessorManager_init")
+@_cdecl("bjs_DataProcessorManager_init")
+public func _bjs_DataProcessorManager_init(_ processor: Int32) -> UnsafeMutableRawPointer {
     #if arch(wasm32)
-    let ret = testStructDefault(point: DataPoint.bridgeJSLiftParameter())
+    let ret = DataProcessorManager(processor: AnyDataProcessor.bridgeJSLiftParameter(processor))
     return ret.bridgeJSLowerReturn()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_cartToJSObject")
-@_cdecl("bjs_cartToJSObject")
-public func _bjs_cartToJSObject() -> Int32 {
+@_expose(wasm, "bjs_DataProcessorManager_incrementByAmount")
+@_cdecl("bjs_DataProcessorManager_incrementByAmount")
+public func _bjs_DataProcessorManager_incrementByAmount(_ _self: UnsafeMutableRawPointer, _ amount: Int32) -> Void {
     #if arch(wasm32)
-    let ret = cartToJSObject(_: CopyableCart.bridgeJSLiftParameter())
-    return ret.bridgeJSLowerReturn()
+    DataProcessorManager.bridgeJSLiftParameter(_self).incrementByAmount(_: Int.bridgeJSLiftParameter(amount))
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_nestedCartToJSObject")
-@_cdecl("bjs_nestedCartToJSObject")
-public func _bjs_nestedCartToJSObject() -> Int32 {
+@_expose(wasm, "bjs_DataProcessorManager_setProcessorLabel")
+@_cdecl("bjs_DataProcessorManager_setProcessorLabel")
+public func _bjs_DataProcessorManager_setProcessorLabel(_ _self: UnsafeMutableRawPointer, _ prefixBytes: Int32, _ prefixLength: Int32, _ suffixBytes: Int32, _ suffixLength: Int32) -> Void {
     #if arch(wasm32)
-    let ret = nestedCartToJSObject(_: CopyableNestedCart.bridgeJSLiftParameter())
-    return ret.bridgeJSLowerReturn()
+    DataProcessorManager.bridgeJSLiftParameter(_self).setProcessorLabel(_: String.bridgeJSLiftParameter(prefixBytes, prefixLength), _: String.bridgeJSLiftParameter(suffixBytes, suffixLength))
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_roundTripDataPoint")
-@_cdecl("bjs_roundTripDataPoint")
-public func _bjs_roundTripDataPoint() -> Void {
+@_expose(wasm, "bjs_DataProcessorManager_isProcessorEven")
+@_cdecl("bjs_DataProcessorManager_isProcessorEven")
+public func _bjs_DataProcessorManager_isProcessorEven(_ _self: UnsafeMutableRawPointer) -> Int32 {
     #if arch(wasm32)
-    let ret = roundTripDataPoint(_: DataPoint.bridgeJSLiftParameter())
+    let ret = DataProcessorManager.bridgeJSLiftParameter(_self).isProcessorEven()
     return ret.bridgeJSLowerReturn()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_roundTripPublicPoint")
-@_cdecl("bjs_roundTripPublicPoint")
-public func _bjs_roundTripPublicPoint() -> Void {
+@_expose(wasm, "bjs_DataProcessorManager_getProcessorLabel")
+@_cdecl("bjs_DataProcessorManager_getProcessorLabel")
+public func _bjs_DataProcessorManager_getProcessorLabel(_ _self: UnsafeMutableRawPointer) -> Void {
     #if arch(wasm32)
-    let ret = roundTripPublicPoint(_: PublicPoint.bridgeJSLiftParameter())
+    let ret = DataProcessorManager.bridgeJSLiftParameter(_self).getProcessorLabel()
     return ret.bridgeJSLowerReturn()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_roundTripContact")
-@_cdecl("bjs_roundTripContact")
-public func _bjs_roundTripContact() -> Void {
+@_expose(wasm, "bjs_DataProcessorManager_getCurrentValue")
+@_cdecl("bjs_DataProcessorManager_getCurrentValue")
+public func _bjs_DataProcessorManager_getCurrentValue(_ _self: UnsafeMutableRawPointer) -> Int32 {
     #if arch(wasm32)
-    let ret = roundTripContact(_: Contact.bridgeJSLiftParameter())
+    let ret = DataProcessorManager.bridgeJSLiftParameter(_self).getCurrentValue()
     return ret.bridgeJSLowerReturn()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_roundTripConfig")
-@_cdecl("bjs_roundTripConfig")
-public func _bjs_roundTripConfig() -> Void {
+@_expose(wasm, "bjs_DataProcessorManager_incrementBoth")
+@_cdecl("bjs_DataProcessorManager_incrementBoth")
+public func _bjs_DataProcessorManager_incrementBoth(_ _self: UnsafeMutableRawPointer) -> Void {
     #if arch(wasm32)
-    let ret = roundTripConfig(_: Config.bridgeJSLiftParameter())
-    return ret.bridgeJSLowerReturn()
+    DataProcessorManager.bridgeJSLiftParameter(_self).incrementBoth()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_roundTripSessionData")
-@_cdecl("bjs_roundTripSessionData")
-public func _bjs_roundTripSessionData() -> Void {
+@_expose(wasm, "bjs_DataProcessorManager_getBackupValue")
+@_cdecl("bjs_DataProcessorManager_getBackupValue")
+public func _bjs_DataProcessorManager_getBackupValue(_ _self: UnsafeMutableRawPointer) -> Void {
     #if arch(wasm32)
-    let ret = roundTripSessionData(_: SessionData.bridgeJSLiftParameter())
+    let ret = DataProcessorManager.bridgeJSLiftParameter(_self).getBackupValue()
     return ret.bridgeJSLowerReturn()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_roundTripValidationReport")
-@_cdecl("bjs_roundTripValidationReport")
-public func _bjs_roundTripValidationReport() -> Void {
+@_expose(wasm, "bjs_DataProcessorManager_hasBackup")
+@_cdecl("bjs_DataProcessorManager_hasBackup")
+public func _bjs_DataProcessorManager_hasBackup(_ _self: UnsafeMutableRawPointer) -> Int32 {
     #if arch(wasm32)
-    let ret = roundTripValidationReport(_: ValidationReport.bridgeJSLiftParameter())
+    let ret = DataProcessorManager.bridgeJSLiftParameter(_self).hasBackup()
     return ret.bridgeJSLowerReturn()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_roundTripAdvancedConfig")
-@_cdecl("bjs_roundTripAdvancedConfig")
-public func _bjs_roundTripAdvancedConfig() -> Void {
+@_expose(wasm, "bjs_DataProcessorManager_getProcessorOptionalTag")
+@_cdecl("bjs_DataProcessorManager_getProcessorOptionalTag")
+public func _bjs_DataProcessorManager_getProcessorOptionalTag(_ _self: UnsafeMutableRawPointer) -> Void {
     #if arch(wasm32)
-    let ret = roundTripAdvancedConfig(_: AdvancedConfig.bridgeJSLiftParameter())
+    let ret = DataProcessorManager.bridgeJSLiftParameter(_self).getProcessorOptionalTag()
     return ret.bridgeJSLowerReturn()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_roundTripMeasurementConfig")
-@_cdecl("bjs_roundTripMeasurementConfig")
-public func _bjs_roundTripMeasurementConfig() -> Void {
+@_expose(wasm, "bjs_DataProcessorManager_setProcessorOptionalTag")
+@_cdecl("bjs_DataProcessorManager_setProcessorOptionalTag")
+public func _bjs_DataProcessorManager_setProcessorOptionalTag(_ _self: UnsafeMutableRawPointer, _ tagIsSome: Int32, _ tagBytes: Int32, _ tagLength: Int32) -> Void {
     #if arch(wasm32)
-    let ret = roundTripMeasurementConfig(_: MeasurementConfig.bridgeJSLiftParameter())
-    return ret.bridgeJSLowerReturn()
+    DataProcessorManager.bridgeJSLiftParameter(_self).setProcessorOptionalTag(_: Optional<String>.bridgeJSLiftParameter(tagIsSome, tagBytes, tagLength))
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_updateValidationReport")
-@_cdecl("bjs_updateValidationReport")
-public func _bjs_updateValidationReport(_ newResultIsSome: Int32, _ newResultCaseId: Int32) -> Void {
+@_expose(wasm, "bjs_DataProcessorManager_getProcessorOptionalCount")
+@_cdecl("bjs_DataProcessorManager_getProcessorOptionalCount")
+public func _bjs_DataProcessorManager_getProcessorOptionalCount(_ _self: UnsafeMutableRawPointer) -> Void {
     #if arch(wasm32)
-    let _tmp_report = ValidationReport.bridgeJSLiftParameter()
-    let _tmp_newResult = Optional<APIResult>.bridgeJSLiftParameter(newResultIsSome, newResultCaseId)
-    let ret = updateValidationReport(_: _tmp_newResult, _: _tmp_report)
+    let ret = DataProcessorManager.bridgeJSLiftParameter(_self).getProcessorOptionalCount()
     return ret.bridgeJSLowerReturn()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_testContainerWithStruct")
-@_cdecl("bjs_testContainerWithStruct")
-public func _bjs_testContainerWithStruct() -> UnsafeMutableRawPointer {
+@_expose(wasm, "bjs_DataProcessorManager_setProcessorOptionalCount")
+@_cdecl("bjs_DataProcessorManager_setProcessorOptionalCount")
+public func _bjs_DataProcessorManager_setProcessorOptionalCount(_ _self: UnsafeMutableRawPointer, _ countIsSome: Int32, _ countValue: Int32) -> Void {
     #if arch(wasm32)
-    let ret = testContainerWithStruct(_: DataPoint.bridgeJSLiftParameter())
-    return ret.bridgeJSLowerReturn()
+    DataProcessorManager.bridgeJSLiftParameter(_self).setProcessorOptionalCount(_: Optional<Int>.bridgeJSLiftParameter(countIsSome, countValue))
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_roundTripJSObjectContainer")
-@_cdecl("bjs_roundTripJSObjectContainer")
-public func _bjs_roundTripJSObjectContainer() -> Void {
+@_expose(wasm, "bjs_DataProcessorManager_getProcessorDirection")
+@_cdecl("bjs_DataProcessorManager_getProcessorDirection")
+public func _bjs_DataProcessorManager_getProcessorDirection(_ _self: UnsafeMutableRawPointer) -> Void {
     #if arch(wasm32)
-    let ret = roundTripJSObjectContainer(_: JSObjectContainer.bridgeJSLiftParameter())
+    let ret = DataProcessorManager.bridgeJSLiftParameter(_self).getProcessorDirection()
     return ret.bridgeJSLowerReturn()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_roundTripFooContainer")
-@_cdecl("bjs_roundTripFooContainer")
-public func _bjs_roundTripFooContainer() -> Void {
+@_expose(wasm, "bjs_DataProcessorManager_setProcessorDirection")
+@_cdecl("bjs_DataProcessorManager_setProcessorDirection")
+public func _bjs_DataProcessorManager_setProcessorDirection(_ _self: UnsafeMutableRawPointer, _ directionIsSome: Int32, _ directionValue: Int32) -> Void {
     #if arch(wasm32)
-    let ret = roundTripFooContainer(_: FooContainer.bridgeJSLiftParameter())
-    return ret.bridgeJSLowerReturn()
+    DataProcessorManager.bridgeJSLiftParameter(_self).setProcessorDirection(_: Optional<Direction>.bridgeJSLiftParameter(directionIsSome, directionValue))
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_roundTripArrayMembers")
-@_cdecl("bjs_roundTripArrayMembers")
-public func _bjs_roundTripArrayMembers() -> Void {
+@_expose(wasm, "bjs_DataProcessorManager_getProcessorTheme")
+@_cdecl("bjs_DataProcessorManager_getProcessorTheme")
+public func _bjs_DataProcessorManager_getProcessorTheme(_ _self: UnsafeMutableRawPointer) -> Void {
     #if arch(wasm32)
-    let ret = roundTripArrayMembers(_: ArrayMembers.bridgeJSLiftParameter())
+    let ret = DataProcessorManager.bridgeJSLiftParameter(_self).getProcessorTheme()
     return ret.bridgeJSLowerReturn()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_arrayMembersSum")
-@_cdecl("bjs_arrayMembersSum")
-public func _bjs_arrayMembersSum() -> Int32 {
+@_expose(wasm, "bjs_DataProcessorManager_setProcessorTheme")
+@_cdecl("bjs_DataProcessorManager_setProcessorTheme")
+public func _bjs_DataProcessorManager_setProcessorTheme(_ _self: UnsafeMutableRawPointer, _ themeIsSome: Int32, _ themeBytes: Int32, _ themeLength: Int32) -> Void {
     #if arch(wasm32)
-    let _tmp_values = [Int].bridgeJSStackPop()
-    let _tmp_value = ArrayMembers.bridgeJSLiftParameter()
-    let ret = arrayMembersSum(_: _tmp_value, _: _tmp_values)
-    return ret.bridgeJSLowerReturn()
+    DataProcessorManager.bridgeJSLiftParameter(_self).setProcessorTheme(_: Optional<Theme>.bridgeJSLiftParameter(themeIsSome, themeBytes, themeLength))
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_arrayMembersFirst")
-@_cdecl("bjs_arrayMembersFirst")
-public func _bjs_arrayMembersFirst() -> Void {
+@_expose(wasm, "bjs_DataProcessorManager_getProcessorHttpStatus")
+@_cdecl("bjs_DataProcessorManager_getProcessorHttpStatus")
+public func _bjs_DataProcessorManager_getProcessorHttpStatus(_ _self: UnsafeMutableRawPointer) -> Void {
     #if arch(wasm32)
-    let _tmp_values = [String].bridgeJSStackPop()
-    let _tmp_value = ArrayMembers.bridgeJSLiftParameter()
-    let ret = arrayMembersFirst(_: _tmp_value, _: _tmp_values)
+    let ret = DataProcessorManager.bridgeJSLiftParameter(_self).getProcessorHttpStatus()
     return ret.bridgeJSLowerReturn()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_ClosureSupportExports_static_makeIntToInt")
-@_cdecl("bjs_ClosureSupportExports_static_makeIntToInt")
-public func _bjs_ClosureSupportExports_static_makeIntToInt(_ base: Int32) -> Int32 {
+@_expose(wasm, "bjs_DataProcessorManager_setProcessorHttpStatus")
+@_cdecl("bjs_DataProcessorManager_setProcessorHttpStatus")
+public func _bjs_DataProcessorManager_setProcessorHttpStatus(_ _self: UnsafeMutableRawPointer, _ statusIsSome: Int32, _ statusValue: Int32) -> Void {
     #if arch(wasm32)
-    let ret = ClosureSupportExports.makeIntToInt(_: Int.bridgeJSLiftParameter(base))
-    return JSTypedClosure(ret).bridgeJSLowerReturn()
+    DataProcessorManager.bridgeJSLiftParameter(_self).setProcessorHttpStatus(_: Optional<HttpStatus>.bridgeJSLiftParameter(statusIsSome, statusValue))
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_ClosureSupportExports_static_makeDoubleToDouble")
-@_cdecl("bjs_ClosureSupportExports_static_makeDoubleToDouble")
-public func _bjs_ClosureSupportExports_static_makeDoubleToDouble(_ base: Float64) -> Int32 {
+@_expose(wasm, "bjs_DataProcessorManager_getProcessorAPIResult")
+@_cdecl("bjs_DataProcessorManager_getProcessorAPIResult")
+public func _bjs_DataProcessorManager_getProcessorAPIResult(_ _self: UnsafeMutableRawPointer) -> Void {
     #if arch(wasm32)
-    let ret = ClosureSupportExports.makeDoubleToDouble(_: Double.bridgeJSLiftParameter(base))
-    return JSTypedClosure(ret).bridgeJSLowerReturn()
+    let ret = DataProcessorManager.bridgeJSLiftParameter(_self).getProcessorAPIResult()
+    return ret.bridgeJSLowerReturn()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_ClosureSupportExports_static_makeStringToString")
-@_cdecl("bjs_ClosureSupportExports_static_makeStringToString")
-public func _bjs_ClosureSupportExports_static_makeStringToString(_ prefixBytes: Int32, _ prefixLength: Int32) -> Int32 {
+@_expose(wasm, "bjs_DataProcessorManager_setProcessorAPIResult")
+@_cdecl("bjs_DataProcessorManager_setProcessorAPIResult")
+public func _bjs_DataProcessorManager_setProcessorAPIResult(_ _self: UnsafeMutableRawPointer, _ apiResultIsSome: Int32, _ apiResultCaseId: Int32) -> Void {
     #if arch(wasm32)
-    let ret = ClosureSupportExports.makeStringToString(_: String.bridgeJSLiftParameter(prefixBytes, prefixLength))
-    return JSTypedClosure(ret).bridgeJSLowerReturn()
+    DataProcessorManager.bridgeJSLiftParameter(_self).setProcessorAPIResult(_: Optional<APIResult>.bridgeJSLiftParameter(apiResultIsSome, apiResultCaseId))
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_ClosureSupportExports_static_makeJSIntToInt")
-@_cdecl("bjs_ClosureSupportExports_static_makeJSIntToInt")
-public func _bjs_ClosureSupportExports_static_makeJSIntToInt(_ base: Int32) -> Int32 {
+@_expose(wasm, "bjs_DataProcessorManager_processor_get")
+@_cdecl("bjs_DataProcessorManager_processor_get")
+public func _bjs_DataProcessorManager_processor_get(_ _self: UnsafeMutableRawPointer) -> Int32 {
     #if arch(wasm32)
-    let ret = ClosureSupportExports.makeJSIntToInt(_: Int.bridgeJSLiftParameter(base))
-    return ret.bridgeJSLowerReturn()
+    let ret = DataProcessorManager.bridgeJSLiftParameter(_self).processor as! _BridgedSwiftProtocolExportable
+    return ret.bridgeJSLowerAsProtocolReturn()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_ClosureSupportExports_static_makeJSDoubleToDouble")
-@_cdecl("bjs_ClosureSupportExports_static_makeJSDoubleToDouble")
-public func _bjs_ClosureSupportExports_static_makeJSDoubleToDouble(_ base: Float64) -> Int32 {
+@_expose(wasm, "bjs_DataProcessorManager_processor_set")
+@_cdecl("bjs_DataProcessorManager_processor_set")
+public func _bjs_DataProcessorManager_processor_set(_ _self: UnsafeMutableRawPointer, _ value: Int32) -> Void {
     #if arch(wasm32)
-    let ret = ClosureSupportExports.makeJSDoubleToDouble(_: Double.bridgeJSLiftParameter(base))
-    return ret.bridgeJSLowerReturn()
+    DataProcessorManager.bridgeJSLiftParameter(_self).processor = AnyDataProcessor.bridgeJSLiftParameter(value)
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_ClosureSupportExports_static_makeJSStringToString")
-@_cdecl("bjs_ClosureSupportExports_static_makeJSStringToString")
-public func _bjs_ClosureSupportExports_static_makeJSStringToString(_ prefixBytes: Int32, _ prefixLength: Int32) -> Int32 {
+@_expose(wasm, "bjs_DataProcessorManager_backupProcessor_get")
+@_cdecl("bjs_DataProcessorManager_backupProcessor_get")
+public func _bjs_DataProcessorManager_backupProcessor_get(_ _self: UnsafeMutableRawPointer) -> Void {
     #if arch(wasm32)
-    let ret = ClosureSupportExports.makeJSStringToString(_: String.bridgeJSLiftParameter(prefixBytes, prefixLength))
-    return ret.bridgeJSLowerReturn()
+    let ret = DataProcessorManager.bridgeJSLiftParameter(_self).backupProcessor
+    if let ret {
+        _swift_js_return_optional_object(1, (ret as! _BridgedSwiftProtocolExportable).bridgeJSLowerAsProtocolReturn())
+    } else {
+        _swift_js_return_optional_object(0, 0)
+    }
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_ClosureSupportExports_deinit")
-@_cdecl("bjs_ClosureSupportExports_deinit")
-public func _bjs_ClosureSupportExports_deinit(_ pointer: UnsafeMutableRawPointer) -> Void {
+@_expose(wasm, "bjs_DataProcessorManager_backupProcessor_set")
+@_cdecl("bjs_DataProcessorManager_backupProcessor_set")
+public func _bjs_DataProcessorManager_backupProcessor_set(_ _self: UnsafeMutableRawPointer, _ valueIsSome: Int32, _ valueValue: Int32) -> Void {
     #if arch(wasm32)
-    Unmanaged<ClosureSupportExports>.fromOpaque(pointer).release()
+    DataProcessorManager.bridgeJSLiftParameter(_self).backupProcessor = Optional<AnyDataProcessor>.bridgeJSLiftParameter(valueIsSome, valueValue)
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-extension ClosureSupportExports: ConvertibleToJSValue, _BridgedSwiftHeapObject, _BridgedSwiftProtocolExportable {
+@_expose(wasm, "bjs_DataProcessorManager_deinit")
+@_cdecl("bjs_DataProcessorManager_deinit")
+public func _bjs_DataProcessorManager_deinit(_ pointer: UnsafeMutableRawPointer) -> Void {
+    #if arch(wasm32)
+    Unmanaged<DataProcessorManager>.fromOpaque(pointer).release()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+extension DataProcessorManager: ConvertibleToJSValue, _BridgedSwiftHeapObject, _BridgedSwiftProtocolExportable {
     var jsValue: JSValue {
-        return .object(JSObject(id: UInt32(bitPattern: _bjs_ClosureSupportExports_wrap(Unmanaged.passRetained(self).toOpaque()))))
+        return .object(JSObject(id: UInt32(bitPattern: _bjs_DataProcessorManager_wrap(Unmanaged.passRetained(self).toOpaque()))))
     }
     consuming func bridgeJSLowerAsProtocolReturn() -> Int32 {
-        _bjs_ClosureSupportExports_wrap(Unmanaged.passRetained(self).toOpaque())
+        _bjs_DataProcessorManager_wrap(Unmanaged.passRetained(self).toOpaque())
     }
 }
 
 #if arch(wasm32)
-@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_ClosureSupportExports_wrap")
-fileprivate func _bjs_ClosureSupportExports_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessorManager_wrap")
+fileprivate func _bjs_DataProcessorManager_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32
 #else
-fileprivate func _bjs_ClosureSupportExports_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 {
+fileprivate func _bjs_DataProcessorManager_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 {
     fatalError("Only available on WebAssembly")
 }
 #endif
-@inline(never) fileprivate func _bjs_ClosureSupportExports_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 {
-    return _bjs_ClosureSupportExports_wrap_extern(pointer)
+@inline(never) fileprivate func _bjs_DataProcessorManager_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 {
+    return _bjs_DataProcessorManager_wrap_extern(pointer)
 }
 
-@_expose(wasm, "bjs_DefaultArgumentConstructorDefaults_init")
-@_cdecl("bjs_DefaultArgumentConstructorDefaults_init")
-public func _bjs_DefaultArgumentConstructorDefaults_init(_ nameBytes: Int32, _ nameLength: Int32, _ count: Int32, _ enabled: Int32, _ status: Int32, _ tagIsSome: Int32, _ tagBytes: Int32, _ tagLength: Int32) -> UnsafeMutableRawPointer {
+@_expose(wasm, "bjs_SwiftDataProcessor_init")
+@_cdecl("bjs_SwiftDataProcessor_init")
+public func _bjs_SwiftDataProcessor_init() -> UnsafeMutableRawPointer {
     #if arch(wasm32)
-    let ret = DefaultArgumentConstructorDefaults(name: String.bridgeJSLiftParameter(nameBytes, nameLength), count: Int.bridgeJSLiftParameter(count), enabled: Bool.bridgeJSLiftParameter(enabled), status: Status.bridgeJSLiftParameter(status), tag: Optional<String>.bridgeJSLiftParameter(tagIsSome, tagBytes, tagLength))
+    let ret = SwiftDataProcessor()
     return ret.bridgeJSLowerReturn()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_DefaultArgumentConstructorDefaults_describe")
-@_cdecl("bjs_DefaultArgumentConstructorDefaults_describe")
-public func _bjs_DefaultArgumentConstructorDefaults_describe(_ _self: UnsafeMutableRawPointer) -> Void {
+@_expose(wasm, "bjs_SwiftDataProcessor_increment")
+@_cdecl("bjs_SwiftDataProcessor_increment")
+public func _bjs_SwiftDataProcessor_increment(_ _self: UnsafeMutableRawPointer, _ amount: Int32) -> Void {
     #if arch(wasm32)
-    let ret = DefaultArgumentConstructorDefaults.bridgeJSLiftParameter(_self).describe()
-    return ret.bridgeJSLowerReturn()
+    SwiftDataProcessor.bridgeJSLiftParameter(_self).increment(by: Int.bridgeJSLiftParameter(amount))
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_DefaultArgumentConstructorDefaults_name_get")
-@_cdecl("bjs_DefaultArgumentConstructorDefaults_name_get")
-public func _bjs_DefaultArgumentConstructorDefaults_name_get(_ _self: UnsafeMutableRawPointer) -> Void {
+@_expose(wasm, "bjs_SwiftDataProcessor_getValue")
+@_cdecl("bjs_SwiftDataProcessor_getValue")
+public func _bjs_SwiftDataProcessor_getValue(_ _self: UnsafeMutableRawPointer) -> Int32 {
     #if arch(wasm32)
-    let ret = DefaultArgumentConstructorDefaults.bridgeJSLiftParameter(_self).name
+    let ret = SwiftDataProcessor.bridgeJSLiftParameter(_self).getValue()
     return ret.bridgeJSLowerReturn()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_DefaultArgumentConstructorDefaults_name_set")
-@_cdecl("bjs_DefaultArgumentConstructorDefaults_name_set")
-public func _bjs_DefaultArgumentConstructorDefaults_name_set(_ _self: UnsafeMutableRawPointer, _ valueBytes: Int32, _ valueLength: Int32) -> Void {
+@_expose(wasm, "bjs_SwiftDataProcessor_setLabelElements")
+@_cdecl("bjs_SwiftDataProcessor_setLabelElements")
+public func _bjs_SwiftDataProcessor_setLabelElements(_ _self: UnsafeMutableRawPointer, _ labelPrefixBytes: Int32, _ labelPrefixLength: Int32, _ labelSuffixBytes: Int32, _ labelSuffixLength: Int32) -> Void {
     #if arch(wasm32)
-    DefaultArgumentConstructorDefaults.bridgeJSLiftParameter(_self).name = String.bridgeJSLiftParameter(valueBytes, valueLength)
+    SwiftDataProcessor.bridgeJSLiftParameter(_self).setLabelElements(_: String.bridgeJSLiftParameter(labelPrefixBytes, labelPrefixLength), _: String.bridgeJSLiftParameter(labelSuffixBytes, labelSuffixLength))
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_DefaultArgumentConstructorDefaults_count_get")
-@_cdecl("bjs_DefaultArgumentConstructorDefaults_count_get")
-public func _bjs_DefaultArgumentConstructorDefaults_count_get(_ _self: UnsafeMutableRawPointer) -> Int32 {
+@_expose(wasm, "bjs_SwiftDataProcessor_getLabel")
+@_cdecl("bjs_SwiftDataProcessor_getLabel")
+public func _bjs_SwiftDataProcessor_getLabel(_ _self: UnsafeMutableRawPointer) -> Void {
     #if arch(wasm32)
-    let ret = DefaultArgumentConstructorDefaults.bridgeJSLiftParameter(_self).count
+    let ret = SwiftDataProcessor.bridgeJSLiftParameter(_self).getLabel()
     return ret.bridgeJSLowerReturn()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_DefaultArgumentConstructorDefaults_count_set")
-@_cdecl("bjs_DefaultArgumentConstructorDefaults_count_set")
-public func _bjs_DefaultArgumentConstructorDefaults_count_set(_ _self: UnsafeMutableRawPointer, _ value: Int32) -> Void {
-    #if arch(wasm32)
-    DefaultArgumentConstructorDefaults.bridgeJSLiftParameter(_self).count = Int.bridgeJSLiftParameter(value)
-    #else
-    fatalError("Only available on WebAssembly")
-    #endif
-}
-
-@_expose(wasm, "bjs_DefaultArgumentConstructorDefaults_enabled_get")
-@_cdecl("bjs_DefaultArgumentConstructorDefaults_enabled_get")
-public func _bjs_DefaultArgumentConstructorDefaults_enabled_get(_ _self: UnsafeMutableRawPointer) -> Int32 {
+@_expose(wasm, "bjs_SwiftDataProcessor_isEven")
+@_cdecl("bjs_SwiftDataProcessor_isEven")
+public func _bjs_SwiftDataProcessor_isEven(_ _self: UnsafeMutableRawPointer) -> Int32 {
     #if arch(wasm32)
-    let ret = DefaultArgumentConstructorDefaults.bridgeJSLiftParameter(_self).enabled
+    let ret = SwiftDataProcessor.bridgeJSLiftParameter(_self).isEven()
     return ret.bridgeJSLowerReturn()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_DefaultArgumentConstructorDefaults_enabled_set")
-@_cdecl("bjs_DefaultArgumentConstructorDefaults_enabled_set")
-public func _bjs_DefaultArgumentConstructorDefaults_enabled_set(_ _self: UnsafeMutableRawPointer, _ value: Int32) -> Void {
+@_expose(wasm, "bjs_SwiftDataProcessor_processGreeter")
+@_cdecl("bjs_SwiftDataProcessor_processGreeter")
+public func _bjs_SwiftDataProcessor_processGreeter(_ _self: UnsafeMutableRawPointer, _ greeter: UnsafeMutableRawPointer) -> Void {
     #if arch(wasm32)
-    DefaultArgumentConstructorDefaults.bridgeJSLiftParameter(_self).enabled = Bool.bridgeJSLiftParameter(value)
+    let ret = SwiftDataProcessor.bridgeJSLiftParameter(_self).processGreeter(_: Greeter.bridgeJSLiftParameter(greeter))
+    return ret.bridgeJSLowerReturn()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_DefaultArgumentConstructorDefaults_status_get")
-@_cdecl("bjs_DefaultArgumentConstructorDefaults_status_get")
-public func _bjs_DefaultArgumentConstructorDefaults_status_get(_ _self: UnsafeMutableRawPointer) -> Int32 {
+@_expose(wasm, "bjs_SwiftDataProcessor_createGreeter")
+@_cdecl("bjs_SwiftDataProcessor_createGreeter")
+public func _bjs_SwiftDataProcessor_createGreeter(_ _self: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer {
     #if arch(wasm32)
-    let ret = DefaultArgumentConstructorDefaults.bridgeJSLiftParameter(_self).status
+    let ret = SwiftDataProcessor.bridgeJSLiftParameter(_self).createGreeter()
     return ret.bridgeJSLowerReturn()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_DefaultArgumentConstructorDefaults_status_set")
-@_cdecl("bjs_DefaultArgumentConstructorDefaults_status_set")
-public func _bjs_DefaultArgumentConstructorDefaults_status_set(_ _self: UnsafeMutableRawPointer, _ value: Int32) -> Void {
+@_expose(wasm, "bjs_SwiftDataProcessor_processOptionalGreeter")
+@_cdecl("bjs_SwiftDataProcessor_processOptionalGreeter")
+public func _bjs_SwiftDataProcessor_processOptionalGreeter(_ _self: UnsafeMutableRawPointer, _ greeterIsSome: Int32, _ greeterValue: UnsafeMutableRawPointer) -> Void {
     #if arch(wasm32)
-    DefaultArgumentConstructorDefaults.bridgeJSLiftParameter(_self).status = Status.bridgeJSLiftParameter(value)
+    let ret = SwiftDataProcessor.bridgeJSLiftParameter(_self).processOptionalGreeter(_: Optional<Greeter>.bridgeJSLiftParameter(greeterIsSome, greeterValue))
+    return ret.bridgeJSLowerReturn()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_DefaultArgumentConstructorDefaults_tag_get")
-@_cdecl("bjs_DefaultArgumentConstructorDefaults_tag_get")
-public func _bjs_DefaultArgumentConstructorDefaults_tag_get(_ _self: UnsafeMutableRawPointer) -> Void {
+@_expose(wasm, "bjs_SwiftDataProcessor_createOptionalGreeter")
+@_cdecl("bjs_SwiftDataProcessor_createOptionalGreeter")
+public func _bjs_SwiftDataProcessor_createOptionalGreeter(_ _self: UnsafeMutableRawPointer) -> Void {
     #if arch(wasm32)
-    let ret = DefaultArgumentConstructorDefaults.bridgeJSLiftParameter(_self).tag
+    let ret = SwiftDataProcessor.bridgeJSLiftParameter(_self).createOptionalGreeter()
     return ret.bridgeJSLowerReturn()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_DefaultArgumentConstructorDefaults_tag_set")
-@_cdecl("bjs_DefaultArgumentConstructorDefaults_tag_set")
-public func _bjs_DefaultArgumentConstructorDefaults_tag_set(_ _self: UnsafeMutableRawPointer, _ valueIsSome: Int32, _ valueBytes: Int32, _ valueLength: Int32) -> Void {
+@_expose(wasm, "bjs_SwiftDataProcessor_handleAPIResult")
+@_cdecl("bjs_SwiftDataProcessor_handleAPIResult")
+public func _bjs_SwiftDataProcessor_handleAPIResult(_ _self: UnsafeMutableRawPointer, _ resultIsSome: Int32, _ resultCaseId: Int32) -> Void {
     #if arch(wasm32)
-    DefaultArgumentConstructorDefaults.bridgeJSLiftParameter(_self).tag = Optional<String>.bridgeJSLiftParameter(valueIsSome, valueBytes, valueLength)
+    SwiftDataProcessor.bridgeJSLiftParameter(_self).handleAPIResult(_: Optional<APIResult>.bridgeJSLiftParameter(resultIsSome, resultCaseId))
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_DefaultArgumentConstructorDefaults_deinit")
-@_cdecl("bjs_DefaultArgumentConstructorDefaults_deinit")
-public func _bjs_DefaultArgumentConstructorDefaults_deinit(_ pointer: UnsafeMutableRawPointer) -> Void {
+@_expose(wasm, "bjs_SwiftDataProcessor_getAPIResult")
+@_cdecl("bjs_SwiftDataProcessor_getAPIResult")
+public func _bjs_SwiftDataProcessor_getAPIResult(_ _self: UnsafeMutableRawPointer) -> Void {
     #if arch(wasm32)
-    Unmanaged<DefaultArgumentConstructorDefaults>.fromOpaque(pointer).release()
+    let ret = SwiftDataProcessor.bridgeJSLiftParameter(_self).getAPIResult()
+    return ret.bridgeJSLowerReturn()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-extension DefaultArgumentConstructorDefaults: ConvertibleToJSValue, _BridgedSwiftHeapObject, _BridgedSwiftProtocolExportable {
-    var jsValue: JSValue {
-        return .object(JSObject(id: UInt32(bitPattern: _bjs_DefaultArgumentConstructorDefaults_wrap(Unmanaged.passRetained(self).toOpaque()))))
-    }
-    consuming func bridgeJSLowerAsProtocolReturn() -> Int32 {
-        _bjs_DefaultArgumentConstructorDefaults_wrap(Unmanaged.passRetained(self).toOpaque())
-    }
-}
-
-#if arch(wasm32)
-@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DefaultArgumentConstructorDefaults_wrap")
-fileprivate func _bjs_DefaultArgumentConstructorDefaults_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32
-#else
-fileprivate func _bjs_DefaultArgumentConstructorDefaults_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 {
-    fatalError("Only available on WebAssembly")
-}
-#endif
-@inline(never) fileprivate func _bjs_DefaultArgumentConstructorDefaults_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 {
-    return _bjs_DefaultArgumentConstructorDefaults_wrap_extern(pointer)
-}
-
-@_expose(wasm, "bjs_Greeter_init")
-@_cdecl("bjs_Greeter_init")
-public func _bjs_Greeter_init(_ nameBytes: Int32, _ nameLength: Int32) -> UnsafeMutableRawPointer {
+@_expose(wasm, "bjs_SwiftDataProcessor_count_get")
+@_cdecl("bjs_SwiftDataProcessor_count_get")
+public func _bjs_SwiftDataProcessor_count_get(_ _self: UnsafeMutableRawPointer) -> Int32 {
     #if arch(wasm32)
-    let ret = Greeter(name: String.bridgeJSLiftParameter(nameBytes, nameLength))
+    let ret = SwiftDataProcessor.bridgeJSLiftParameter(_self).count
     return ret.bridgeJSLowerReturn()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_Greeter_greet")
-@_cdecl("bjs_Greeter_greet")
-public func _bjs_Greeter_greet(_ _self: UnsafeMutableRawPointer) -> Void {
+@_expose(wasm, "bjs_SwiftDataProcessor_count_set")
+@_cdecl("bjs_SwiftDataProcessor_count_set")
+public func _bjs_SwiftDataProcessor_count_set(_ _self: UnsafeMutableRawPointer, _ value: Int32) -> Void {
     #if arch(wasm32)
-    let ret = Greeter.bridgeJSLiftParameter(_self).greet()
-    return ret.bridgeJSLowerReturn()
+    SwiftDataProcessor.bridgeJSLiftParameter(_self).count = Int.bridgeJSLiftParameter(value)
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_Greeter_changeName")
-@_cdecl("bjs_Greeter_changeName")
-public func _bjs_Greeter_changeName(_ _self: UnsafeMutableRawPointer, _ nameBytes: Int32, _ nameLength: Int32) -> Void {
+@_expose(wasm, "bjs_SwiftDataProcessor_name_get")
+@_cdecl("bjs_SwiftDataProcessor_name_get")
+public func _bjs_SwiftDataProcessor_name_get(_ _self: UnsafeMutableRawPointer) -> Void {
     #if arch(wasm32)
-    Greeter.bridgeJSLiftParameter(_self).changeName(name: String.bridgeJSLiftParameter(nameBytes, nameLength))
+    let ret = SwiftDataProcessor.bridgeJSLiftParameter(_self).name
+    return ret.bridgeJSLowerReturn()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
-
-@_expose(wasm, "bjs_Greeter_greetWith")
-@_cdecl("bjs_Greeter_greetWith")
-public func _bjs_Greeter_greetWith(_ _self: UnsafeMutableRawPointer, _ greeter: UnsafeMutableRawPointer, _ customGreeting: Int32) -> Void {
+
+@_expose(wasm, "bjs_SwiftDataProcessor_optionalTag_get")
+@_cdecl("bjs_SwiftDataProcessor_optionalTag_get")
+public func _bjs_SwiftDataProcessor_optionalTag_get(_ _self: UnsafeMutableRawPointer) -> Void {
     #if arch(wasm32)
-    let ret = Greeter.bridgeJSLiftParameter(_self).greetWith(greeter: Greeter.bridgeJSLiftParameter(greeter), customGreeting: _BJS_Closure_20BridgeJSRuntimeTests7GreeterC_SS.bridgeJSLift(customGreeting))
+    let ret = SwiftDataProcessor.bridgeJSLiftParameter(_self).optionalTag
     return ret.bridgeJSLowerReturn()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_Greeter_makeFormatter")
-@_cdecl("bjs_Greeter_makeFormatter")
-public func _bjs_Greeter_makeFormatter(_ _self: UnsafeMutableRawPointer, _ suffixBytes: Int32, _ suffixLength: Int32) -> Int32 {
+@_expose(wasm, "bjs_SwiftDataProcessor_optionalTag_set")
+@_cdecl("bjs_SwiftDataProcessor_optionalTag_set")
+public func _bjs_SwiftDataProcessor_optionalTag_set(_ _self: UnsafeMutableRawPointer, _ valueIsSome: Int32, _ valueBytes: Int32, _ valueLength: Int32) -> Void {
     #if arch(wasm32)
-    let ret = Greeter.bridgeJSLiftParameter(_self).makeFormatter(suffix: String.bridgeJSLiftParameter(suffixBytes, suffixLength))
-    return JSTypedClosure(ret).bridgeJSLowerReturn()
+    SwiftDataProcessor.bridgeJSLiftParameter(_self).optionalTag = Optional<String>.bridgeJSLiftParameter(valueIsSome, valueBytes, valueLength)
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_Greeter_static_makeCreator")
-@_cdecl("bjs_Greeter_static_makeCreator")
-public func _bjs_Greeter_static_makeCreator(_ defaultNameBytes: Int32, _ defaultNameLength: Int32) -> Int32 {
+@_expose(wasm, "bjs_SwiftDataProcessor_optionalCount_get")
+@_cdecl("bjs_SwiftDataProcessor_optionalCount_get")
+public func _bjs_SwiftDataProcessor_optionalCount_get(_ _self: UnsafeMutableRawPointer) -> Void {
     #if arch(wasm32)
-    let ret = Greeter.makeCreator(defaultName: String.bridgeJSLiftParameter(defaultNameBytes, defaultNameLength))
-    return JSTypedClosure(ret).bridgeJSLowerReturn()
+    let ret = SwiftDataProcessor.bridgeJSLiftParameter(_self).optionalCount
+    return ret.bridgeJSLowerReturn()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_Greeter_makeCustomGreeter")
-@_cdecl("bjs_Greeter_makeCustomGreeter")
-public func _bjs_Greeter_makeCustomGreeter(_ _self: UnsafeMutableRawPointer) -> Int32 {
+@_expose(wasm, "bjs_SwiftDataProcessor_optionalCount_set")
+@_cdecl("bjs_SwiftDataProcessor_optionalCount_set")
+public func _bjs_SwiftDataProcessor_optionalCount_set(_ _self: UnsafeMutableRawPointer, _ valueIsSome: Int32, _ valueValue: Int32) -> Void {
     #if arch(wasm32)
-    let ret = Greeter.bridgeJSLiftParameter(_self).makeCustomGreeter()
-    return JSTypedClosure(ret).bridgeJSLowerReturn()
+    SwiftDataProcessor.bridgeJSLiftParameter(_self).optionalCount = Optional<Int>.bridgeJSLiftParameter(valueIsSome, valueValue)
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_Greeter_greetEnthusiastically")
-@_cdecl("bjs_Greeter_greetEnthusiastically")
-public func _bjs_Greeter_greetEnthusiastically(_ _self: UnsafeMutableRawPointer) -> Void {
+@_expose(wasm, "bjs_SwiftDataProcessor_direction_get")
+@_cdecl("bjs_SwiftDataProcessor_direction_get")
+public func _bjs_SwiftDataProcessor_direction_get(_ _self: UnsafeMutableRawPointer) -> Void {
     #if arch(wasm32)
-    let ret = Greeter.bridgeJSLiftParameter(_self).greetEnthusiastically()
+    let ret = SwiftDataProcessor.bridgeJSLiftParameter(_self).direction
     return ret.bridgeJSLowerReturn()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_Greeter_static_greetAnonymously")
-@_cdecl("bjs_Greeter_static_greetAnonymously")
-public func _bjs_Greeter_static_greetAnonymously() -> Void {
+@_expose(wasm, "bjs_SwiftDataProcessor_direction_set")
+@_cdecl("bjs_SwiftDataProcessor_direction_set")
+public func _bjs_SwiftDataProcessor_direction_set(_ _self: UnsafeMutableRawPointer, _ valueIsSome: Int32, _ valueValue: Int32) -> Void {
     #if arch(wasm32)
-    let ret = Greeter.greetAnonymously()
-    return ret.bridgeJSLowerReturn()
+    SwiftDataProcessor.bridgeJSLiftParameter(_self).direction = Optional<Direction>.bridgeJSLiftParameter(valueIsSome, valueValue)
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_Greeter_name_get")
-@_cdecl("bjs_Greeter_name_get")
-public func _bjs_Greeter_name_get(_ _self: UnsafeMutableRawPointer) -> Void {
+@_expose(wasm, "bjs_SwiftDataProcessor_optionalTheme_get")
+@_cdecl("bjs_SwiftDataProcessor_optionalTheme_get")
+public func _bjs_SwiftDataProcessor_optionalTheme_get(_ _self: UnsafeMutableRawPointer) -> Void {
     #if arch(wasm32)
-    let ret = Greeter.bridgeJSLiftParameter(_self).name
+    let ret = SwiftDataProcessor.bridgeJSLiftParameter(_self).optionalTheme
     return ret.bridgeJSLowerReturn()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_Greeter_name_set")
-@_cdecl("bjs_Greeter_name_set")
-public func _bjs_Greeter_name_set(_ _self: UnsafeMutableRawPointer, _ valueBytes: Int32, _ valueLength: Int32) -> Void {
+@_expose(wasm, "bjs_SwiftDataProcessor_optionalTheme_set")
+@_cdecl("bjs_SwiftDataProcessor_optionalTheme_set")
+public func _bjs_SwiftDataProcessor_optionalTheme_set(_ _self: UnsafeMutableRawPointer, _ valueIsSome: Int32, _ valueBytes: Int32, _ valueLength: Int32) -> Void {
     #if arch(wasm32)
-    Greeter.bridgeJSLiftParameter(_self).name = String.bridgeJSLiftParameter(valueBytes, valueLength)
+    SwiftDataProcessor.bridgeJSLiftParameter(_self).optionalTheme = Optional<Theme>.bridgeJSLiftParameter(valueIsSome, valueBytes, valueLength)
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_Greeter_prefix_get")
-@_cdecl("bjs_Greeter_prefix_get")
-public func _bjs_Greeter_prefix_get(_ _self: UnsafeMutableRawPointer) -> Void {
+@_expose(wasm, "bjs_SwiftDataProcessor_httpStatus_get")
+@_cdecl("bjs_SwiftDataProcessor_httpStatus_get")
+public func _bjs_SwiftDataProcessor_httpStatus_get(_ _self: UnsafeMutableRawPointer) -> Void {
     #if arch(wasm32)
-    let ret = Greeter.bridgeJSLiftParameter(_self).prefix
+    let ret = SwiftDataProcessor.bridgeJSLiftParameter(_self).httpStatus
     return ret.bridgeJSLowerReturn()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_Greeter_nameCount_get")
-@_cdecl("bjs_Greeter_nameCount_get")
-public func _bjs_Greeter_nameCount_get(_ _self: UnsafeMutableRawPointer) -> Int32 {
+@_expose(wasm, "bjs_SwiftDataProcessor_httpStatus_set")
+@_cdecl("bjs_SwiftDataProcessor_httpStatus_set")
+public func _bjs_SwiftDataProcessor_httpStatus_set(_ _self: UnsafeMutableRawPointer, _ valueIsSome: Int32, _ valueValue: Int32) -> Void {
     #if arch(wasm32)
-    let ret = Greeter.bridgeJSLiftParameter(_self).nameCount
-    return ret.bridgeJSLowerReturn()
+    SwiftDataProcessor.bridgeJSLiftParameter(_self).httpStatus = Optional<HttpStatus>.bridgeJSLiftParameter(valueIsSome, valueValue)
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_Greeter_static_defaultGreeting_get")
-@_cdecl("bjs_Greeter_static_defaultGreeting_get")
-public func _bjs_Greeter_static_defaultGreeting_get() -> Void {
+@_expose(wasm, "bjs_SwiftDataProcessor_apiResult_get")
+@_cdecl("bjs_SwiftDataProcessor_apiResult_get")
+public func _bjs_SwiftDataProcessor_apiResult_get(_ _self: UnsafeMutableRawPointer) -> Void {
     #if arch(wasm32)
-    let ret = Greeter.defaultGreeting
+    let ret = SwiftDataProcessor.bridgeJSLiftParameter(_self).apiResult
     return ret.bridgeJSLowerReturn()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_Greeter_deinit")
-@_cdecl("bjs_Greeter_deinit")
-public func _bjs_Greeter_deinit(_ pointer: UnsafeMutableRawPointer) -> Void {
+@_expose(wasm, "bjs_SwiftDataProcessor_apiResult_set")
+@_cdecl("bjs_SwiftDataProcessor_apiResult_set")
+public func _bjs_SwiftDataProcessor_apiResult_set(_ _self: UnsafeMutableRawPointer, _ valueIsSome: Int32, _ valueCaseId: Int32) -> Void {
     #if arch(wasm32)
-    Unmanaged<Greeter>.fromOpaque(pointer).release()
+    SwiftDataProcessor.bridgeJSLiftParameter(_self).apiResult = Optional<APIResult>.bridgeJSLiftParameter(valueIsSome, valueCaseId)
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-extension Greeter: ConvertibleToJSValue, _BridgedSwiftHeapObject, _BridgedSwiftProtocolExportable {
-    public var jsValue: JSValue {
-        return .object(JSObject(id: UInt32(bitPattern: _bjs_Greeter_wrap(Unmanaged.passRetained(self).toOpaque()))))
-    }
-    public consuming func bridgeJSLowerAsProtocolReturn() -> Int32 {
-        _bjs_Greeter_wrap(Unmanaged.passRetained(self).toOpaque())
-    }
-}
-
-#if arch(wasm32)
-@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_Greeter_wrap")
-fileprivate func _bjs_Greeter_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32
-#else
-fileprivate func _bjs_Greeter_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 {
-    fatalError("Only available on WebAssembly")
-}
-#endif
-@inline(never) fileprivate func _bjs_Greeter_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 {
-    return _bjs_Greeter_wrap_extern(pointer)
-}
-
-@_expose(wasm, "bjs_Calculator_square")
-@_cdecl("bjs_Calculator_square")
-public func _bjs_Calculator_square(_ _self: UnsafeMutableRawPointer, _ value: Int32) -> Int32 {
+@_expose(wasm, "bjs_SwiftDataProcessor_helper_get")
+@_cdecl("bjs_SwiftDataProcessor_helper_get")
+public func _bjs_SwiftDataProcessor_helper_get(_ _self: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer {
     #if arch(wasm32)
-    let ret = Calculator.bridgeJSLiftParameter(_self).square(value: Int.bridgeJSLiftParameter(value))
+    let ret = SwiftDataProcessor.bridgeJSLiftParameter(_self).helper
     return ret.bridgeJSLowerReturn()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_Calculator_add")
-@_cdecl("bjs_Calculator_add")
-public func _bjs_Calculator_add(_ _self: UnsafeMutableRawPointer, _ a: Int32, _ b: Int32) -> Int32 {
+@_expose(wasm, "bjs_SwiftDataProcessor_helper_set")
+@_cdecl("bjs_SwiftDataProcessor_helper_set")
+public func _bjs_SwiftDataProcessor_helper_set(_ _self: UnsafeMutableRawPointer, _ value: UnsafeMutableRawPointer) -> Void {
     #if arch(wasm32)
-    let ret = Calculator.bridgeJSLiftParameter(_self).add(a: Int.bridgeJSLiftParameter(a), b: Int.bridgeJSLiftParameter(b))
-    return ret.bridgeJSLowerReturn()
+    SwiftDataProcessor.bridgeJSLiftParameter(_self).helper = Greeter.bridgeJSLiftParameter(value)
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_Calculator_deinit")
-@_cdecl("bjs_Calculator_deinit")
-public func _bjs_Calculator_deinit(_ pointer: UnsafeMutableRawPointer) -> Void {
+@_expose(wasm, "bjs_SwiftDataProcessor_optionalHelper_get")
+@_cdecl("bjs_SwiftDataProcessor_optionalHelper_get")
+public func _bjs_SwiftDataProcessor_optionalHelper_get(_ _self: UnsafeMutableRawPointer) -> Void {
     #if arch(wasm32)
-    Unmanaged<Calculator>.fromOpaque(pointer).release()
+    let ret = SwiftDataProcessor.bridgeJSLiftParameter(_self).optionalHelper
+    return ret.bridgeJSLowerReturn()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-extension Calculator: ConvertibleToJSValue, _BridgedSwiftHeapObject, _BridgedSwiftProtocolExportable {
-    var jsValue: JSValue {
-        return .object(JSObject(id: UInt32(bitPattern: _bjs_Calculator_wrap(Unmanaged.passRetained(self).toOpaque()))))
-    }
-    consuming func bridgeJSLowerAsProtocolReturn() -> Int32 {
-        _bjs_Calculator_wrap(Unmanaged.passRetained(self).toOpaque())
-    }
-}
-
-#if arch(wasm32)
-@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_Calculator_wrap")
-fileprivate func _bjs_Calculator_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32
-#else
-fileprivate func _bjs_Calculator_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 {
-    fatalError("Only available on WebAssembly")
-}
-#endif
-@inline(never) fileprivate func _bjs_Calculator_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 {
-    return _bjs_Calculator_wrap_extern(pointer)
-}
-
-@_expose(wasm, "bjs_InternalGreeter_deinit")
-@_cdecl("bjs_InternalGreeter_deinit")
-public func _bjs_InternalGreeter_deinit(_ pointer: UnsafeMutableRawPointer) -> Void {
+@_expose(wasm, "bjs_SwiftDataProcessor_optionalHelper_set")
+@_cdecl("bjs_SwiftDataProcessor_optionalHelper_set")
+public func _bjs_SwiftDataProcessor_optionalHelper_set(_ _self: UnsafeMutableRawPointer, _ valueIsSome: Int32, _ valueValue: UnsafeMutableRawPointer) -> Void {
     #if arch(wasm32)
-    Unmanaged<InternalGreeter>.fromOpaque(pointer).release()
+    SwiftDataProcessor.bridgeJSLiftParameter(_self).optionalHelper = Optional<Greeter>.bridgeJSLiftParameter(valueIsSome, valueValue)
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-extension InternalGreeter: ConvertibleToJSValue, _BridgedSwiftHeapObject, _BridgedSwiftProtocolExportable {
-    internal var jsValue: JSValue {
-        return .object(JSObject(id: UInt32(bitPattern: _bjs_InternalGreeter_wrap(Unmanaged.passRetained(self).toOpaque()))))
-    }
-    internal consuming func bridgeJSLowerAsProtocolReturn() -> Int32 {
-        _bjs_InternalGreeter_wrap(Unmanaged.passRetained(self).toOpaque())
-    }
-}
-
-#if arch(wasm32)
-@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_InternalGreeter_wrap")
-fileprivate func _bjs_InternalGreeter_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32
-#else
-fileprivate func _bjs_InternalGreeter_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 {
-    fatalError("Only available on WebAssembly")
-}
-#endif
-@inline(never) fileprivate func _bjs_InternalGreeter_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 {
-    return _bjs_InternalGreeter_wrap_extern(pointer)
-}
-
-@_expose(wasm, "bjs_PublicGreeter_deinit")
-@_cdecl("bjs_PublicGreeter_deinit")
-public func _bjs_PublicGreeter_deinit(_ pointer: UnsafeMutableRawPointer) -> Void {
+@_expose(wasm, "bjs_SwiftDataProcessor_deinit")
+@_cdecl("bjs_SwiftDataProcessor_deinit")
+public func _bjs_SwiftDataProcessor_deinit(_ pointer: UnsafeMutableRawPointer) -> Void {
     #if arch(wasm32)
-    Unmanaged<PublicGreeter>.fromOpaque(pointer).release()
+    Unmanaged<SwiftDataProcessor>.fromOpaque(pointer).release()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-extension PublicGreeter: ConvertibleToJSValue, _BridgedSwiftHeapObject, _BridgedSwiftProtocolExportable {
-    public var jsValue: JSValue {
-        return .object(JSObject(id: UInt32(bitPattern: _bjs_PublicGreeter_wrap(Unmanaged.passRetained(self).toOpaque()))))
+extension SwiftDataProcessor: ConvertibleToJSValue, _BridgedSwiftHeapObject, _BridgedSwiftProtocolExportable {
+    var jsValue: JSValue {
+        return .object(JSObject(id: UInt32(bitPattern: _bjs_SwiftDataProcessor_wrap(Unmanaged.passRetained(self).toOpaque()))))
     }
-    public consuming func bridgeJSLowerAsProtocolReturn() -> Int32 {
-        _bjs_PublicGreeter_wrap(Unmanaged.passRetained(self).toOpaque())
+    consuming func bridgeJSLowerAsProtocolReturn() -> Int32 {
+        _bjs_SwiftDataProcessor_wrap(Unmanaged.passRetained(self).toOpaque())
     }
 }
 
 #if arch(wasm32)
-@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_PublicGreeter_wrap")
-fileprivate func _bjs_PublicGreeter_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_SwiftDataProcessor_wrap")
+fileprivate func _bjs_SwiftDataProcessor_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32
 #else
-fileprivate func _bjs_PublicGreeter_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 {
+fileprivate func _bjs_SwiftDataProcessor_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 {
     fatalError("Only available on WebAssembly")
 }
 #endif
-@inline(never) fileprivate func _bjs_PublicGreeter_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 {
-    return _bjs_PublicGreeter_wrap_extern(pointer)
+@inline(never) fileprivate func _bjs_SwiftDataProcessor_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 {
+    return _bjs_SwiftDataProcessor_wrap_extern(pointer)
 }
 
-@_expose(wasm, "bjs_PackageGreeter_deinit")
-@_cdecl("bjs_PackageGreeter_deinit")
-public func _bjs_PackageGreeter_deinit(_ pointer: UnsafeMutableRawPointer) -> Void {
+@_expose(wasm, "bjs_ProtocolReturnTests_static_createNativeProcessor")
+@_cdecl("bjs_ProtocolReturnTests_static_createNativeProcessor")
+public func _bjs_ProtocolReturnTests_static_createNativeProcessor() -> Int32 {
     #if arch(wasm32)
-    Unmanaged<PackageGreeter>.fromOpaque(pointer).release()
+    let ret = ProtocolReturnTests.createNativeProcessor() as! _BridgedSwiftProtocolExportable
+    return ret.bridgeJSLowerAsProtocolReturn()
     #else
     fatalError("Only available on WebAssembly")
-    #endif
-}
-
-extension PackageGreeter: ConvertibleToJSValue, _BridgedSwiftHeapObject, _BridgedSwiftProtocolExportable {
-    package var jsValue: JSValue {
-        return .object(JSObject(id: UInt32(bitPattern: _bjs_PackageGreeter_wrap(Unmanaged.passRetained(self).toOpaque()))))
-    }
-    package consuming func bridgeJSLowerAsProtocolReturn() -> Int32 {
-        _bjs_PackageGreeter_wrap(Unmanaged.passRetained(self).toOpaque())
-    }
-}
-
-#if arch(wasm32)
-@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_PackageGreeter_wrap")
-fileprivate func _bjs_PackageGreeter_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32
-#else
-fileprivate func _bjs_PackageGreeter_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 {
-    fatalError("Only available on WebAssembly")
-}
-#endif
-@inline(never) fileprivate func _bjs_PackageGreeter_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 {
-    return _bjs_PackageGreeter_wrap_extern(pointer)
+    #endif
 }
 
-@_expose(wasm, "bjs_Utils_Converter_init")
-@_cdecl("bjs_Utils_Converter_init")
-public func _bjs_Utils_Converter_init() -> UnsafeMutableRawPointer {
+@_expose(wasm, "bjs_ProtocolReturnTests_static_createNativeProcessorOptional")
+@_cdecl("bjs_ProtocolReturnTests_static_createNativeProcessorOptional")
+public func _bjs_ProtocolReturnTests_static_createNativeProcessorOptional() -> Void {
     #if arch(wasm32)
-    let ret = Utils.Converter()
-    return ret.bridgeJSLowerReturn()
+    let ret = ProtocolReturnTests.createNativeProcessorOptional()
+    if let ret {
+        _swift_js_return_optional_object(1, (ret as! _BridgedSwiftProtocolExportable).bridgeJSLowerAsProtocolReturn())
+    } else {
+        _swift_js_return_optional_object(0, 0)
+    }
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_Utils_Converter_toString")
-@_cdecl("bjs_Utils_Converter_toString")
-public func _bjs_Utils_Converter_toString(_ _self: UnsafeMutableRawPointer, _ value: Int32) -> Void {
+@_expose(wasm, "bjs_ProtocolReturnTests_static_createNativeProcessorNil")
+@_cdecl("bjs_ProtocolReturnTests_static_createNativeProcessorNil")
+public func _bjs_ProtocolReturnTests_static_createNativeProcessorNil() -> Void {
     #if arch(wasm32)
-    let ret = Utils.Converter.bridgeJSLiftParameter(_self).toString(value: Int.bridgeJSLiftParameter(value))
-    return ret.bridgeJSLowerReturn()
+    let ret = ProtocolReturnTests.createNativeProcessorNil()
+    if let ret {
+        _swift_js_return_optional_object(1, (ret as! _BridgedSwiftProtocolExportable).bridgeJSLowerAsProtocolReturn())
+    } else {
+        _swift_js_return_optional_object(0, 0)
+    }
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_Utils_Converter_precision_get")
-@_cdecl("bjs_Utils_Converter_precision_get")
-public func _bjs_Utils_Converter_precision_get(_ _self: UnsafeMutableRawPointer) -> Int32 {
+@_expose(wasm, "bjs_ProtocolReturnTests_static_createNativeProcessorArray")
+@_cdecl("bjs_ProtocolReturnTests_static_createNativeProcessorArray")
+public func _bjs_ProtocolReturnTests_static_createNativeProcessorArray() -> Void {
     #if arch(wasm32)
-    let ret = Utils.Converter.bridgeJSLiftParameter(_self).precision
-    return ret.bridgeJSLowerReturn()
+    let ret = ProtocolReturnTests.createNativeProcessorArray()
+    for __bjs_elem_ret in ret {
+        _swift_js_push_i32((__bjs_elem_ret as! _BridgedSwiftProtocolExportable).bridgeJSLowerAsProtocolReturn())
+    }
+    _swift_js_push_i32(Int32(ret.count))
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_Utils_Converter_precision_set")
-@_cdecl("bjs_Utils_Converter_precision_set")
-public func _bjs_Utils_Converter_precision_set(_ _self: UnsafeMutableRawPointer, _ value: Int32) -> Void {
+@_expose(wasm, "bjs_ProtocolReturnTests_static_createNativeProcessorDictionary")
+@_cdecl("bjs_ProtocolReturnTests_static_createNativeProcessorDictionary")
+public func _bjs_ProtocolReturnTests_static_createNativeProcessorDictionary() -> Void {
     #if arch(wasm32)
-    Utils.Converter.bridgeJSLiftParameter(_self).precision = Int.bridgeJSLiftParameter(value)
+    let ret = ProtocolReturnTests.createNativeProcessorDictionary()
+    for __bjs_kv_ret in ret {
+        __bjs_kv_ret.key.bridgeJSStackPush()
+        _swift_js_push_i32((__bjs_kv_ret.value as! _BridgedSwiftProtocolExportable).bridgeJSLowerAsProtocolReturn())
+    }
+    _swift_js_push_i32(Int32(ret.count))
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_Utils_Converter_deinit")
-@_cdecl("bjs_Utils_Converter_deinit")
-public func _bjs_Utils_Converter_deinit(_ pointer: UnsafeMutableRawPointer) -> Void {
+@_expose(wasm, "bjs_ProtocolReturnTests_deinit")
+@_cdecl("bjs_ProtocolReturnTests_deinit")
+public func _bjs_ProtocolReturnTests_deinit(_ pointer: UnsafeMutableRawPointer) -> Void {
     #if arch(wasm32)
-    Unmanaged<Utils.Converter>.fromOpaque(pointer).release()
+    Unmanaged<ProtocolReturnTests>.fromOpaque(pointer).release()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-extension Utils.Converter: ConvertibleToJSValue, _BridgedSwiftHeapObject, _BridgedSwiftProtocolExportable {
+extension ProtocolReturnTests: ConvertibleToJSValue, _BridgedSwiftHeapObject, _BridgedSwiftProtocolExportable {
     var jsValue: JSValue {
-        return .object(JSObject(id: UInt32(bitPattern: _bjs_Utils_Converter_wrap(Unmanaged.passRetained(self).toOpaque()))))
+        return .object(JSObject(id: UInt32(bitPattern: _bjs_ProtocolReturnTests_wrap(Unmanaged.passRetained(self).toOpaque()))))
     }
     consuming func bridgeJSLowerAsProtocolReturn() -> Int32 {
-        _bjs_Utils_Converter_wrap(Unmanaged.passRetained(self).toOpaque())
+        _bjs_ProtocolReturnTests_wrap(Unmanaged.passRetained(self).toOpaque())
     }
 }
 
 #if arch(wasm32)
-@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_Utils_Converter_wrap")
-fileprivate func _bjs_Utils_Converter_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_ProtocolReturnTests_wrap")
+fileprivate func _bjs_ProtocolReturnTests_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32
 #else
-fileprivate func _bjs_Utils_Converter_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 {
+fileprivate func _bjs_ProtocolReturnTests_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 {
     fatalError("Only available on WebAssembly")
 }
 #endif
-@inline(never) fileprivate func _bjs_Utils_Converter_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 {
-    return _bjs_Utils_Converter_wrap_extern(pointer)
+@inline(never) fileprivate func _bjs_ProtocolReturnTests_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 {
+    return _bjs_ProtocolReturnTests_wrap_extern(pointer)
 }
 
-@_expose(wasm, "bjs_Networking_API_HTTPServer_init")
-@_cdecl("bjs_Networking_API_HTTPServer_init")
-public func _bjs_Networking_API_HTTPServer_init() -> UnsafeMutableRawPointer {
+@_expose(wasm, "bjs_TextProcessor_init")
+@_cdecl("bjs_TextProcessor_init")
+public func _bjs_TextProcessor_init(_ transform: Int32) -> UnsafeMutableRawPointer {
     #if arch(wasm32)
-    let ret = Networking.API.HTTPServer()
+    let ret = TextProcessor(transform: _BJS_Closure_20BridgeJSRuntimeTestsSS_SS.bridgeJSLift(transform))
     return ret.bridgeJSLowerReturn()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_Networking_API_HTTPServer_call")
-@_cdecl("bjs_Networking_API_HTTPServer_call")
-public func _bjs_Networking_API_HTTPServer_call(_ _self: UnsafeMutableRawPointer, _ method: Int32) -> Void {
+@_expose(wasm, "bjs_TextProcessor_process")
+@_cdecl("bjs_TextProcessor_process")
+public func _bjs_TextProcessor_process(_ _self: UnsafeMutableRawPointer, _ textBytes: Int32, _ textLength: Int32) -> Void {
     #if arch(wasm32)
-    Networking.API.HTTPServer.bridgeJSLiftParameter(_self).call(_: Networking.API.Method.bridgeJSLiftParameter(method))
+    let ret = TextProcessor.bridgeJSLiftParameter(_self).process(_: String.bridgeJSLiftParameter(textBytes, textLength))
+    return ret.bridgeJSLowerReturn()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_Networking_API_HTTPServer_deinit")
-@_cdecl("bjs_Networking_API_HTTPServer_deinit")
-public func _bjs_Networking_API_HTTPServer_deinit(_ pointer: UnsafeMutableRawPointer) -> Void {
+@_expose(wasm, "bjs_TextProcessor_processWithCustom")
+@_cdecl("bjs_TextProcessor_processWithCustom")
+public func _bjs_TextProcessor_processWithCustom(_ _self: UnsafeMutableRawPointer, _ textBytes: Int32, _ textLength: Int32, _ customTransform: Int32) -> Void {
     #if arch(wasm32)
-    Unmanaged<Networking.API.HTTPServer>.fromOpaque(pointer).release()
+    let ret = TextProcessor.bridgeJSLiftParameter(_self).processWithCustom(_: String.bridgeJSLiftParameter(textBytes, textLength), customTransform: _BJS_Closure_20BridgeJSRuntimeTestsSiSSSd_SS.bridgeJSLift(customTransform))
+    return ret.bridgeJSLowerReturn()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-extension Networking.API.HTTPServer: ConvertibleToJSValue, _BridgedSwiftHeapObject, _BridgedSwiftProtocolExportable {
-    var jsValue: JSValue {
-        return .object(JSObject(id: UInt32(bitPattern: _bjs_Networking_API_HTTPServer_wrap(Unmanaged.passRetained(self).toOpaque()))))
-    }
-    consuming func bridgeJSLowerAsProtocolReturn() -> Int32 {
-        _bjs_Networking_API_HTTPServer_wrap(Unmanaged.passRetained(self).toOpaque())
-    }
-}
-
-#if arch(wasm32)
-@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_Networking_API_HTTPServer_wrap")
-fileprivate func _bjs_Networking_API_HTTPServer_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32
-#else
-fileprivate func _bjs_Networking_API_HTTPServer_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 {
-    fatalError("Only available on WebAssembly")
-}
-#endif
-@inline(never) fileprivate func _bjs_Networking_API_HTTPServer_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 {
-    return _bjs_Networking_API_HTTPServer_wrap_extern(pointer)
-}
-
-@_expose(wasm, "bjs___Swift_Foundation_UUID_init")
-@_cdecl("bjs___Swift_Foundation_UUID_init")
-public func _bjs___Swift_Foundation_UUID_init(_ valueBytes: Int32, _ valueLength: Int32) -> UnsafeMutableRawPointer {
+@_expose(wasm, "bjs_TextProcessor_getTransform")
+@_cdecl("bjs_TextProcessor_getTransform")
+public func _bjs_TextProcessor_getTransform(_ _self: UnsafeMutableRawPointer) -> Int32 {
     #if arch(wasm32)
-    let ret = UUID(value: String.bridgeJSLiftParameter(valueBytes, valueLength))
-    return ret.bridgeJSLowerReturn()
+    let ret = TextProcessor.bridgeJSLiftParameter(_self).getTransform()
+    return JSTypedClosure(ret).bridgeJSLowerReturn()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs___Swift_Foundation_UUID_uuidString")
-@_cdecl("bjs___Swift_Foundation_UUID_uuidString")
-public func _bjs___Swift_Foundation_UUID_uuidString(_ _self: UnsafeMutableRawPointer) -> Void {
+@_expose(wasm, "bjs_TextProcessor_processOptionalString")
+@_cdecl("bjs_TextProcessor_processOptionalString")
+public func _bjs_TextProcessor_processOptionalString(_ _self: UnsafeMutableRawPointer, _ callback: Int32) -> Void {
     #if arch(wasm32)
-    let ret = UUID.bridgeJSLiftParameter(_self).uuidString()
+    let ret = TextProcessor.bridgeJSLiftParameter(_self).processOptionalString(_: _BJS_Closure_20BridgeJSRuntimeTestsSqSS_SS.bridgeJSLift(callback))
     return ret.bridgeJSLowerReturn()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs___Swift_Foundation_UUID_static_fromValue")
-@_cdecl("bjs___Swift_Foundation_UUID_static_fromValue")
-public func _bjs___Swift_Foundation_UUID_static_fromValue(_ valueBytes: Int32, _ valueLength: Int32) -> UnsafeMutableRawPointer {
+@_expose(wasm, "bjs_TextProcessor_processOptionalInt")
+@_cdecl("bjs_TextProcessor_processOptionalInt")
+public func _bjs_TextProcessor_processOptionalInt(_ _self: UnsafeMutableRawPointer, _ callback: Int32) -> Void {
     #if arch(wasm32)
-    let ret = UUID.fromValue(_: String.bridgeJSLiftParameter(valueBytes, valueLength))
+    let ret = TextProcessor.bridgeJSLiftParameter(_self).processOptionalInt(_: _BJS_Closure_20BridgeJSRuntimeTestsSqSi_SS.bridgeJSLift(callback))
     return ret.bridgeJSLowerReturn()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs___Swift_Foundation_UUID_static_placeholder_get")
-@_cdecl("bjs___Swift_Foundation_UUID_static_placeholder_get")
-public func _bjs___Swift_Foundation_UUID_static_placeholder_get() -> Void {
+@_expose(wasm, "bjs_TextProcessor_processOptionalGreeter")
+@_cdecl("bjs_TextProcessor_processOptionalGreeter")
+public func _bjs_TextProcessor_processOptionalGreeter(_ _self: UnsafeMutableRawPointer, _ callback: Int32) -> Void {
     #if arch(wasm32)
-    let ret = UUID.placeholder
+    let ret = TextProcessor.bridgeJSLiftParameter(_self).processOptionalGreeter(_: _BJS_Closure_20BridgeJSRuntimeTestsSq7GreeterC_SS.bridgeJSLift(callback))
     return ret.bridgeJSLowerReturn()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs___Swift_Foundation_UUID_deinit")
-@_cdecl("bjs___Swift_Foundation_UUID_deinit")
-public func _bjs___Swift_Foundation_UUID_deinit(_ pointer: UnsafeMutableRawPointer) -> Void {
+@_expose(wasm, "bjs_TextProcessor_makeOptionalStringFormatter")
+@_cdecl("bjs_TextProcessor_makeOptionalStringFormatter")
+public func _bjs_TextProcessor_makeOptionalStringFormatter(_ _self: UnsafeMutableRawPointer) -> Int32 {
     #if arch(wasm32)
-    Unmanaged<UUID>.fromOpaque(pointer).release()
+    let ret = TextProcessor.bridgeJSLiftParameter(_self).makeOptionalStringFormatter()
+    return JSTypedClosure(ret).bridgeJSLowerReturn()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-extension UUID: ConvertibleToJSValue, _BridgedSwiftHeapObject, _BridgedSwiftProtocolExportable {
-    var jsValue: JSValue {
-        return .object(JSObject(id: UInt32(bitPattern: _bjs___Swift_Foundation_UUID_wrap(Unmanaged.passRetained(self).toOpaque()))))
-    }
-    consuming func bridgeJSLowerAsProtocolReturn() -> Int32 {
-        _bjs___Swift_Foundation_UUID_wrap(Unmanaged.passRetained(self).toOpaque())
-    }
-}
-
-#if arch(wasm32)
-@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs___Swift_Foundation_UUID_wrap")
-fileprivate func _bjs___Swift_Foundation_UUID_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32
-#else
-fileprivate func _bjs___Swift_Foundation_UUID_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 {
+@_expose(wasm, "bjs_TextProcessor_makeOptionalGreeterCreator")
+@_cdecl("bjs_TextProcessor_makeOptionalGreeterCreator")
+public func _bjs_TextProcessor_makeOptionalGreeterCreator(_ _self: UnsafeMutableRawPointer) -> Int32 {
+    #if arch(wasm32)
+    let ret = TextProcessor.bridgeJSLiftParameter(_self).makeOptionalGreeterCreator()
+    return JSTypedClosure(ret).bridgeJSLowerReturn()
+    #else
     fatalError("Only available on WebAssembly")
-}
-#endif
-@inline(never) fileprivate func _bjs___Swift_Foundation_UUID_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 {
-    return _bjs___Swift_Foundation_UUID_wrap_extern(pointer)
+    #endif
 }
 
-@_expose(wasm, "bjs_Networking_APIV2_Internal_TestServer_init")
-@_cdecl("bjs_Networking_APIV2_Internal_TestServer_init")
-public func _bjs_Networking_APIV2_Internal_TestServer_init() -> UnsafeMutableRawPointer {
+@_expose(wasm, "bjs_TextProcessor_processDirection")
+@_cdecl("bjs_TextProcessor_processDirection")
+public func _bjs_TextProcessor_processDirection(_ _self: UnsafeMutableRawPointer, _ callback: Int32) -> Void {
     #if arch(wasm32)
-    let ret = Internal.TestServer()
+    let ret = TextProcessor.bridgeJSLiftParameter(_self).processDirection(_: _BJS_Closure_20BridgeJSRuntimeTests9DirectionO_SS.bridgeJSLift(callback))
     return ret.bridgeJSLowerReturn()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_Networking_APIV2_Internal_TestServer_call")
-@_cdecl("bjs_Networking_APIV2_Internal_TestServer_call")
-public func _bjs_Networking_APIV2_Internal_TestServer_call(_ _self: UnsafeMutableRawPointer, _ method: Int32) -> Void {
+@_expose(wasm, "bjs_TextProcessor_processTheme")
+@_cdecl("bjs_TextProcessor_processTheme")
+public func _bjs_TextProcessor_processTheme(_ _self: UnsafeMutableRawPointer, _ callback: Int32) -> Void {
     #if arch(wasm32)
-    Internal.TestServer.bridgeJSLiftParameter(_self).call(_: Internal.SupportedMethod.bridgeJSLiftParameter(method))
+    let ret = TextProcessor.bridgeJSLiftParameter(_self).processTheme(_: _BJS_Closure_20BridgeJSRuntimeTests5ThemeO_SS.bridgeJSLift(callback))
+    return ret.bridgeJSLowerReturn()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_Networking_APIV2_Internal_TestServer_deinit")
-@_cdecl("bjs_Networking_APIV2_Internal_TestServer_deinit")
-public func _bjs_Networking_APIV2_Internal_TestServer_deinit(_ pointer: UnsafeMutableRawPointer) -> Void {
+@_expose(wasm, "bjs_TextProcessor_processHttpStatus")
+@_cdecl("bjs_TextProcessor_processHttpStatus")
+public func _bjs_TextProcessor_processHttpStatus(_ _self: UnsafeMutableRawPointer, _ callback: Int32) -> Int32 {
     #if arch(wasm32)
-    Unmanaged<Internal.TestServer>.fromOpaque(pointer).release()
+    let ret = TextProcessor.bridgeJSLiftParameter(_self).processHttpStatus(_: _BJS_Closure_20BridgeJSRuntimeTests10HttpStatusO_Si.bridgeJSLift(callback))
+    return ret.bridgeJSLowerReturn()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-extension Internal.TestServer: ConvertibleToJSValue, _BridgedSwiftHeapObject, _BridgedSwiftProtocolExportable {
-    var jsValue: JSValue {
-        return .object(JSObject(id: UInt32(bitPattern: _bjs_Networking_APIV2_Internal_TestServer_wrap(Unmanaged.passRetained(self).toOpaque()))))
-    }
-    consuming func bridgeJSLowerAsProtocolReturn() -> Int32 {
-        _bjs_Networking_APIV2_Internal_TestServer_wrap(Unmanaged.passRetained(self).toOpaque())
-    }
-}
-
-#if arch(wasm32)
-@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_Networking_APIV2_Internal_TestServer_wrap")
-fileprivate func _bjs_Networking_APIV2_Internal_TestServer_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32
-#else
-fileprivate func _bjs_Networking_APIV2_Internal_TestServer_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 {
-    fatalError("Only available on WebAssembly")
-}
-#endif
-@inline(never) fileprivate func _bjs_Networking_APIV2_Internal_TestServer_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 {
-    return _bjs_Networking_APIV2_Internal_TestServer_wrap_extern(pointer)
-}
-
-@_expose(wasm, "bjs_SimplePropertyHolder_init")
-@_cdecl("bjs_SimplePropertyHolder_init")
-public func _bjs_SimplePropertyHolder_init(_ value: Int32) -> UnsafeMutableRawPointer {
+@_expose(wasm, "bjs_TextProcessor_processAPIResult")
+@_cdecl("bjs_TextProcessor_processAPIResult")
+public func _bjs_TextProcessor_processAPIResult(_ _self: UnsafeMutableRawPointer, _ callback: Int32) -> Void {
     #if arch(wasm32)
-    let ret = SimplePropertyHolder(value: Int.bridgeJSLiftParameter(value))
+    let ret = TextProcessor.bridgeJSLiftParameter(_self).processAPIResult(_: _BJS_Closure_20BridgeJSRuntimeTests9APIResultO_SS.bridgeJSLift(callback))
     return ret.bridgeJSLowerReturn()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_SimplePropertyHolder_value_get")
-@_cdecl("bjs_SimplePropertyHolder_value_get")
-public func _bjs_SimplePropertyHolder_value_get(_ _self: UnsafeMutableRawPointer) -> Int32 {
+@_expose(wasm, "bjs_TextProcessor_makeDirectionChecker")
+@_cdecl("bjs_TextProcessor_makeDirectionChecker")
+public func _bjs_TextProcessor_makeDirectionChecker(_ _self: UnsafeMutableRawPointer) -> Int32 {
     #if arch(wasm32)
-    let ret = SimplePropertyHolder.bridgeJSLiftParameter(_self).value
-    return ret.bridgeJSLowerReturn()
+    let ret = TextProcessor.bridgeJSLiftParameter(_self).makeDirectionChecker()
+    return JSTypedClosure(ret).bridgeJSLowerReturn()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_SimplePropertyHolder_value_set")
-@_cdecl("bjs_SimplePropertyHolder_value_set")
-public func _bjs_SimplePropertyHolder_value_set(_ _self: UnsafeMutableRawPointer, _ value: Int32) -> Void {
+@_expose(wasm, "bjs_TextProcessor_makeThemeValidator")
+@_cdecl("bjs_TextProcessor_makeThemeValidator")
+public func _bjs_TextProcessor_makeThemeValidator(_ _self: UnsafeMutableRawPointer) -> Int32 {
     #if arch(wasm32)
-    SimplePropertyHolder.bridgeJSLiftParameter(_self).value = Int.bridgeJSLiftParameter(value)
+    let ret = TextProcessor.bridgeJSLiftParameter(_self).makeThemeValidator()
+    return JSTypedClosure(ret).bridgeJSLowerReturn()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_SimplePropertyHolder_deinit")
-@_cdecl("bjs_SimplePropertyHolder_deinit")
-public func _bjs_SimplePropertyHolder_deinit(_ pointer: UnsafeMutableRawPointer) -> Void {
+@_expose(wasm, "bjs_TextProcessor_makeStatusCodeExtractor")
+@_cdecl("bjs_TextProcessor_makeStatusCodeExtractor")
+public func _bjs_TextProcessor_makeStatusCodeExtractor(_ _self: UnsafeMutableRawPointer) -> Int32 {
     #if arch(wasm32)
-    Unmanaged<SimplePropertyHolder>.fromOpaque(pointer).release()
+    let ret = TextProcessor.bridgeJSLiftParameter(_self).makeStatusCodeExtractor()
+    return JSTypedClosure(ret).bridgeJSLowerReturn()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-extension SimplePropertyHolder: ConvertibleToJSValue, _BridgedSwiftHeapObject, _BridgedSwiftProtocolExportable {
-    var jsValue: JSValue {
-        return .object(JSObject(id: UInt32(bitPattern: _bjs_SimplePropertyHolder_wrap(Unmanaged.passRetained(self).toOpaque()))))
-    }
-    consuming func bridgeJSLowerAsProtocolReturn() -> Int32 {
-        _bjs_SimplePropertyHolder_wrap(Unmanaged.passRetained(self).toOpaque())
-    }
-}
-
-#if arch(wasm32)
-@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_SimplePropertyHolder_wrap")
-fileprivate func _bjs_SimplePropertyHolder_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32
-#else
-fileprivate func _bjs_SimplePropertyHolder_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 {
-    fatalError("Only available on WebAssembly")
-}
-#endif
-@inline(never) fileprivate func _bjs_SimplePropertyHolder_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 {
-    return _bjs_SimplePropertyHolder_wrap_extern(pointer)
-}
-
-@_expose(wasm, "bjs_PropertyHolder_init")
-@_cdecl("bjs_PropertyHolder_init")
-public func _bjs_PropertyHolder_init(_ intValue: Int32, _ floatValue: Float32, _ doubleValue: Float64, _ boolValue: Int32, _ stringValueBytes: Int32, _ stringValueLength: Int32, _ jsObject: Int32, _ sibling: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer {
+@_expose(wasm, "bjs_TextProcessor_makeAPIResultHandler")
+@_cdecl("bjs_TextProcessor_makeAPIResultHandler")
+public func _bjs_TextProcessor_makeAPIResultHandler(_ _self: UnsafeMutableRawPointer) -> Int32 {
     #if arch(wasm32)
-    let ret = PropertyHolder(intValue: Int.bridgeJSLiftParameter(intValue), floatValue: Float.bridgeJSLiftParameter(floatValue), doubleValue: Double.bridgeJSLiftParameter(doubleValue), boolValue: Bool.bridgeJSLiftParameter(boolValue), stringValue: String.bridgeJSLiftParameter(stringValueBytes, stringValueLength), jsObject: JSObject.bridgeJSLiftParameter(jsObject), sibling: SimplePropertyHolder.bridgeJSLiftParameter(sibling))
-    return ret.bridgeJSLowerReturn()
+    let ret = TextProcessor.bridgeJSLiftParameter(_self).makeAPIResultHandler()
+    return JSTypedClosure(ret).bridgeJSLowerReturn()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_PropertyHolder_getAllValues")
-@_cdecl("bjs_PropertyHolder_getAllValues")
-public func _bjs_PropertyHolder_getAllValues(_ _self: UnsafeMutableRawPointer) -> Void {
+@_expose(wasm, "bjs_TextProcessor_processOptionalDirection")
+@_cdecl("bjs_TextProcessor_processOptionalDirection")
+public func _bjs_TextProcessor_processOptionalDirection(_ _self: UnsafeMutableRawPointer, _ callback: Int32) -> Void {
     #if arch(wasm32)
-    let ret = PropertyHolder.bridgeJSLiftParameter(_self).getAllValues()
+    let ret = TextProcessor.bridgeJSLiftParameter(_self).processOptionalDirection(_: _BJS_Closure_20BridgeJSRuntimeTestsSq9DirectionO_SS.bridgeJSLift(callback))
     return ret.bridgeJSLowerReturn()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_PropertyHolder_intValue_get")
-@_cdecl("bjs_PropertyHolder_intValue_get")
-public func _bjs_PropertyHolder_intValue_get(_ _self: UnsafeMutableRawPointer) -> Int32 {
+@_expose(wasm, "bjs_TextProcessor_processOptionalTheme")
+@_cdecl("bjs_TextProcessor_processOptionalTheme")
+public func _bjs_TextProcessor_processOptionalTheme(_ _self: UnsafeMutableRawPointer, _ callback: Int32) -> Void {
     #if arch(wasm32)
-    let ret = PropertyHolder.bridgeJSLiftParameter(_self).intValue
+    let ret = TextProcessor.bridgeJSLiftParameter(_self).processOptionalTheme(_: _BJS_Closure_20BridgeJSRuntimeTestsSq5ThemeO_SS.bridgeJSLift(callback))
     return ret.bridgeJSLowerReturn()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_PropertyHolder_intValue_set")
-@_cdecl("bjs_PropertyHolder_intValue_set")
-public func _bjs_PropertyHolder_intValue_set(_ _self: UnsafeMutableRawPointer, _ value: Int32) -> Void {
+@_expose(wasm, "bjs_TextProcessor_processOptionalAPIResult")
+@_cdecl("bjs_TextProcessor_processOptionalAPIResult")
+public func _bjs_TextProcessor_processOptionalAPIResult(_ _self: UnsafeMutableRawPointer, _ callback: Int32) -> Void {
     #if arch(wasm32)
-    PropertyHolder.bridgeJSLiftParameter(_self).intValue = Int.bridgeJSLiftParameter(value)
+    let ret = TextProcessor.bridgeJSLiftParameter(_self).processOptionalAPIResult(_: _BJS_Closure_20BridgeJSRuntimeTestsSq9APIResultO_SS.bridgeJSLift(callback))
+    return ret.bridgeJSLowerReturn()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_PropertyHolder_floatValue_get")
-@_cdecl("bjs_PropertyHolder_floatValue_get")
-public func _bjs_PropertyHolder_floatValue_get(_ _self: UnsafeMutableRawPointer) -> Float32 {
+@_expose(wasm, "bjs_TextProcessor_makeOptionalDirectionFormatter")
+@_cdecl("bjs_TextProcessor_makeOptionalDirectionFormatter")
+public func _bjs_TextProcessor_makeOptionalDirectionFormatter(_ _self: UnsafeMutableRawPointer) -> Int32 {
     #if arch(wasm32)
-    let ret = PropertyHolder.bridgeJSLiftParameter(_self).floatValue
-    return ret.bridgeJSLowerReturn()
+    let ret = TextProcessor.bridgeJSLiftParameter(_self).makeOptionalDirectionFormatter()
+    return JSTypedClosure(ret).bridgeJSLowerReturn()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_PropertyHolder_floatValue_set")
-@_cdecl("bjs_PropertyHolder_floatValue_set")
-public func _bjs_PropertyHolder_floatValue_set(_ _self: UnsafeMutableRawPointer, _ value: Float32) -> Void {
+@_expose(wasm, "bjs_TextProcessor_processDataProcessor")
+@_cdecl("bjs_TextProcessor_processDataProcessor")
+public func _bjs_TextProcessor_processDataProcessor(_ _self: UnsafeMutableRawPointer, _ callback: Int32) -> Void {
     #if arch(wasm32)
-    PropertyHolder.bridgeJSLiftParameter(_self).floatValue = Float.bridgeJSLiftParameter(value)
+    let ret = TextProcessor.bridgeJSLiftParameter(_self).processDataProcessor(_: _BJS_Closure_20BridgeJSRuntimeTests13DataProcessorP_SS.bridgeJSLift(callback))
+    return ret.bridgeJSLowerReturn()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_PropertyHolder_doubleValue_get")
-@_cdecl("bjs_PropertyHolder_doubleValue_get")
-public func _bjs_PropertyHolder_doubleValue_get(_ _self: UnsafeMutableRawPointer) -> Float64 {
+@_expose(wasm, "bjs_TextProcessor_makeDataProcessorFactory")
+@_cdecl("bjs_TextProcessor_makeDataProcessorFactory")
+public func _bjs_TextProcessor_makeDataProcessorFactory(_ _self: UnsafeMutableRawPointer) -> Int32 {
     #if arch(wasm32)
-    let ret = PropertyHolder.bridgeJSLiftParameter(_self).doubleValue
-    return ret.bridgeJSLowerReturn()
+    let ret = TextProcessor.bridgeJSLiftParameter(_self).makeDataProcessorFactory()
+    return JSTypedClosure(ret).bridgeJSLowerReturn()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_PropertyHolder_doubleValue_set")
-@_cdecl("bjs_PropertyHolder_doubleValue_set")
-public func _bjs_PropertyHolder_doubleValue_set(_ _self: UnsafeMutableRawPointer, _ value: Float64) -> Void {
+@_expose(wasm, "bjs_TextProcessor_roundtripDataProcessor")
+@_cdecl("bjs_TextProcessor_roundtripDataProcessor")
+public func _bjs_TextProcessor_roundtripDataProcessor(_ _self: UnsafeMutableRawPointer, _ callback: Int32) -> Int32 {
     #if arch(wasm32)
-    PropertyHolder.bridgeJSLiftParameter(_self).doubleValue = Double.bridgeJSLiftParameter(value)
+    let ret = TextProcessor.bridgeJSLiftParameter(_self).roundtripDataProcessor(_: _BJS_Closure_20BridgeJSRuntimeTests13DataProcessorP_13DataProcessorP.bridgeJSLift(callback))
+    return JSTypedClosure(ret).bridgeJSLowerReturn()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_PropertyHolder_boolValue_get")
-@_cdecl("bjs_PropertyHolder_boolValue_get")
-public func _bjs_PropertyHolder_boolValue_get(_ _self: UnsafeMutableRawPointer) -> Int32 {
+@_expose(wasm, "bjs_TextProcessor_processOptionalDataProcessor")
+@_cdecl("bjs_TextProcessor_processOptionalDataProcessor")
+public func _bjs_TextProcessor_processOptionalDataProcessor(_ _self: UnsafeMutableRawPointer, _ callback: Int32) -> Void {
     #if arch(wasm32)
-    let ret = PropertyHolder.bridgeJSLiftParameter(_self).boolValue
+    let ret = TextProcessor.bridgeJSLiftParameter(_self).processOptionalDataProcessor(_: _BJS_Closure_20BridgeJSRuntimeTestsSq13DataProcessorP_SS.bridgeJSLift(callback))
     return ret.bridgeJSLowerReturn()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_PropertyHolder_boolValue_set")
-@_cdecl("bjs_PropertyHolder_boolValue_set")
-public func _bjs_PropertyHolder_boolValue_set(_ _self: UnsafeMutableRawPointer, _ value: Int32) -> Void {
+@_expose(wasm, "bjs_TextProcessor_processVector")
+@_cdecl("bjs_TextProcessor_processVector")
+public func _bjs_TextProcessor_processVector(_ _self: UnsafeMutableRawPointer, _ callback: Int32) -> Float64 {
     #if arch(wasm32)
-    PropertyHolder.bridgeJSLiftParameter(_self).boolValue = Bool.bridgeJSLiftParameter(value)
+    let ret = TextProcessor.bridgeJSLiftParameter(_self).processVector(_: _BJS_Closure_20BridgeJSRuntimeTestsSd_8Vector2DV.bridgeJSLift(callback))
+    return ret.bridgeJSLowerReturn()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_PropertyHolder_stringValue_get")
-@_cdecl("bjs_PropertyHolder_stringValue_get")
-public func _bjs_PropertyHolder_stringValue_get(_ _self: UnsafeMutableRawPointer) -> Void {
+@_expose(wasm, "bjs_TextProcessor_processOptionalVector")
+@_cdecl("bjs_TextProcessor_processOptionalVector")
+public func _bjs_TextProcessor_processOptionalVector(_ _self: UnsafeMutableRawPointer, _ callback: Int32) -> Void {
     #if arch(wasm32)
-    let ret = PropertyHolder.bridgeJSLiftParameter(_self).stringValue
+    let ret = TextProcessor.bridgeJSLiftParameter(_self).processOptionalVector(_: _BJS_Closure_20BridgeJSRuntimeTestsSd_Sq8Vector2DV.bridgeJSLift(callback))
     return ret.bridgeJSLowerReturn()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_PropertyHolder_stringValue_set")
-@_cdecl("bjs_PropertyHolder_stringValue_set")
-public func _bjs_PropertyHolder_stringValue_set(_ _self: UnsafeMutableRawPointer, _ valueBytes: Int32, _ valueLength: Int32) -> Void {
+@_expose(wasm, "bjs_TextProcessor_observeVector")
+@_cdecl("bjs_TextProcessor_observeVector")
+public func _bjs_TextProcessor_observeVector(_ _self: UnsafeMutableRawPointer, _ callback: Int32) -> Void {
     #if arch(wasm32)
-    PropertyHolder.bridgeJSLiftParameter(_self).stringValue = String.bridgeJSLiftParameter(valueBytes, valueLength)
+    TextProcessor.bridgeJSLiftParameter(_self).observeVector(_: _BJS_Closure_20BridgeJSRuntimeTests8Vector2DV_y.bridgeJSLift(callback))
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_PropertyHolder_readonlyInt_get")
-@_cdecl("bjs_PropertyHolder_readonlyInt_get")
-public func _bjs_PropertyHolder_readonlyInt_get(_ _self: UnsafeMutableRawPointer) -> Int32 {
+@_expose(wasm, "bjs_TextProcessor_mapVector")
+@_cdecl("bjs_TextProcessor_mapVector")
+public func _bjs_TextProcessor_mapVector(_ _self: UnsafeMutableRawPointer, _ callback: Int32) -> Void {
     #if arch(wasm32)
-    let ret = PropertyHolder.bridgeJSLiftParameter(_self).readonlyInt
+    let ret = TextProcessor.bridgeJSLiftParameter(_self).mapVector(_: Vector2D.bridgeJSLiftParameter(), _: _BJS_Closure_20BridgeJSRuntimeTests8Vector2DV_8Vector2DV.bridgeJSLift(callback))
     return ret.bridgeJSLowerReturn()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_PropertyHolder_readonlyFloat_get")
-@_cdecl("bjs_PropertyHolder_readonlyFloat_get")
-public func _bjs_PropertyHolder_readonlyFloat_get(_ _self: UnsafeMutableRawPointer) -> Float32 {
+@_expose(wasm, "bjs_TextProcessor_deinit")
+@_cdecl("bjs_TextProcessor_deinit")
+public func _bjs_TextProcessor_deinit(_ pointer: UnsafeMutableRawPointer) -> Void {
     #if arch(wasm32)
-    let ret = PropertyHolder.bridgeJSLiftParameter(_self).readonlyFloat
-    return ret.bridgeJSLowerReturn()
+    Unmanaged<TextProcessor>.fromOpaque(pointer).release()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_PropertyHolder_readonlyDouble_get")
-@_cdecl("bjs_PropertyHolder_readonlyDouble_get")
-public func _bjs_PropertyHolder_readonlyDouble_get(_ _self: UnsafeMutableRawPointer) -> Float64 {
+extension TextProcessor: ConvertibleToJSValue, _BridgedSwiftHeapObject, _BridgedSwiftProtocolExportable {
+    var jsValue: JSValue {
+        return .object(JSObject(id: UInt32(bitPattern: _bjs_TextProcessor_wrap(Unmanaged.passRetained(self).toOpaque()))))
+    }
+    consuming func bridgeJSLowerAsProtocolReturn() -> Int32 {
+        _bjs_TextProcessor_wrap(Unmanaged.passRetained(self).toOpaque())
+    }
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_TextProcessor_wrap")
+fileprivate func _bjs_TextProcessor_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32
+#else
+fileprivate func _bjs_TextProcessor_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func _bjs_TextProcessor_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 {
+    return _bjs_TextProcessor_wrap_extern(pointer)
+}
+
+@_expose(wasm, "bjs_NestedTypeHost_init")
+@_cdecl("bjs_NestedTypeHost_init")
+public func _bjs_NestedTypeHost_init() -> UnsafeMutableRawPointer {
     #if arch(wasm32)
-    let ret = PropertyHolder.bridgeJSLiftParameter(_self).readonlyDouble
+    let ret = NestedTypeHost()
     return ret.bridgeJSLowerReturn()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_PropertyHolder_readonlyBool_get")
-@_cdecl("bjs_PropertyHolder_readonlyBool_get")
-public func _bjs_PropertyHolder_readonlyBool_get(_ _self: UnsafeMutableRawPointer) -> Int32 {
+@_expose(wasm, "bjs_NestedTypeHost_describe")
+@_cdecl("bjs_NestedTypeHost_describe")
+public func _bjs_NestedTypeHost_describe(_ _self: UnsafeMutableRawPointer) -> Void {
     #if arch(wasm32)
-    let ret = PropertyHolder.bridgeJSLiftParameter(_self).readonlyBool
+    let ret = NestedTypeHost.bridgeJSLiftParameter(_self).describe()
     return ret.bridgeJSLowerReturn()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_PropertyHolder_readonlyString_get")
-@_cdecl("bjs_PropertyHolder_readonlyString_get")
-public func _bjs_PropertyHolder_readonlyString_get(_ _self: UnsafeMutableRawPointer) -> Void {
+@_expose(wasm, "bjs_NestedTypeHost_deinit")
+@_cdecl("bjs_NestedTypeHost_deinit")
+public func _bjs_NestedTypeHost_deinit(_ pointer: UnsafeMutableRawPointer) -> Void {
     #if arch(wasm32)
-    let ret = PropertyHolder.bridgeJSLiftParameter(_self).readonlyString
-    return ret.bridgeJSLowerReturn()
+    Unmanaged<NestedTypeHost>.fromOpaque(pointer).release()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_PropertyHolder_jsObject_get")
-@_cdecl("bjs_PropertyHolder_jsObject_get")
-public func _bjs_PropertyHolder_jsObject_get(_ _self: UnsafeMutableRawPointer) -> Int32 {
+extension NestedTypeHost: ConvertibleToJSValue, _BridgedSwiftHeapObject, _BridgedSwiftProtocolExportable {
+    var jsValue: JSValue {
+        return .object(JSObject(id: UInt32(bitPattern: _bjs_NestedTypeHost_wrap(Unmanaged.passRetained(self).toOpaque()))))
+    }
+    consuming func bridgeJSLowerAsProtocolReturn() -> Int32 {
+        _bjs_NestedTypeHost_wrap(Unmanaged.passRetained(self).toOpaque())
+    }
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_NestedTypeHost_wrap")
+fileprivate func _bjs_NestedTypeHost_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32
+#else
+fileprivate func _bjs_NestedTypeHost_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func _bjs_NestedTypeHost_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 {
+    return _bjs_NestedTypeHost_wrap_extern(pointer)
+}
+
+@_expose(wasm, "bjs_Library_init")
+@_cdecl("bjs_Library_init")
+public func _bjs_Library_init(_ nameBytes: Int32, _ nameLength: Int32) -> UnsafeMutableRawPointer {
     #if arch(wasm32)
-    let ret = PropertyHolder.bridgeJSLiftParameter(_self).jsObject
+    let ret = Library(name: String.bridgeJSLiftParameter(nameBytes, nameLength))
     return ret.bridgeJSLowerReturn()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_PropertyHolder_jsObject_set")
-@_cdecl("bjs_PropertyHolder_jsObject_set")
-public func _bjs_PropertyHolder_jsObject_set(_ _self: UnsafeMutableRawPointer, _ value: Int32) -> Void {
+@_expose(wasm, "bjs_Library_describe")
+@_cdecl("bjs_Library_describe")
+public func _bjs_Library_describe(_ _self: UnsafeMutableRawPointer) -> Void {
     #if arch(wasm32)
-    PropertyHolder.bridgeJSLiftParameter(_self).jsObject = JSObject.bridgeJSLiftParameter(value)
+    let ret = Library.bridgeJSLiftParameter(_self).describe()
+    return ret.bridgeJSLowerReturn()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_PropertyHolder_sibling_get")
-@_cdecl("bjs_PropertyHolder_sibling_get")
-public func _bjs_PropertyHolder_sibling_get(_ _self: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer {
+@_expose(wasm, "bjs_Library_rename")
+@_cdecl("bjs_Library_rename")
+public func _bjs_Library_rename(_ _self: UnsafeMutableRawPointer, _ titleBytes: Int32, _ titleLength: Int32) -> Void {
     #if arch(wasm32)
-    let ret = PropertyHolder.bridgeJSLiftParameter(_self).sibling
+    let ret = Library.bridgeJSLiftParameter(_self).rename(_: String.bridgeJSLiftParameter(titleBytes, titleLength))
     return ret.bridgeJSLowerReturn()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_PropertyHolder_sibling_set")
-@_cdecl("bjs_PropertyHolder_sibling_set")
-public func _bjs_PropertyHolder_sibling_set(_ _self: UnsafeMutableRawPointer, _ value: UnsafeMutableRawPointer) -> Void {
+@_expose(wasm, "bjs_Library_shelf")
+@_cdecl("bjs_Library_shelf")
+public func _bjs_Library_shelf(_ _self: UnsafeMutableRawPointer, _ labelBytes: Int32, _ labelLength: Int32) -> Void {
     #if arch(wasm32)
-    PropertyHolder.bridgeJSLiftParameter(_self).sibling = SimplePropertyHolder.bridgeJSLiftParameter(value)
+    let ret = Library.bridgeJSLiftParameter(_self).shelf(label: String.bridgeJSLiftParameter(labelBytes, labelLength))
+    return ret.bridgeJSLowerReturn()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_PropertyHolder_lazyValue_get")
-@_cdecl("bjs_PropertyHolder_lazyValue_get")
-public func _bjs_PropertyHolder_lazyValue_get(_ _self: UnsafeMutableRawPointer) -> Void {
+@_expose(wasm, "bjs_Library_name_get")
+@_cdecl("bjs_Library_name_get")
+public func _bjs_Library_name_get(_ _self: UnsafeMutableRawPointer) -> Void {
     #if arch(wasm32)
-    let ret = PropertyHolder.bridgeJSLiftParameter(_self).lazyValue
+    let ret = Library.bridgeJSLiftParameter(_self).name
     return ret.bridgeJSLowerReturn()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_PropertyHolder_lazyValue_set")
-@_cdecl("bjs_PropertyHolder_lazyValue_set")
-public func _bjs_PropertyHolder_lazyValue_set(_ _self: UnsafeMutableRawPointer, _ valueBytes: Int32, _ valueLength: Int32) -> Void {
+@_expose(wasm, "bjs_Library_name_set")
+@_cdecl("bjs_Library_name_set")
+public func _bjs_Library_name_set(_ _self: UnsafeMutableRawPointer, _ valueBytes: Int32, _ valueLength: Int32) -> Void {
     #if arch(wasm32)
-    PropertyHolder.bridgeJSLiftParameter(_self).lazyValue = String.bridgeJSLiftParameter(valueBytes, valueLength)
+    Library.bridgeJSLiftParameter(_self).name = String.bridgeJSLiftParameter(valueBytes, valueLength)
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_PropertyHolder_computedReadonly_get")
-@_cdecl("bjs_PropertyHolder_computedReadonly_get")
-public func _bjs_PropertyHolder_computedReadonly_get(_ _self: UnsafeMutableRawPointer) -> Int32 {
+@_expose(wasm, "bjs_Library_deinit")
+@_cdecl("bjs_Library_deinit")
+public func _bjs_Library_deinit(_ pointer: UnsafeMutableRawPointer) -> Void {
     #if arch(wasm32)
-    let ret = PropertyHolder.bridgeJSLiftParameter(_self).computedReadonly
-    return ret.bridgeJSLowerReturn()
+    Unmanaged<Library>.fromOpaque(pointer).release()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_PropertyHolder_computedReadWrite_get")
-@_cdecl("bjs_PropertyHolder_computedReadWrite_get")
-public func _bjs_PropertyHolder_computedReadWrite_get(_ _self: UnsafeMutableRawPointer) -> Void {
+extension Library: ConvertibleToJSValue, _BridgedSwiftHeapObject, _BridgedSwiftProtocolExportable {
+    var jsValue: JSValue {
+        return .object(JSObject(id: UInt32(bitPattern: _bjs_Library_wrap(Unmanaged.passRetained(self).toOpaque()))))
+    }
+    consuming func bridgeJSLowerAsProtocolReturn() -> Int32 {
+        _bjs_Library_wrap(Unmanaged.passRetained(self).toOpaque())
+    }
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_Library_wrap")
+fileprivate func _bjs_Library_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32
+#else
+fileprivate func _bjs_Library_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func _bjs_Library_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 {
+    return _bjs_Library_wrap_extern(pointer)
+}
+
+@_expose(wasm, "bjs_ImportGenericBox_init")
+@_cdecl("bjs_ImportGenericBox_init")
+public func _bjs_ImportGenericBox_init(_ value: Int32) -> UnsafeMutableRawPointer {
     #if arch(wasm32)
-    let ret = PropertyHolder.bridgeJSLiftParameter(_self).computedReadWrite
+    let ret = ImportGenericBox(value: Int.bridgeJSLiftParameter(value))
     return ret.bridgeJSLowerReturn()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_PropertyHolder_computedReadWrite_set")
-@_cdecl("bjs_PropertyHolder_computedReadWrite_set")
-public func _bjs_PropertyHolder_computedReadWrite_set(_ _self: UnsafeMutableRawPointer, _ valueBytes: Int32, _ valueLength: Int32) -> Void {
+@_expose(wasm, "bjs_ImportGenericBox_get")
+@_cdecl("bjs_ImportGenericBox_get")
+public func _bjs_ImportGenericBox_get(_ _self: UnsafeMutableRawPointer) -> Int32 {
     #if arch(wasm32)
-    PropertyHolder.bridgeJSLiftParameter(_self).computedReadWrite = String.bridgeJSLiftParameter(valueBytes, valueLength)
+    let ret = ImportGenericBox.bridgeJSLiftParameter(_self).get()
+    return ret.bridgeJSLowerReturn()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_PropertyHolder_observedProperty_get")
-@_cdecl("bjs_PropertyHolder_observedProperty_get")
-public func _bjs_PropertyHolder_observedProperty_get(_ _self: UnsafeMutableRawPointer) -> Int32 {
+@_expose(wasm, "bjs_ImportGenericBox_value_get")
+@_cdecl("bjs_ImportGenericBox_value_get")
+public func _bjs_ImportGenericBox_value_get(_ _self: UnsafeMutableRawPointer) -> Int32 {
     #if arch(wasm32)
-    let ret = PropertyHolder.bridgeJSLiftParameter(_self).observedProperty
+    let ret = ImportGenericBox.bridgeJSLiftParameter(_self).value
     return ret.bridgeJSLowerReturn()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_PropertyHolder_observedProperty_set")
-@_cdecl("bjs_PropertyHolder_observedProperty_set")
-public func _bjs_PropertyHolder_observedProperty_set(_ _self: UnsafeMutableRawPointer, _ value: Int32) -> Void {
+@_expose(wasm, "bjs_ImportGenericBox_value_set")
+@_cdecl("bjs_ImportGenericBox_value_set")
+public func _bjs_ImportGenericBox_value_set(_ _self: UnsafeMutableRawPointer, _ value: Int32) -> Void {
     #if arch(wasm32)
-    PropertyHolder.bridgeJSLiftParameter(_self).observedProperty = Int.bridgeJSLiftParameter(value)
+    ImportGenericBox.bridgeJSLiftParameter(_self).value = Int.bridgeJSLiftParameter(value)
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_PropertyHolder_deinit")
-@_cdecl("bjs_PropertyHolder_deinit")
-public func _bjs_PropertyHolder_deinit(_ pointer: UnsafeMutableRawPointer) -> Void {
+@_expose(wasm, "bjs_ImportGenericBox_deinit")
+@_cdecl("bjs_ImportGenericBox_deinit")
+public func _bjs_ImportGenericBox_deinit(_ pointer: UnsafeMutableRawPointer) -> Void {
     #if arch(wasm32)
-    Unmanaged<PropertyHolder>.fromOpaque(pointer).release()
+    Unmanaged<ImportGenericBox>.fromOpaque(pointer).release()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-extension PropertyHolder: ConvertibleToJSValue, _BridgedSwiftHeapObject, _BridgedSwiftProtocolExportable {
+extension ImportGenericBox: ConvertibleToJSValue, _BridgedSwiftHeapObject, _BridgedSwiftProtocolExportable {
     var jsValue: JSValue {
-        return .object(JSObject(id: UInt32(bitPattern: _bjs_PropertyHolder_wrap(Unmanaged.passRetained(self).toOpaque()))))
+        return .object(JSObject(id: UInt32(bitPattern: _bjs_ImportGenericBox_wrap(Unmanaged.passRetained(self).toOpaque()))))
     }
     consuming func bridgeJSLowerAsProtocolReturn() -> Int32 {
-        _bjs_PropertyHolder_wrap(Unmanaged.passRetained(self).toOpaque())
+        _bjs_ImportGenericBox_wrap(Unmanaged.passRetained(self).toOpaque())
     }
 }
 
 #if arch(wasm32)
-@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_PropertyHolder_wrap")
-fileprivate func _bjs_PropertyHolder_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_ImportGenericBox_wrap")
+fileprivate func _bjs_ImportGenericBox_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32
 #else
-fileprivate func _bjs_PropertyHolder_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 {
+fileprivate func _bjs_ImportGenericBox_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 {
     fatalError("Only available on WebAssembly")
 }
 #endif
-@inline(never) fileprivate func _bjs_PropertyHolder_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 {
-    return _bjs_PropertyHolder_wrap_extern(pointer)
+@inline(never) fileprivate func _bjs_ImportGenericBox_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 {
+    return _bjs_ImportGenericBox_wrap_extern(pointer)
 }
 
-@_expose(wasm, "bjs_MathUtils_static_add")
-@_cdecl("bjs_MathUtils_static_add")
-public func _bjs_MathUtils_static_add(_ a: Int32, _ b: Int32) -> Int32 {
+@_expose(wasm, "bjs_JSNameRenamedClass_init")
+@_cdecl("bjs_JSNameRenamedClass_init")
+public func _bjs_JSNameRenamedClass_init(_ value: Int32) -> UnsafeMutableRawPointer {
     #if arch(wasm32)
-    let ret = MathUtils.add(a: Int.bridgeJSLiftParameter(a), b: Int.bridgeJSLiftParameter(b))
+    let ret = JSNameRenamedClass(value: Int.bridgeJSLiftParameter(value))
     return ret.bridgeJSLowerReturn()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_MathUtils_static_substract")
-@_cdecl("bjs_MathUtils_static_substract")
-public func _bjs_MathUtils_static_substract(_ a: Int32, _ b: Int32) -> Int32 {
+@_expose(wasm, "bjs_JSNameRenamedClass_doubled")
+@_cdecl("bjs_JSNameRenamedClass_doubled")
+public func _bjs_JSNameRenamedClass_doubled(_ _self: UnsafeMutableRawPointer) -> Int32 {
     #if arch(wasm32)
-    let ret = MathUtils.substract(a: Int.bridgeJSLiftParameter(a), b: Int.bridgeJSLiftParameter(b))
+    let ret = JSNameRenamedClass.bridgeJSLiftParameter(_self).timesTwo()
     return ret.bridgeJSLowerReturn()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_MathUtils_deinit")
-@_cdecl("bjs_MathUtils_deinit")
-public func _bjs_MathUtils_deinit(_ pointer: UnsafeMutableRawPointer) -> Void {
+@_expose(wasm, "bjs_JSNameRenamedClass_static_makeWithValue")
+@_cdecl("bjs_JSNameRenamedClass_static_makeWithValue")
+public func _bjs_JSNameRenamedClass_static_makeWithValue(_ value: Int32) -> UnsafeMutableRawPointer {
     #if arch(wasm32)
-    Unmanaged<MathUtils>.fromOpaque(pointer).release()
+    let ret = JSNameRenamedClass.create(value: Int.bridgeJSLiftParameter(value))
+    return ret.bridgeJSLowerReturn()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-extension MathUtils: ConvertibleToJSValue, _BridgedSwiftHeapObject, _BridgedSwiftProtocolExportable {
+@_expose(wasm, "bjs_JSNameRenamedClass_value_get")
+@_cdecl("bjs_JSNameRenamedClass_value_get")
+public func _bjs_JSNameRenamedClass_value_get(_ _self: UnsafeMutableRawPointer) -> Int32 {
+    #if arch(wasm32)
+    let ret = JSNameRenamedClass.bridgeJSLiftParameter(_self).value
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_JSNameRenamedClass_value_set")
+@_cdecl("bjs_JSNameRenamedClass_value_set")
+public func _bjs_JSNameRenamedClass_value_set(_ _self: UnsafeMutableRawPointer, _ value: Int32) -> Void {
+    #if arch(wasm32)
+    JSNameRenamedClass.bridgeJSLiftParameter(_self).value = Int.bridgeJSLiftParameter(value)
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_JSNameRenamedClass_deinit")
+@_cdecl("bjs_JSNameRenamedClass_deinit")
+public func _bjs_JSNameRenamedClass_deinit(_ pointer: UnsafeMutableRawPointer) -> Void {
+    #if arch(wasm32)
+    Unmanaged<JSNameRenamedClass>.fromOpaque(pointer).release()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+extension JSNameRenamedClass: ConvertibleToJSValue, _BridgedSwiftHeapObject, _BridgedSwiftProtocolExportable {
     var jsValue: JSValue {
-        return .object(JSObject(id: UInt32(bitPattern: _bjs_MathUtils_wrap(Unmanaged.passRetained(self).toOpaque()))))
+        return .object(JSObject(id: UInt32(bitPattern: _bjs_JSNameRenamedClass_wrap(Unmanaged.passRetained(self).toOpaque()))))
     }
     consuming func bridgeJSLowerAsProtocolReturn() -> Int32 {
-        _bjs_MathUtils_wrap(Unmanaged.passRetained(self).toOpaque())
+        _bjs_JSNameRenamedClass_wrap(Unmanaged.passRetained(self).toOpaque())
     }
 }
 
 #if arch(wasm32)
-@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_MathUtils_wrap")
-fileprivate func _bjs_MathUtils_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_JSNameRenamedClass_wrap")
+fileprivate func _bjs_JSNameRenamedClass_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32
 #else
-fileprivate func _bjs_MathUtils_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 {
+fileprivate func _bjs_JSNameRenamedClass_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 {
     fatalError("Only available on WebAssembly")
 }
 #endif
-@inline(never) fileprivate func _bjs_MathUtils_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 {
-    return _bjs_MathUtils_wrap_extern(pointer)
+@inline(never) fileprivate func _bjs_JSNameRenamedClass_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 {
+    return _bjs_JSNameRenamedClass_wrap_extern(pointer)
 }
 
-@_expose(wasm, "bjs_StaticPropertyHolder_init")
-@_cdecl("bjs_StaticPropertyHolder_init")
-public func _bjs_StaticPropertyHolder_init() -> UnsafeMutableRawPointer {
+@_expose(wasm, "bjs_OptionalHolder_init")
+@_cdecl("bjs_OptionalHolder_init")
+public func _bjs_OptionalHolder_init(_ nullableGreeterIsSome: Int32, _ nullableGreeterValue: UnsafeMutableRawPointer, _ undefinedNumberIsSome: Int32, _ undefinedNumberValue: Float64) -> UnsafeMutableRawPointer {
     #if arch(wasm32)
-    let ret = StaticPropertyHolder()
+    let ret = OptionalHolder(nullableGreeter: Optional<Greeter>.bridgeJSLiftParameter(nullableGreeterIsSome, nullableGreeterValue), undefinedNumber: JSUndefinedOr<Double>.bridgeJSLiftParameter(undefinedNumberIsSome, undefinedNumberValue))
     return ret.bridgeJSLowerReturn()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_StaticPropertyHolder_static_staticConstant_get")
-@_cdecl("bjs_StaticPropertyHolder_static_staticConstant_get")
-public func _bjs_StaticPropertyHolder_static_staticConstant_get() -> Void {
+@_expose(wasm, "bjs_OptionalHolder_nullableGreeter_get")
+@_cdecl("bjs_OptionalHolder_nullableGreeter_get")
+public func _bjs_OptionalHolder_nullableGreeter_get(_ _self: UnsafeMutableRawPointer) -> Void {
     #if arch(wasm32)
-    let ret = StaticPropertyHolder.staticConstant
+    let ret = OptionalHolder.bridgeJSLiftParameter(_self).nullableGreeter
     return ret.bridgeJSLowerReturn()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_StaticPropertyHolder_static_staticVariable_get")
-@_cdecl("bjs_StaticPropertyHolder_static_staticVariable_get")
-public func _bjs_StaticPropertyHolder_static_staticVariable_get() -> Int32 {
+@_expose(wasm, "bjs_OptionalHolder_nullableGreeter_set")
+@_cdecl("bjs_OptionalHolder_nullableGreeter_set")
+public func _bjs_OptionalHolder_nullableGreeter_set(_ _self: UnsafeMutableRawPointer, _ valueIsSome: Int32, _ valueValue: UnsafeMutableRawPointer) -> Void {
     #if arch(wasm32)
-    let ret = StaticPropertyHolder.staticVariable
-    return ret.bridgeJSLowerReturn()
+    OptionalHolder.bridgeJSLiftParameter(_self).nullableGreeter = Optional<Greeter>.bridgeJSLiftParameter(valueIsSome, valueValue)
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_StaticPropertyHolder_static_staticVariable_set")
-@_cdecl("bjs_StaticPropertyHolder_static_staticVariable_set")
-public func _bjs_StaticPropertyHolder_static_staticVariable_set(_ value: Int32) -> Void {
+@_expose(wasm, "bjs_OptionalHolder_undefinedNumber_get")
+@_cdecl("bjs_OptionalHolder_undefinedNumber_get")
+public func _bjs_OptionalHolder_undefinedNumber_get(_ _self: UnsafeMutableRawPointer) -> Void {
     #if arch(wasm32)
-    StaticPropertyHolder.staticVariable = Int.bridgeJSLiftParameter(value)
+    let ret = OptionalHolder.bridgeJSLiftParameter(_self).undefinedNumber
+    return ret.bridgeJSLowerReturn()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_StaticPropertyHolder_static_staticString_get")
-@_cdecl("bjs_StaticPropertyHolder_static_staticString_get")
-public func _bjs_StaticPropertyHolder_static_staticString_get() -> Void {
+@_expose(wasm, "bjs_OptionalHolder_undefinedNumber_set")
+@_cdecl("bjs_OptionalHolder_undefinedNumber_set")
+public func _bjs_OptionalHolder_undefinedNumber_set(_ _self: UnsafeMutableRawPointer, _ valueIsSome: Int32, _ valueValue: Float64) -> Void {
     #if arch(wasm32)
-    let ret = StaticPropertyHolder.staticString
-    return ret.bridgeJSLowerReturn()
+    OptionalHolder.bridgeJSLiftParameter(_self).undefinedNumber = JSUndefinedOr<Double>.bridgeJSLiftParameter(valueIsSome, valueValue)
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_StaticPropertyHolder_static_staticString_set")
-@_cdecl("bjs_StaticPropertyHolder_static_staticString_set")
-public func _bjs_StaticPropertyHolder_static_staticString_set(_ valueBytes: Int32, _ valueLength: Int32) -> Void {
+@_expose(wasm, "bjs_OptionalHolder_deinit")
+@_cdecl("bjs_OptionalHolder_deinit")
+public func _bjs_OptionalHolder_deinit(_ pointer: UnsafeMutableRawPointer) -> Void {
     #if arch(wasm32)
-    StaticPropertyHolder.staticString = String.bridgeJSLiftParameter(valueBytes, valueLength)
+    Unmanaged<OptionalHolder>.fromOpaque(pointer).release()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_StaticPropertyHolder_static_staticBool_get")
-@_cdecl("bjs_StaticPropertyHolder_static_staticBool_get")
-public func _bjs_StaticPropertyHolder_static_staticBool_get() -> Int32 {
-    #if arch(wasm32)
-    let ret = StaticPropertyHolder.staticBool
-    return ret.bridgeJSLowerReturn()
-    #else
+extension OptionalHolder: ConvertibleToJSValue, _BridgedSwiftHeapObject, _BridgedSwiftProtocolExportable {
+    var jsValue: JSValue {
+        return .object(JSObject(id: UInt32(bitPattern: _bjs_OptionalHolder_wrap(Unmanaged.passRetained(self).toOpaque()))))
+    }
+    consuming func bridgeJSLowerAsProtocolReturn() -> Int32 {
+        _bjs_OptionalHolder_wrap(Unmanaged.passRetained(self).toOpaque())
+    }
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_OptionalHolder_wrap")
+fileprivate func _bjs_OptionalHolder_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32
+#else
+fileprivate func _bjs_OptionalHolder_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 {
     fatalError("Only available on WebAssembly")
-    #endif
+}
+#endif
+@inline(never) fileprivate func _bjs_OptionalHolder_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 {
+    return _bjs_OptionalHolder_wrap_extern(pointer)
 }
 
-@_expose(wasm, "bjs_StaticPropertyHolder_static_staticBool_set")
-@_cdecl("bjs_StaticPropertyHolder_static_staticBool_set")
-public func _bjs_StaticPropertyHolder_static_staticBool_set(_ value: Int32) -> Void {
+@_expose(wasm, "bjs_OptionalPropertyHolder_init")
+@_cdecl("bjs_OptionalPropertyHolder_init")
+public func _bjs_OptionalPropertyHolder_init(_ optionalNameIsSome: Int32, _ optionalNameBytes: Int32, _ optionalNameLength: Int32) -> UnsafeMutableRawPointer {
     #if arch(wasm32)
-    StaticPropertyHolder.staticBool = Bool.bridgeJSLiftParameter(value)
+    let ret = OptionalPropertyHolder(optionalName: Optional<String>.bridgeJSLiftParameter(optionalNameIsSome, optionalNameBytes, optionalNameLength))
+    return ret.bridgeJSLowerReturn()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_StaticPropertyHolder_static_staticFloat_get")
-@_cdecl("bjs_StaticPropertyHolder_static_staticFloat_get")
-public func _bjs_StaticPropertyHolder_static_staticFloat_get() -> Float32 {
+@_expose(wasm, "bjs_OptionalPropertyHolder_optionalName_get")
+@_cdecl("bjs_OptionalPropertyHolder_optionalName_get")
+public func _bjs_OptionalPropertyHolder_optionalName_get(_ _self: UnsafeMutableRawPointer) -> Void {
     #if arch(wasm32)
-    let ret = StaticPropertyHolder.staticFloat
+    let ret = OptionalPropertyHolder.bridgeJSLiftParameter(_self).optionalName
     return ret.bridgeJSLowerReturn()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_StaticPropertyHolder_static_staticFloat_set")
-@_cdecl("bjs_StaticPropertyHolder_static_staticFloat_set")
-public func _bjs_StaticPropertyHolder_static_staticFloat_set(_ value: Float32) -> Void {
+@_expose(wasm, "bjs_OptionalPropertyHolder_optionalName_set")
+@_cdecl("bjs_OptionalPropertyHolder_optionalName_set")
+public func _bjs_OptionalPropertyHolder_optionalName_set(_ _self: UnsafeMutableRawPointer, _ valueIsSome: Int32, _ valueBytes: Int32, _ valueLength: Int32) -> Void {
     #if arch(wasm32)
-    StaticPropertyHolder.staticFloat = Float.bridgeJSLiftParameter(value)
+    OptionalPropertyHolder.bridgeJSLiftParameter(_self).optionalName = Optional<String>.bridgeJSLiftParameter(valueIsSome, valueBytes, valueLength)
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_StaticPropertyHolder_static_staticDouble_get")
-@_cdecl("bjs_StaticPropertyHolder_static_staticDouble_get")
-public func _bjs_StaticPropertyHolder_static_staticDouble_get() -> Float64 {
+@_expose(wasm, "bjs_OptionalPropertyHolder_optionalAge_get")
+@_cdecl("bjs_OptionalPropertyHolder_optionalAge_get")
+public func _bjs_OptionalPropertyHolder_optionalAge_get(_ _self: UnsafeMutableRawPointer) -> Void {
     #if arch(wasm32)
-    let ret = StaticPropertyHolder.staticDouble
+    let ret = OptionalPropertyHolder.bridgeJSLiftParameter(_self).optionalAge
     return ret.bridgeJSLowerReturn()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_StaticPropertyHolder_static_staticDouble_set")
-@_cdecl("bjs_StaticPropertyHolder_static_staticDouble_set")
-public func _bjs_StaticPropertyHolder_static_staticDouble_set(_ value: Float64) -> Void {
+@_expose(wasm, "bjs_OptionalPropertyHolder_optionalAge_set")
+@_cdecl("bjs_OptionalPropertyHolder_optionalAge_set")
+public func _bjs_OptionalPropertyHolder_optionalAge_set(_ _self: UnsafeMutableRawPointer, _ valueIsSome: Int32, _ valueValue: Int32) -> Void {
     #if arch(wasm32)
-    StaticPropertyHolder.staticDouble = Double.bridgeJSLiftParameter(value)
+    OptionalPropertyHolder.bridgeJSLiftParameter(_self).optionalAge = Optional<Int>.bridgeJSLiftParameter(valueIsSome, valueValue)
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_StaticPropertyHolder_static_computedProperty_get")
-@_cdecl("bjs_StaticPropertyHolder_static_computedProperty_get")
-public func _bjs_StaticPropertyHolder_static_computedProperty_get() -> Void {
+@_expose(wasm, "bjs_OptionalPropertyHolder_optionalGreeter_get")
+@_cdecl("bjs_OptionalPropertyHolder_optionalGreeter_get")
+public func _bjs_OptionalPropertyHolder_optionalGreeter_get(_ _self: UnsafeMutableRawPointer) -> Void {
     #if arch(wasm32)
-    let ret = StaticPropertyHolder.computedProperty
+    let ret = OptionalPropertyHolder.bridgeJSLiftParameter(_self).optionalGreeter
     return ret.bridgeJSLowerReturn()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_StaticPropertyHolder_static_computedProperty_set")
-@_cdecl("bjs_StaticPropertyHolder_static_computedProperty_set")
-public func _bjs_StaticPropertyHolder_static_computedProperty_set(_ valueBytes: Int32, _ valueLength: Int32) -> Void {
+@_expose(wasm, "bjs_OptionalPropertyHolder_optionalGreeter_set")
+@_cdecl("bjs_OptionalPropertyHolder_optionalGreeter_set")
+public func _bjs_OptionalPropertyHolder_optionalGreeter_set(_ _self: UnsafeMutableRawPointer, _ valueIsSome: Int32, _ valueValue: UnsafeMutableRawPointer) -> Void {
     #if arch(wasm32)
-    StaticPropertyHolder.computedProperty = String.bridgeJSLiftParameter(valueBytes, valueLength)
+    OptionalPropertyHolder.bridgeJSLiftParameter(_self).optionalGreeter = Optional<Greeter>.bridgeJSLiftParameter(valueIsSome, valueValue)
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_StaticPropertyHolder_static_readOnlyComputed_get")
-@_cdecl("bjs_StaticPropertyHolder_static_readOnlyComputed_get")
-public func _bjs_StaticPropertyHolder_static_readOnlyComputed_get() -> Int32 {
+@_expose(wasm, "bjs_OptionalPropertyHolder_deinit")
+@_cdecl("bjs_OptionalPropertyHolder_deinit")
+public func _bjs_OptionalPropertyHolder_deinit(_ pointer: UnsafeMutableRawPointer) -> Void {
     #if arch(wasm32)
-    let ret = StaticPropertyHolder.readOnlyComputed
-    return ret.bridgeJSLowerReturn()
+    Unmanaged<OptionalPropertyHolder>.fromOpaque(pointer).release()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_StaticPropertyHolder_static_optionalString_get")
-@_cdecl("bjs_StaticPropertyHolder_static_optionalString_get")
-public func _bjs_StaticPropertyHolder_static_optionalString_get() -> Void {
-    #if arch(wasm32)
-    let ret = StaticPropertyHolder.optionalString
-    return ret.bridgeJSLowerReturn()
-    #else
+extension OptionalPropertyHolder: ConvertibleToJSValue, _BridgedSwiftHeapObject, _BridgedSwiftProtocolExportable {
+    var jsValue: JSValue {
+        return .object(JSObject(id: UInt32(bitPattern: _bjs_OptionalPropertyHolder_wrap(Unmanaged.passRetained(self).toOpaque()))))
+    }
+    consuming func bridgeJSLowerAsProtocolReturn() -> Int32 {
+        _bjs_OptionalPropertyHolder_wrap(Unmanaged.passRetained(self).toOpaque())
+    }
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_OptionalPropertyHolder_wrap")
+fileprivate func _bjs_OptionalPropertyHolder_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32
+#else
+fileprivate func _bjs_OptionalPropertyHolder_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 {
     fatalError("Only available on WebAssembly")
-    #endif
+}
+#endif
+@inline(never) fileprivate func _bjs_OptionalPropertyHolder_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 {
+    return _bjs_OptionalPropertyHolder_wrap_extern(pointer)
 }
 
-@_expose(wasm, "bjs_StaticPropertyHolder_static_optionalString_set")
-@_cdecl("bjs_StaticPropertyHolder_static_optionalString_set")
-public func _bjs_StaticPropertyHolder_static_optionalString_set(_ valueIsSome: Int32, _ valueBytes: Int32, _ valueLength: Int32) -> Void {
+@_expose(wasm, "bjs_Container_init")
+@_cdecl("bjs_Container_init")
+public func _bjs_Container_init() -> UnsafeMutableRawPointer {
     #if arch(wasm32)
-    StaticPropertyHolder.optionalString = Optional<String>.bridgeJSLiftParameter(valueIsSome, valueBytes, valueLength)
+    let _tmp_config = Optional<Config>.bridgeJSLiftParameter()
+    let _tmp_location = DataPoint.bridgeJSLiftParameter()
+    let ret = Container(location: _tmp_location, config: _tmp_config)
+    return ret.bridgeJSLowerReturn()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_StaticPropertyHolder_static_optionalInt_get")
-@_cdecl("bjs_StaticPropertyHolder_static_optionalInt_get")
-public func _bjs_StaticPropertyHolder_static_optionalInt_get() -> Void {
+@_expose(wasm, "bjs_Container_location_get")
+@_cdecl("bjs_Container_location_get")
+public func _bjs_Container_location_get(_ _self: UnsafeMutableRawPointer) -> Void {
     #if arch(wasm32)
-    let ret = StaticPropertyHolder.optionalInt
+    let ret = Container.bridgeJSLiftParameter(_self).location
     return ret.bridgeJSLowerReturn()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_StaticPropertyHolder_static_optionalInt_set")
-@_cdecl("bjs_StaticPropertyHolder_static_optionalInt_set")
-public func _bjs_StaticPropertyHolder_static_optionalInt_set(_ valueIsSome: Int32, _ valueValue: Int32) -> Void {
+@_expose(wasm, "bjs_Container_location_set")
+@_cdecl("bjs_Container_location_set")
+public func _bjs_Container_location_set(_ _self: UnsafeMutableRawPointer) -> Void {
     #if arch(wasm32)
-    StaticPropertyHolder.optionalInt = Optional<Int>.bridgeJSLiftParameter(valueIsSome, valueValue)
+    Container.bridgeJSLiftParameter(_self).location = DataPoint.bridgeJSLiftParameter()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_StaticPropertyHolder_static_jsObjectProperty_get")
-@_cdecl("bjs_StaticPropertyHolder_static_jsObjectProperty_get")
-public func _bjs_StaticPropertyHolder_static_jsObjectProperty_get() -> Int32 {
+@_expose(wasm, "bjs_Container_config_get")
+@_cdecl("bjs_Container_config_get")
+public func _bjs_Container_config_get(_ _self: UnsafeMutableRawPointer) -> Void {
     #if arch(wasm32)
-    let ret = StaticPropertyHolder.jsObjectProperty
+    let ret = Container.bridgeJSLiftParameter(_self).config
     return ret.bridgeJSLowerReturn()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_StaticPropertyHolder_static_jsObjectProperty_set")
-@_cdecl("bjs_StaticPropertyHolder_static_jsObjectProperty_set")
-public func _bjs_StaticPropertyHolder_static_jsObjectProperty_set(_ value: Int32) -> Void {
+@_expose(wasm, "bjs_Container_config_set")
+@_cdecl("bjs_Container_config_set")
+public func _bjs_Container_config_set(_ _self: UnsafeMutableRawPointer) -> Void {
     #if arch(wasm32)
-    StaticPropertyHolder.jsObjectProperty = JSObject.bridgeJSLiftParameter(value)
+    Container.bridgeJSLiftParameter(_self).config = Optional<Config>.bridgeJSLiftParameter()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_StaticPropertyHolder_deinit")
-@_cdecl("bjs_StaticPropertyHolder_deinit")
-public func _bjs_StaticPropertyHolder_deinit(_ pointer: UnsafeMutableRawPointer) -> Void {
+@_expose(wasm, "bjs_Container_deinit")
+@_cdecl("bjs_Container_deinit")
+public func _bjs_Container_deinit(_ pointer: UnsafeMutableRawPointer) -> Void {
     #if arch(wasm32)
-    Unmanaged<StaticPropertyHolder>.fromOpaque(pointer).release()
+    Unmanaged<Container>.fromOpaque(pointer).release()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-extension StaticPropertyHolder: ConvertibleToJSValue, _BridgedSwiftHeapObject, _BridgedSwiftProtocolExportable {
+extension Container: ConvertibleToJSValue, _BridgedSwiftHeapObject, _BridgedSwiftProtocolExportable {
     var jsValue: JSValue {
-        return .object(JSObject(id: UInt32(bitPattern: _bjs_StaticPropertyHolder_wrap(Unmanaged.passRetained(self).toOpaque()))))
+        return .object(JSObject(id: UInt32(bitPattern: _bjs_Container_wrap(Unmanaged.passRetained(self).toOpaque()))))
     }
     consuming func bridgeJSLowerAsProtocolReturn() -> Int32 {
-        _bjs_StaticPropertyHolder_wrap(Unmanaged.passRetained(self).toOpaque())
+        _bjs_Container_wrap(Unmanaged.passRetained(self).toOpaque())
     }
 }
 
 #if arch(wasm32)
-@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_StaticPropertyHolder_wrap")
-fileprivate func _bjs_StaticPropertyHolder_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_Container_wrap")
+fileprivate func _bjs_Container_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32
 #else
-fileprivate func _bjs_StaticPropertyHolder_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 {
+fileprivate func _bjs_Container_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 {
     fatalError("Only available on WebAssembly")
 }
 #endif
-@inline(never) fileprivate func _bjs_StaticPropertyHolder_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 {
-    return _bjs_StaticPropertyHolder_wrap_extern(pointer)
+@inline(never) fileprivate func _bjs_Container_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 {
+    return _bjs_Container_wrap_extern(pointer)
 }
 
-@_expose(wasm, "bjs_DataProcessorManager_init")
-@_cdecl("bjs_DataProcessorManager_init")
-public func _bjs_DataProcessorManager_init(_ processor: Int32) -> UnsafeMutableRawPointer {
+@_expose(wasm, "bjs_LeakCheck_init")
+@_cdecl("bjs_LeakCheck_init")
+public func _bjs_LeakCheck_init() -> UnsafeMutableRawPointer {
     #if arch(wasm32)
-    let ret = DataProcessorManager(processor: AnyDataProcessor.bridgeJSLiftParameter(processor))
+    let ret = LeakCheck()
     return ret.bridgeJSLowerReturn()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_DataProcessorManager_incrementByAmount")
-@_cdecl("bjs_DataProcessorManager_incrementByAmount")
-public func _bjs_DataProcessorManager_incrementByAmount(_ _self: UnsafeMutableRawPointer, _ amount: Int32) -> Void {
+@_expose(wasm, "bjs_LeakCheck_deinit")
+@_cdecl("bjs_LeakCheck_deinit")
+public func _bjs_LeakCheck_deinit(_ pointer: UnsafeMutableRawPointer) -> Void {
     #if arch(wasm32)
-    DataProcessorManager.bridgeJSLiftParameter(_self).incrementByAmount(_: Int.bridgeJSLiftParameter(amount))
+    Unmanaged<LeakCheck>.fromOpaque(pointer).release()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_DataProcessorManager_setProcessorLabel")
-@_cdecl("bjs_DataProcessorManager_setProcessorLabel")
-public func _bjs_DataProcessorManager_setProcessorLabel(_ _self: UnsafeMutableRawPointer, _ prefixBytes: Int32, _ prefixLength: Int32, _ suffixBytes: Int32, _ suffixLength: Int32) -> Void {
-    #if arch(wasm32)
-    DataProcessorManager.bridgeJSLiftParameter(_self).setProcessorLabel(_: String.bridgeJSLiftParameter(prefixBytes, prefixLength), _: String.bridgeJSLiftParameter(suffixBytes, suffixLength))
-    #else
-    fatalError("Only available on WebAssembly")
-    #endif
+extension LeakCheck: ConvertibleToJSValue, _BridgedSwiftHeapObject, _BridgedSwiftProtocolExportable {
+    public var jsValue: JSValue {
+        return .object(JSObject(id: UInt32(bitPattern: _bjs_LeakCheck_wrap(Unmanaged.passRetained(self).toOpaque()))))
+    }
+    public consuming func bridgeJSLowerAsProtocolReturn() -> Int32 {
+        _bjs_LeakCheck_wrap(Unmanaged.passRetained(self).toOpaque())
+    }
 }
 
-@_expose(wasm, "bjs_DataProcessorManager_isProcessorEven")
-@_cdecl("bjs_DataProcessorManager_isProcessorEven")
-public func _bjs_DataProcessorManager_isProcessorEven(_ _self: UnsafeMutableRawPointer) -> Int32 {
-    #if arch(wasm32)
-    let ret = DataProcessorManager.bridgeJSLiftParameter(_self).isProcessorEven()
-    return ret.bridgeJSLowerReturn()
-    #else
+#if arch(wasm32)
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_LeakCheck_wrap")
+fileprivate func _bjs_LeakCheck_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32
+#else
+fileprivate func _bjs_LeakCheck_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 {
     fatalError("Only available on WebAssembly")
-    #endif
+}
+#endif
+@inline(never) fileprivate func _bjs_LeakCheck_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 {
+    return _bjs_LeakCheck_wrap_extern(pointer)
 }
 
-@_expose(wasm, "bjs_DataProcessorManager_getProcessorLabel")
-@_cdecl("bjs_DataProcessorManager_getProcessorLabel")
-public func _bjs_DataProcessorManager_getProcessorLabel(_ _self: UnsafeMutableRawPointer) -> Void {
-    #if arch(wasm32)
-    let ret = DataProcessorManager.bridgeJSLiftParameter(_self).getProcessorLabel()
-    return ret.bridgeJSLowerReturn()
-    #else
-    fatalError("Only available on WebAssembly")
-    #endif
+extension JSCoordinate: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = JSCoordinate.bridgeJSMakeTypeHandle()
 }
 
-@_expose(wasm, "bjs_DataProcessorManager_getCurrentValue")
-@_cdecl("bjs_DataProcessorManager_getCurrentValue")
-public func _bjs_DataProcessorManager_getCurrentValue(_ _self: UnsafeMutableRawPointer) -> Int32 {
-    #if arch(wasm32)
-    let ret = DataProcessorManager.bridgeJSLiftParameter(_self).getCurrentValue()
-    return ret.bridgeJSLowerReturn()
-    #else
-    fatalError("Only available on WebAssembly")
-    #endif
+extension NestedStructGroupA.Metadata: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = NestedStructGroupA.Metadata.bridgeJSMakeTypeHandle()
 }
 
-@_expose(wasm, "bjs_DataProcessorManager_incrementBoth")
-@_cdecl("bjs_DataProcessorManager_incrementBoth")
-public func _bjs_DataProcessorManager_incrementBoth(_ _self: UnsafeMutableRawPointer) -> Void {
-    #if arch(wasm32)
-    DataProcessorManager.bridgeJSLiftParameter(_self).incrementBoth()
-    #else
-    fatalError("Only available on WebAssembly")
-    #endif
+extension NestedStructGroupB.Metadata: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = NestedStructGroupB.Metadata.bridgeJSMakeTypeHandle()
 }
 
-@_expose(wasm, "bjs_DataProcessorManager_getBackupValue")
-@_cdecl("bjs_DataProcessorManager_getBackupValue")
-public func _bjs_DataProcessorManager_getBackupValue(_ _self: UnsafeMutableRawPointer) -> Void {
-    #if arch(wasm32)
-    let ret = DataProcessorManager.bridgeJSLiftParameter(_self).getBackupValue()
-    return ret.bridgeJSLowerReturn()
-    #else
-    fatalError("Only available on WebAssembly")
-    #endif
+extension NestedTypeHost.Label: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = NestedTypeHost.Label.bridgeJSMakeTypeHandle()
 }
 
-@_expose(wasm, "bjs_DataProcessorManager_hasBackup")
-@_cdecl("bjs_DataProcessorManager_hasBackup")
-public func _bjs_DataProcessorManager_hasBackup(_ _self: UnsafeMutableRawPointer) -> Int32 {
-    #if arch(wasm32)
-    let ret = DataProcessorManager.bridgeJSLiftParameter(_self).hasBackup()
-    return ret.bridgeJSLowerReturn()
-    #else
-    fatalError("Only available on WebAssembly")
-    #endif
+extension Library.Shelf: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = Library.Shelf.bridgeJSMakeTypeHandle()
 }
 
-@_expose(wasm, "bjs_DataProcessorManager_getProcessorOptionalTag")
-@_cdecl("bjs_DataProcessorManager_getProcessorOptionalTag")
-public func _bjs_DataProcessorManager_getProcessorOptionalTag(_ _self: UnsafeMutableRawPointer) -> Void {
-    #if arch(wasm32)
-    let ret = DataProcessorManager.bridgeJSLiftParameter(_self).getProcessorOptionalTag()
-    return ret.bridgeJSLowerReturn()
-    #else
-    fatalError("Only available on WebAssembly")
-    #endif
+extension Library.Shelf.Divider: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = Library.Shelf.Divider.bridgeJSMakeTypeHandle()
 }
 
-@_expose(wasm, "bjs_DataProcessorManager_setProcessorOptionalTag")
-@_cdecl("bjs_DataProcessorManager_setProcessorOptionalTag")
-public func _bjs_DataProcessorManager_setProcessorOptionalTag(_ _self: UnsafeMutableRawPointer, _ tagIsSome: Int32, _ tagBytes: Int32, _ tagLength: Int32) -> Void {
-    #if arch(wasm32)
-    DataProcessorManager.bridgeJSLiftParameter(_self).setProcessorOptionalTag(_: Optional<String>.bridgeJSLiftParameter(tagIsSome, tagBytes, tagLength))
-    #else
-    fatalError("Only available on WebAssembly")
-    #endif
+extension GenericRTPoint: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = GenericRTPoint.bridgeJSMakeTypeHandle()
 }
 
-@_expose(wasm, "bjs_DataProcessorManager_getProcessorOptionalCount")
-@_cdecl("bjs_DataProcessorManager_getProcessorOptionalCount")
-public func _bjs_DataProcessorManager_getProcessorOptionalCount(_ _self: UnsafeMutableRawPointer) -> Void {
-    #if arch(wasm32)
-    let ret = DataProcessorManager.bridgeJSLiftParameter(_self).getProcessorOptionalCount()
-    return ret.bridgeJSLowerReturn()
-    #else
-    fatalError("Only available on WebAssembly")
-    #endif
+extension GenericRTNamespace.Metadata: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = GenericRTNamespace.Metadata.bridgeJSMakeTypeHandle()
 }
 
-@_expose(wasm, "bjs_DataProcessorManager_setProcessorOptionalCount")
-@_cdecl("bjs_DataProcessorManager_setProcessorOptionalCount")
-public func _bjs_DataProcessorManager_setProcessorOptionalCount(_ _self: UnsafeMutableRawPointer, _ countIsSome: Int32, _ countValue: Int32) -> Void {
-    #if arch(wasm32)
-    DataProcessorManager.bridgeJSLiftParameter(_self).setProcessorOptionalCount(_: Optional<Int>.bridgeJSLiftParameter(countIsSome, countValue))
-    #else
-    fatalError("Only available on WebAssembly")
-    #endif
+extension Point: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = Point.bridgeJSMakeTypeHandle()
 }
 
-@_expose(wasm, "bjs_DataProcessorManager_getProcessorDirection")
-@_cdecl("bjs_DataProcessorManager_getProcessorDirection")
-public func _bjs_DataProcessorManager_getProcessorDirection(_ _self: UnsafeMutableRawPointer) -> Void {
-    #if arch(wasm32)
-    let ret = DataProcessorManager.bridgeJSLiftParameter(_self).getProcessorDirection()
-    return ret.bridgeJSLowerReturn()
-    #else
-    fatalError("Only available on WebAssembly")
-    #endif
+extension PointerFields: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = PointerFields.bridgeJSMakeTypeHandle()
+}
+
+extension DataPoint: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = DataPoint.bridgeJSMakeTypeHandle()
+}
+
+extension PublicPoint: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = PublicPoint.bridgeJSMakeTypeHandle()
+}
+
+extension Address: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = Address.bridgeJSMakeTypeHandle()
+}
+
+extension Contact: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = Contact.bridgeJSMakeTypeHandle()
+}
+
+extension Config: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = Config.bridgeJSMakeTypeHandle()
+}
+
+extension SessionData: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = SessionData.bridgeJSMakeTypeHandle()
+}
+
+extension ValidationReport: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = ValidationReport.bridgeJSMakeTypeHandle()
+}
+
+extension AdvancedConfig: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = AdvancedConfig.bridgeJSMakeTypeHandle()
+}
+
+extension MeasurementConfig: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = MeasurementConfig.bridgeJSMakeTypeHandle()
+}
+
+extension MathOperations: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = MathOperations.bridgeJSMakeTypeHandle()
+}
+
+extension CopyableCart: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = CopyableCart.bridgeJSMakeTypeHandle()
+}
+
+extension CopyableCartItem: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = CopyableCartItem.bridgeJSMakeTypeHandle()
+}
+
+extension CopyableNestedCart: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = CopyableNestedCart.bridgeJSMakeTypeHandle()
+}
+
+extension ConfigStruct: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = ConfigStruct.bridgeJSMakeTypeHandle()
+}
+
+extension Vector2D: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = Vector2D.bridgeJSMakeTypeHandle()
+}
+
+extension JSObjectContainer: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = JSObjectContainer.bridgeJSMakeTypeHandle()
+}
+
+extension FooContainer: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = FooContainer.bridgeJSMakeTypeHandle()
+}
+
+extension ArrayMembers: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = ArrayMembers.bridgeJSMakeTypeHandle()
+}
+
+extension PolygonReference: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = PolygonReference.bridgeJSMakeTypeHandle()
+}
+
+extension TagReference: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = TagReference.bridgeJSMakeTypeHandle()
+}
+
+extension TagHolderReference: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = TagHolderReference.bridgeJSMakeTypeHandle()
+}
+
+extension PriorityReference: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = PriorityReference.bridgeJSMakeTypeHandle()
+}
+
+extension ImportGenericBox: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = ImportGenericBox.bridgeJSMakeTypeHandle()
+}
+
+extension Severity: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = Severity.bridgeJSMakeTypeHandle()
+}
+
+extension Shape: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = Shape.bridgeJSMakeTypeHandle()
+}
+
+extension InnerTag: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = InnerTag.bridgeJSMakeTypeHandle()
+}
+
+extension AsyncImportedPayloadResult: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = AsyncImportedPayloadResult.bridgeJSMakeTypeHandle()
+}
+
+extension Workspace.Kind: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = Workspace.Kind.bridgeJSMakeTypeHandle()
+}
+
+extension Direction: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = Direction.bridgeJSMakeTypeHandle()
+}
+
+extension Status: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = Status.bridgeJSMakeTypeHandle()
+}
+
+extension Theme: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = Theme.bridgeJSMakeTypeHandle()
+}
+
+extension HttpStatus: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = HttpStatus.bridgeJSMakeTypeHandle()
+}
+
+extension FileSize: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = FileSize.bridgeJSMakeTypeHandle()
+}
+
+extension SessionId: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = SessionId.bridgeJSMakeTypeHandle()
+}
+
+extension Precision: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = Precision.bridgeJSMakeTypeHandle()
+}
+
+extension Ratio: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = Ratio.bridgeJSMakeTypeHandle()
+}
+
+extension TSDirection: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = TSDirection.bridgeJSMakeTypeHandle()
+}
+
+extension TSTheme: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = TSTheme.bridgeJSMakeTypeHandle()
+}
+
+extension AsyncPayloadResult: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = AsyncPayloadResult.bridgeJSMakeTypeHandle()
+}
+
+extension Networking.API.Method: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = Networking.API.Method.bridgeJSMakeTypeHandle()
 }
 
-@_expose(wasm, "bjs_DataProcessorManager_setProcessorDirection")
-@_cdecl("bjs_DataProcessorManager_setProcessorDirection")
-public func _bjs_DataProcessorManager_setProcessorDirection(_ _self: UnsafeMutableRawPointer, _ directionIsSome: Int32, _ directionValue: Int32) -> Void {
-    #if arch(wasm32)
-    DataProcessorManager.bridgeJSLiftParameter(_self).setProcessorDirection(_: Optional<Direction>.bridgeJSLiftParameter(directionIsSome, directionValue))
-    #else
-    fatalError("Only available on WebAssembly")
-    #endif
+extension Configuration.LogLevel: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = Configuration.LogLevel.bridgeJSMakeTypeHandle()
 }
 
-@_expose(wasm, "bjs_DataProcessorManager_getProcessorTheme")
-@_cdecl("bjs_DataProcessorManager_getProcessorTheme")
-public func _bjs_DataProcessorManager_getProcessorTheme(_ _self: UnsafeMutableRawPointer) -> Void {
-    #if arch(wasm32)
-    let ret = DataProcessorManager.bridgeJSLiftParameter(_self).getProcessorTheme()
-    return ret.bridgeJSLowerReturn()
-    #else
-    fatalError("Only available on WebAssembly")
-    #endif
+extension Configuration.Port: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = Configuration.Port.bridgeJSMakeTypeHandle()
 }
 
-@_expose(wasm, "bjs_DataProcessorManager_setProcessorTheme")
-@_cdecl("bjs_DataProcessorManager_setProcessorTheme")
-public func _bjs_DataProcessorManager_setProcessorTheme(_ _self: UnsafeMutableRawPointer, _ themeIsSome: Int32, _ themeBytes: Int32, _ themeLength: Int32) -> Void {
-    #if arch(wasm32)
-    DataProcessorManager.bridgeJSLiftParameter(_self).setProcessorTheme(_: Optional<Theme>.bridgeJSLiftParameter(themeIsSome, themeBytes, themeLength))
-    #else
-    fatalError("Only available on WebAssembly")
-    #endif
+extension Internal.SupportedMethod: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = Internal.SupportedMethod.bridgeJSMakeTypeHandle()
 }
 
-@_expose(wasm, "bjs_DataProcessorManager_getProcessorHttpStatus")
-@_cdecl("bjs_DataProcessorManager_getProcessorHttpStatus")
-public func _bjs_DataProcessorManager_getProcessorHttpStatus(_ _self: UnsafeMutableRawPointer) -> Void {
-    #if arch(wasm32)
-    let ret = DataProcessorManager.bridgeJSLiftParameter(_self).getProcessorHttpStatus()
-    return ret.bridgeJSLowerReturn()
-    #else
-    fatalError("Only available on WebAssembly")
-    #endif
+extension APIResult: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = APIResult.bridgeJSMakeTypeHandle()
 }
 
-@_expose(wasm, "bjs_DataProcessorManager_setProcessorHttpStatus")
-@_cdecl("bjs_DataProcessorManager_setProcessorHttpStatus")
-public func _bjs_DataProcessorManager_setProcessorHttpStatus(_ _self: UnsafeMutableRawPointer, _ statusIsSome: Int32, _ statusValue: Int32) -> Void {
-    #if arch(wasm32)
-    DataProcessorManager.bridgeJSLiftParameter(_self).setProcessorHttpStatus(_: Optional<HttpStatus>.bridgeJSLiftParameter(statusIsSome, statusValue))
-    #else
-    fatalError("Only available on WebAssembly")
-    #endif
+extension ComplexResult: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = ComplexResult.bridgeJSMakeTypeHandle()
 }
 
-@_expose(wasm, "bjs_DataProcessorManager_getProcessorAPIResult")
-@_cdecl("bjs_DataProcessorManager_getProcessorAPIResult")
-public func _bjs_DataProcessorManager_getProcessorAPIResult(_ _self: UnsafeMutableRawPointer) -> Void {
-    #if arch(wasm32)
-    let ret = DataProcessorManager.bridgeJSLiftParameter(_self).getProcessorAPIResult()
-    return ret.bridgeJSLowerReturn()
-    #else
-    fatalError("Only available on WebAssembly")
-    #endif
+extension Utilities.Result: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = Utilities.Result.bridgeJSMakeTypeHandle()
 }
 
-@_expose(wasm, "bjs_DataProcessorManager_setProcessorAPIResult")
-@_cdecl("bjs_DataProcessorManager_setProcessorAPIResult")
-public func _bjs_DataProcessorManager_setProcessorAPIResult(_ _self: UnsafeMutableRawPointer, _ apiResultIsSome: Int32, _ apiResultCaseId: Int32) -> Void {
-    #if arch(wasm32)
-    DataProcessorManager.bridgeJSLiftParameter(_self).setProcessorAPIResult(_: Optional<APIResult>.bridgeJSLiftParameter(apiResultIsSome, apiResultCaseId))
-    #else
-    fatalError("Only available on WebAssembly")
-    #endif
+extension API.NetworkingResult: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = API.NetworkingResult.bridgeJSMakeTypeHandle()
 }
 
-@_expose(wasm, "bjs_DataProcessorManager_processor_get")
-@_cdecl("bjs_DataProcessorManager_processor_get")
-public func _bjs_DataProcessorManager_processor_get(_ _self: UnsafeMutableRawPointer) -> Int32 {
-    #if arch(wasm32)
-    let ret = DataProcessorManager.bridgeJSLiftParameter(_self).processor as! _BridgedSwiftProtocolExportable
-    return ret.bridgeJSLowerAsProtocolReturn()
-    #else
-    fatalError("Only available on WebAssembly")
-    #endif
+extension AllTypesResult: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = AllTypesResult.bridgeJSMakeTypeHandle()
 }
 
-@_expose(wasm, "bjs_DataProcessorManager_processor_set")
-@_cdecl("bjs_DataProcessorManager_processor_set")
-public func _bjs_DataProcessorManager_processor_set(_ _self: UnsafeMutableRawPointer, _ value: Int32) -> Void {
-    #if arch(wasm32)
-    DataProcessorManager.bridgeJSLiftParameter(_self).processor = AnyDataProcessor.bridgeJSLiftParameter(value)
-    #else
-    fatalError("Only available on WebAssembly")
-    #endif
+extension TypedPayloadResult: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = TypedPayloadResult.bridgeJSMakeTypeHandle()
 }
 
-@_expose(wasm, "bjs_DataProcessorManager_backupProcessor_get")
-@_cdecl("bjs_DataProcessorManager_backupProcessor_get")
-public func _bjs_DataProcessorManager_backupProcessor_get(_ _self: UnsafeMutableRawPointer) -> Void {
-    #if arch(wasm32)
-    let ret = DataProcessorManager.bridgeJSLiftParameter(_self).backupProcessor
-    if let ret {
-        _swift_js_return_optional_object(1, (ret as! _BridgedSwiftProtocolExportable).bridgeJSLowerAsProtocolReturn())
-    } else {
-        _swift_js_return_optional_object(0, 0)
-    }
-    #else
-    fatalError("Only available on WebAssembly")
-    #endif
+extension StaticCalculator: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = StaticCalculator.bridgeJSMakeTypeHandle()
 }
 
-@_expose(wasm, "bjs_DataProcessorManager_backupProcessor_set")
-@_cdecl("bjs_DataProcessorManager_backupProcessor_set")
-public func _bjs_DataProcessorManager_backupProcessor_set(_ _self: UnsafeMutableRawPointer, _ valueIsSome: Int32, _ valueValue: Int32) -> Void {
-    #if arch(wasm32)
-    DataProcessorManager.bridgeJSLiftParameter(_self).backupProcessor = Optional<AnyDataProcessor>.bridgeJSLiftParameter(valueIsSome, valueValue)
-    #else
-    fatalError("Only available on WebAssembly")
-    #endif
+extension StaticPropertyEnum: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = StaticPropertyEnum.bridgeJSMakeTypeHandle()
 }
 
-@_expose(wasm, "bjs_DataProcessorManager_deinit")
-@_cdecl("bjs_DataProcessorManager_deinit")
-public func _bjs_DataProcessorManager_deinit(_ pointer: UnsafeMutableRawPointer) -> Void {
-    #if arch(wasm32)
-    Unmanaged<DataProcessorManager>.fromOpaque(pointer).release()
-    #else
-    fatalError("Only available on WebAssembly")
-    #endif
+extension NestedTypeHost.Variant: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = NestedTypeHost.Variant.bridgeJSMakeTypeHandle()
 }
 
-extension DataProcessorManager: ConvertibleToJSValue, _BridgedSwiftHeapObject, _BridgedSwiftProtocolExportable {
-    var jsValue: JSValue {
-        return .object(JSObject(id: UInt32(bitPattern: _bjs_DataProcessorManager_wrap(Unmanaged.passRetained(self).toOpaque()))))
-    }
-    consuming func bridgeJSLowerAsProtocolReturn() -> Int32 {
-        _bjs_DataProcessorManager_wrap(Unmanaged.passRetained(self).toOpaque())
-    }
+extension Message: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = Message.bridgeJSMakeTypeHandle()
 }
 
-#if arch(wasm32)
-@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessorManager_wrap")
-fileprivate func _bjs_DataProcessorManager_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32
-#else
-fileprivate func _bjs_DataProcessorManager_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 {
-    fatalError("Only available on WebAssembly")
+extension Library.Genre: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = Library.Genre.bridgeJSMakeTypeHandle()
 }
-#endif
-@inline(never) fileprivate func _bjs_DataProcessorManager_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 {
-    return _bjs_DataProcessorManager_wrap_extern(pointer)
+
+extension Message.Update: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = Message.Update.bridgeJSMakeTypeHandle()
 }
 
-@_expose(wasm, "bjs_SwiftDataProcessor_init")
-@_cdecl("bjs_SwiftDataProcessor_init")
-public func _bjs_SwiftDataProcessor_init() -> UnsafeMutableRawPointer {
-    #if arch(wasm32)
-    let ret = SwiftDataProcessor()
-    return ret.bridgeJSLowerReturn()
-    #else
-    fatalError("Only available on WebAssembly")
-    #endif
+extension LightColor: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = LightColor.bridgeJSMakeTypeHandle()
 }
 
-@_expose(wasm, "bjs_SwiftDataProcessor_increment")
-@_cdecl("bjs_SwiftDataProcessor_increment")
-public func _bjs_SwiftDataProcessor_increment(_ _self: UnsafeMutableRawPointer, _ amount: Int32) -> Void {
-    #if arch(wasm32)
-    SwiftDataProcessor.bridgeJSLiftParameter(_self).increment(by: Int.bridgeJSLiftParameter(amount))
-    #else
-    fatalError("Only available on WebAssembly")
-    #endif
+extension ImportedPayloadSignal: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = ImportedPayloadSignal.bridgeJSMakeTypeHandle()
 }
 
-@_expose(wasm, "bjs_SwiftDataProcessor_getValue")
-@_cdecl("bjs_SwiftDataProcessor_getValue")
-public func _bjs_SwiftDataProcessor_getValue(_ _self: UnsafeMutableRawPointer) -> Int32 {
-    #if arch(wasm32)
-    let ret = SwiftDataProcessor.bridgeJSLiftParameter(_self).getValue()
-    return ret.bridgeJSLowerReturn()
-    #else
-    fatalError("Only available on WebAssembly")
-    #endif
+extension GenericRTColor: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = GenericRTColor.bridgeJSMakeTypeHandle()
 }
 
-@_expose(wasm, "bjs_SwiftDataProcessor_setLabelElements")
-@_cdecl("bjs_SwiftDataProcessor_setLabelElements")
-public func _bjs_SwiftDataProcessor_setLabelElements(_ _self: UnsafeMutableRawPointer, _ labelPrefixBytes: Int32, _ labelPrefixLength: Int32, _ labelSuffixBytes: Int32, _ labelSuffixLength: Int32) -> Void {
-    #if arch(wasm32)
-    SwiftDataProcessor.bridgeJSLiftParameter(_self).setLabelElements(_: String.bridgeJSLiftParameter(labelPrefixBytes, labelPrefixLength), _: String.bridgeJSLiftParameter(labelSuffixBytes, labelSuffixLength))
-    #else
-    fatalError("Only available on WebAssembly")
-    #endif
+extension GenericRTMode: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = GenericRTMode.bridgeJSMakeTypeHandle()
 }
 
-@_expose(wasm, "bjs_SwiftDataProcessor_getLabel")
-@_cdecl("bjs_SwiftDataProcessor_getLabel")
-public func _bjs_SwiftDataProcessor_getLabel(_ _self: UnsafeMutableRawPointer) -> Void {
-    #if arch(wasm32)
-    let ret = SwiftDataProcessor.bridgeJSLiftParameter(_self).getLabel()
-    return ret.bridgeJSLowerReturn()
-    #else
-    fatalError("Only available on WebAssembly")
-    #endif
+extension GenericRTLevel: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = GenericRTLevel.bridgeJSMakeTypeHandle()
 }
 
-@_expose(wasm, "bjs_SwiftDataProcessor_isEven")
-@_cdecl("bjs_SwiftDataProcessor_isEven")
-public func _bjs_SwiftDataProcessor_isEven(_ _self: UnsafeMutableRawPointer) -> Int32 {
-    #if arch(wasm32)
-    let ret = SwiftDataProcessor.bridgeJSLiftParameter(_self).isEven()
-    return ret.bridgeJSLowerReturn()
-    #else
-    fatalError("Only available on WebAssembly")
-    #endif
+extension GenericRTOutcome: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = GenericRTOutcome.bridgeJSMakeTypeHandle()
 }
 
-@_expose(wasm, "bjs_SwiftDataProcessor_processGreeter")
-@_cdecl("bjs_SwiftDataProcessor_processGreeter")
-public func _bjs_SwiftDataProcessor_processGreeter(_ _self: UnsafeMutableRawPointer, _ greeter: UnsafeMutableRawPointer) -> Void {
-    #if arch(wasm32)
-    let ret = SwiftDataProcessor.bridgeJSLiftParameter(_self).processGreeter(_: Greeter.bridgeJSLiftParameter(greeter))
-    return ret.bridgeJSLowerReturn()
-    #else
-    fatalError("Only available on WebAssembly")
-    #endif
+extension OptionalAllTypesResult: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = OptionalAllTypesResult.bridgeJSMakeTypeHandle()
 }
 
-@_expose(wasm, "bjs_SwiftDataProcessor_createGreeter")
-@_cdecl("bjs_SwiftDataProcessor_createGreeter")
-public func _bjs_SwiftDataProcessor_createGreeter(_ _self: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer {
-    #if arch(wasm32)
-    let ret = SwiftDataProcessor.bridgeJSLiftParameter(_self).createGreeter()
-    return ret.bridgeJSLowerReturn()
-    #else
-    fatalError("Only available on WebAssembly")
-    #endif
+extension APIOptionalResult: BridgedSwiftGenericBridgeable {
+    @_spi(BridgeJS) public static let bridgeJSTypeHandle = APIOptionalResult.bridgeJSMakeTypeHandle()
 }
 
-@_expose(wasm, "bjs_SwiftDataProcessor_processOptionalGreeter")
-@_cdecl("bjs_SwiftDataProcessor_processOptionalGreeter")
-public func _bjs_SwiftDataProcessor_processOptionalGreeter(_ _self: UnsafeMutableRawPointer, _ greeterIsSome: Int32, _ greeterValue: UnsafeMutableRawPointer) -> Void {
-    #if arch(wasm32)
-    let ret = SwiftDataProcessor.bridgeJSLiftParameter(_self).processOptionalGreeter(_: Optional<Greeter>.bridgeJSLiftParameter(greeterIsSome, greeterValue))
-    return ret.bridgeJSLowerReturn()
-    #else
+@JSFunction func Promise_reject(_ promise: JSObject, _ value: JSValue) throws(JSException)
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "promise_reject_BridgeJSRuntimeTests")
+fileprivate func promise_reject_BridgeJSRuntimeTests_extern(_ promise: Int32, _ valueKind: Int32, _ valuePayload1: Int32, _ valuePayload2: Float64) -> Void
+#else
+fileprivate func promise_reject_BridgeJSRuntimeTests_extern(_ promise: Int32, _ valueKind: Int32, _ valuePayload1: Int32, _ valuePayload2: Float64) -> Void {
     fatalError("Only available on WebAssembly")
-    #endif
+}
+#endif
+@inline(never) fileprivate func promise_reject_BridgeJSRuntimeTests(_ promise: Int32, _ valueKind: Int32, _ valuePayload1: Int32, _ valuePayload2: Float64) -> Void {
+    return promise_reject_BridgeJSRuntimeTests_extern(promise, valueKind, valuePayload1, valuePayload2)
 }
 
-@_expose(wasm, "bjs_SwiftDataProcessor_createOptionalGreeter")
-@_cdecl("bjs_SwiftDataProcessor_createOptionalGreeter")
-public func _bjs_SwiftDataProcessor_createOptionalGreeter(_ _self: UnsafeMutableRawPointer) -> Void {
-    #if arch(wasm32)
-    let ret = SwiftDataProcessor.bridgeJSLiftParameter(_self).createOptionalGreeter()
-    return ret.bridgeJSLowerReturn()
-    #else
-    fatalError("Only available on WebAssembly")
-    #endif
+func _$Promise_reject(_ promise: JSObject, _ value: JSValue) throws(JSException) -> Void {
+    let (valueKind, valuePayload1, valuePayload2) = value.bridgeJSLowerParameter()
+    let promiseValue = promise.bridgeJSLowerParameter()
+    promise_reject_BridgeJSRuntimeTests(promiseValue, valueKind, valuePayload1, valuePayload2)
+    if let error = _swift_js_take_exception() { throw error }
 }
 
-@_expose(wasm, "bjs_SwiftDataProcessor_handleAPIResult")
-@_cdecl("bjs_SwiftDataProcessor_handleAPIResult")
-public func _bjs_SwiftDataProcessor_handleAPIResult(_ _self: UnsafeMutableRawPointer, _ resultIsSome: Int32, _ resultCaseId: Int32) -> Void {
-    #if arch(wasm32)
-    SwiftDataProcessor.bridgeJSLiftParameter(_self).handleAPIResult(_: Optional<APIResult>.bridgeJSLiftParameter(resultIsSome, resultCaseId))
-    #else
+@JSFunction func Promise_resolve_SS(_ promise: JSObject, _ value: String) throws(JSException)
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "promise_resolve_BridgeJSRuntimeTests_SS")
+fileprivate func promise_resolve_BridgeJSRuntimeTests_SS_extern(_ promise: Int32, _ valueBytes: Int32, _ valueLength: Int32) -> Void
+#else
+fileprivate func promise_resolve_BridgeJSRuntimeTests_SS_extern(_ promise: Int32, _ valueBytes: Int32, _ valueLength: Int32) -> Void {
     fatalError("Only available on WebAssembly")
-    #endif
+}
+#endif
+@inline(never) fileprivate func promise_resolve_BridgeJSRuntimeTests_SS(_ promise: Int32, _ valueBytes: Int32, _ valueLength: Int32) -> Void {
+    return promise_resolve_BridgeJSRuntimeTests_SS_extern(promise, valueBytes, valueLength)
 }
 
-@_expose(wasm, "bjs_SwiftDataProcessor_getAPIResult")
-@_cdecl("bjs_SwiftDataProcessor_getAPIResult")
-public func _bjs_SwiftDataProcessor_getAPIResult(_ _self: UnsafeMutableRawPointer) -> Void {
-    #if arch(wasm32)
-    let ret = SwiftDataProcessor.bridgeJSLiftParameter(_self).getAPIResult()
-    return ret.bridgeJSLowerReturn()
-    #else
+func _$Promise_resolve_SS(_ promise: JSObject, _ value: String) throws(JSException) -> Void {
+    value.bridgeJSWithLoweredParameter { (valueBytes, valueLength) in
+        let promiseValue = promise.bridgeJSLowerParameter()
+        promise_resolve_BridgeJSRuntimeTests_SS(promiseValue, valueBytes, valueLength)
+    }
+    if let error = _swift_js_take_exception() { throw error }
+}
+
+@JSFunction func Promise_resolve_y(_ promise: JSObject) throws(JSException)
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "promise_resolve_BridgeJSRuntimeTests_y")
+fileprivate func promise_resolve_BridgeJSRuntimeTests_y_extern(_ promise: Int32) -> Void
+#else
+fileprivate func promise_resolve_BridgeJSRuntimeTests_y_extern(_ promise: Int32) -> Void {
     fatalError("Only available on WebAssembly")
-    #endif
+}
+#endif
+@inline(never) fileprivate func promise_resolve_BridgeJSRuntimeTests_y(_ promise: Int32) -> Void {
+    return promise_resolve_BridgeJSRuntimeTests_y_extern(promise)
 }
 
-@_expose(wasm, "bjs_SwiftDataProcessor_count_get")
-@_cdecl("bjs_SwiftDataProcessor_count_get")
-public func _bjs_SwiftDataProcessor_count_get(_ _self: UnsafeMutableRawPointer) -> Int32 {
-    #if arch(wasm32)
-    let ret = SwiftDataProcessor.bridgeJSLiftParameter(_self).count
-    return ret.bridgeJSLowerReturn()
-    #else
+func _$Promise_resolve_y(_ promise: JSObject) throws(JSException) -> Void {
+    let promiseValue = promise.bridgeJSLowerParameter()
+    promise_resolve_BridgeJSRuntimeTests_y(promiseValue)
+    if let error = _swift_js_take_exception() { throw error }
+}
+
+@JSFunction func Promise_resolve_Si(_ promise: JSObject, _ value: Int) throws(JSException)
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "promise_resolve_BridgeJSRuntimeTests_Si")
+fileprivate func promise_resolve_BridgeJSRuntimeTests_Si_extern(_ promise: Int32, _ value: Int32) -> Void
+#else
+fileprivate func promise_resolve_BridgeJSRuntimeTests_Si_extern(_ promise: Int32, _ value: Int32) -> Void {
     fatalError("Only available on WebAssembly")
-    #endif
+}
+#endif
+@inline(never) fileprivate func promise_resolve_BridgeJSRuntimeTests_Si(_ promise: Int32, _ value: Int32) -> Void {
+    return promise_resolve_BridgeJSRuntimeTests_Si_extern(promise, value)
 }
 
-@_expose(wasm, "bjs_SwiftDataProcessor_count_set")
-@_cdecl("bjs_SwiftDataProcessor_count_set")
-public func _bjs_SwiftDataProcessor_count_set(_ _self: UnsafeMutableRawPointer, _ value: Int32) -> Void {
-    #if arch(wasm32)
-    SwiftDataProcessor.bridgeJSLiftParameter(_self).count = Int.bridgeJSLiftParameter(value)
-    #else
-    fatalError("Only available on WebAssembly")
-    #endif
+func _$Promise_resolve_Si(_ promise: JSObject, _ value: Int) throws(JSException) -> Void {
+    let valueValue = value.bridgeJSLowerParameter()
+    let promiseValue = promise.bridgeJSLowerParameter()
+    promise_resolve_BridgeJSRuntimeTests_Si(promiseValue, valueValue)
+    if let error = _swift_js_take_exception() { throw error }
 }
 
-@_expose(wasm, "bjs_SwiftDataProcessor_name_get")
-@_cdecl("bjs_SwiftDataProcessor_name_get")
-public func _bjs_SwiftDataProcessor_name_get(_ _self: UnsafeMutableRawPointer) -> Void {
-    #if arch(wasm32)
-    let ret = SwiftDataProcessor.bridgeJSLiftParameter(_self).name
-    return ret.bridgeJSLowerReturn()
-    #else
+@JSFunction func Promise_resolve_Sf(_ promise: JSObject, _ value: Float) throws(JSException)
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "promise_resolve_BridgeJSRuntimeTests_Sf")
+fileprivate func promise_resolve_BridgeJSRuntimeTests_Sf_extern(_ promise: Int32, _ value: Float32) -> Void
+#else
+fileprivate func promise_resolve_BridgeJSRuntimeTests_Sf_extern(_ promise: Int32, _ value: Float32) -> Void {
     fatalError("Only available on WebAssembly")
-    #endif
+}
+#endif
+@inline(never) fileprivate func promise_resolve_BridgeJSRuntimeTests_Sf(_ promise: Int32, _ value: Float32) -> Void {
+    return promise_resolve_BridgeJSRuntimeTests_Sf_extern(promise, value)
 }
 
-@_expose(wasm, "bjs_SwiftDataProcessor_optionalTag_get")
-@_cdecl("bjs_SwiftDataProcessor_optionalTag_get")
-public func _bjs_SwiftDataProcessor_optionalTag_get(_ _self: UnsafeMutableRawPointer) -> Void {
-    #if arch(wasm32)
-    let ret = SwiftDataProcessor.bridgeJSLiftParameter(_self).optionalTag
-    return ret.bridgeJSLowerReturn()
-    #else
-    fatalError("Only available on WebAssembly")
-    #endif
+func _$Promise_resolve_Sf(_ promise: JSObject, _ value: Float) throws(JSException) -> Void {
+    let valueValue = value.bridgeJSLowerParameter()
+    let promiseValue = promise.bridgeJSLowerParameter()
+    promise_resolve_BridgeJSRuntimeTests_Sf(promiseValue, valueValue)
+    if let error = _swift_js_take_exception() { throw error }
 }
 
-@_expose(wasm, "bjs_SwiftDataProcessor_optionalTag_set")
-@_cdecl("bjs_SwiftDataProcessor_optionalTag_set")
-public func _bjs_SwiftDataProcessor_optionalTag_set(_ _self: UnsafeMutableRawPointer, _ valueIsSome: Int32, _ valueBytes: Int32, _ valueLength: Int32) -> Void {
-    #if arch(wasm32)
-    SwiftDataProcessor.bridgeJSLiftParameter(_self).optionalTag = Optional<String>.bridgeJSLiftParameter(valueIsSome, valueBytes, valueLength)
-    #else
+@JSFunction func Promise_resolve_Sd(_ promise: JSObject, _ value: Double) throws(JSException)
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "promise_resolve_BridgeJSRuntimeTests_Sd")
+fileprivate func promise_resolve_BridgeJSRuntimeTests_Sd_extern(_ promise: Int32, _ value: Float64) -> Void
+#else
+fileprivate func promise_resolve_BridgeJSRuntimeTests_Sd_extern(_ promise: Int32, _ value: Float64) -> Void {
     fatalError("Only available on WebAssembly")
-    #endif
+}
+#endif
+@inline(never) fileprivate func promise_resolve_BridgeJSRuntimeTests_Sd(_ promise: Int32, _ value: Float64) -> Void {
+    return promise_resolve_BridgeJSRuntimeTests_Sd_extern(promise, value)
 }
 
-@_expose(wasm, "bjs_SwiftDataProcessor_optionalCount_get")
-@_cdecl("bjs_SwiftDataProcessor_optionalCount_get")
-public func _bjs_SwiftDataProcessor_optionalCount_get(_ _self: UnsafeMutableRawPointer) -> Void {
-    #if arch(wasm32)
-    let ret = SwiftDataProcessor.bridgeJSLiftParameter(_self).optionalCount
-    return ret.bridgeJSLowerReturn()
-    #else
-    fatalError("Only available on WebAssembly")
-    #endif
+func _$Promise_resolve_Sd(_ promise: JSObject, _ value: Double) throws(JSException) -> Void {
+    let valueValue = value.bridgeJSLowerParameter()
+    let promiseValue = promise.bridgeJSLowerParameter()
+    promise_resolve_BridgeJSRuntimeTests_Sd(promiseValue, valueValue)
+    if let error = _swift_js_take_exception() { throw error }
 }
 
-@_expose(wasm, "bjs_SwiftDataProcessor_optionalCount_set")
-@_cdecl("bjs_SwiftDataProcessor_optionalCount_set")
-public func _bjs_SwiftDataProcessor_optionalCount_set(_ _self: UnsafeMutableRawPointer, _ valueIsSome: Int32, _ valueValue: Int32) -> Void {
-    #if arch(wasm32)
-    SwiftDataProcessor.bridgeJSLiftParameter(_self).optionalCount = Optional<Int>.bridgeJSLiftParameter(valueIsSome, valueValue)
-    #else
+@JSFunction func Promise_resolve_Sb(_ promise: JSObject, _ value: Bool) throws(JSException)
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "promise_resolve_BridgeJSRuntimeTests_Sb")
+fileprivate func promise_resolve_BridgeJSRuntimeTests_Sb_extern(_ promise: Int32, _ value: Int32) -> Void
+#else
+fileprivate func promise_resolve_BridgeJSRuntimeTests_Sb_extern(_ promise: Int32, _ value: Int32) -> Void {
     fatalError("Only available on WebAssembly")
-    #endif
+}
+#endif
+@inline(never) fileprivate func promise_resolve_BridgeJSRuntimeTests_Sb(_ promise: Int32, _ value: Int32) -> Void {
+    return promise_resolve_BridgeJSRuntimeTests_Sb_extern(promise, value)
 }
 
-@_expose(wasm, "bjs_SwiftDataProcessor_direction_get")
-@_cdecl("bjs_SwiftDataProcessor_direction_get")
-public func _bjs_SwiftDataProcessor_direction_get(_ _self: UnsafeMutableRawPointer) -> Void {
-    #if arch(wasm32)
-    let ret = SwiftDataProcessor.bridgeJSLiftParameter(_self).direction
-    return ret.bridgeJSLowerReturn()
-    #else
-    fatalError("Only available on WebAssembly")
-    #endif
+func _$Promise_resolve_Sb(_ promise: JSObject, _ value: Bool) throws(JSException) -> Void {
+    let valueValue = value.bridgeJSLowerParameter()
+    let promiseValue = promise.bridgeJSLowerParameter()
+    promise_resolve_BridgeJSRuntimeTests_Sb(promiseValue, valueValue)
+    if let error = _swift_js_take_exception() { throw error }
 }
 
-@_expose(wasm, "bjs_SwiftDataProcessor_direction_set")
-@_cdecl("bjs_SwiftDataProcessor_direction_set")
-public func _bjs_SwiftDataProcessor_direction_set(_ _self: UnsafeMutableRawPointer, _ valueIsSome: Int32, _ valueValue: Int32) -> Void {
-    #if arch(wasm32)
-    SwiftDataProcessor.bridgeJSLiftParameter(_self).direction = Optional<Direction>.bridgeJSLiftParameter(valueIsSome, valueValue)
-    #else
+@JSFunction func Promise_resolve_7GreeterC(_ promise: JSObject, _ value: Greeter) throws(JSException)
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "promise_resolve_BridgeJSRuntimeTests_7GreeterC")
+fileprivate func promise_resolve_BridgeJSRuntimeTests_7GreeterC_extern(_ promise: Int32, _ value: UnsafeMutableRawPointer) -> Void
+#else
+fileprivate func promise_resolve_BridgeJSRuntimeTests_7GreeterC_extern(_ promise: Int32, _ value: UnsafeMutableRawPointer) -> Void {
     fatalError("Only available on WebAssembly")
-    #endif
+}
+#endif
+@inline(never) fileprivate func promise_resolve_BridgeJSRuntimeTests_7GreeterC(_ promise: Int32, _ value: UnsafeMutableRawPointer) -> Void {
+    return promise_resolve_BridgeJSRuntimeTests_7GreeterC_extern(promise, value)
 }
 
-@_expose(wasm, "bjs_SwiftDataProcessor_optionalTheme_get")
-@_cdecl("bjs_SwiftDataProcessor_optionalTheme_get")
-public func _bjs_SwiftDataProcessor_optionalTheme_get(_ _self: UnsafeMutableRawPointer) -> Void {
-    #if arch(wasm32)
-    let ret = SwiftDataProcessor.bridgeJSLiftParameter(_self).optionalTheme
-    return ret.bridgeJSLowerReturn()
-    #else
-    fatalError("Only available on WebAssembly")
-    #endif
+func _$Promise_resolve_7GreeterC(_ promise: JSObject, _ value: Greeter) throws(JSException) -> Void {
+    let valuePointer = value.bridgeJSLowerParameter()
+    let promiseValue = promise.bridgeJSLowerParameter()
+    promise_resolve_BridgeJSRuntimeTests_7GreeterC(promiseValue, valuePointer)
+    if let error = _swift_js_take_exception() { throw error }
 }
 
-@_expose(wasm, "bjs_SwiftDataProcessor_optionalTheme_set")
-@_cdecl("bjs_SwiftDataProcessor_optionalTheme_set")
-public func _bjs_SwiftDataProcessor_optionalTheme_set(_ _self: UnsafeMutableRawPointer, _ valueIsSome: Int32, _ valueBytes: Int32, _ valueLength: Int32) -> Void {
-    #if arch(wasm32)
-    SwiftDataProcessor.bridgeJSLiftParameter(_self).optionalTheme = Optional<Theme>.bridgeJSLiftParameter(valueIsSome, valueBytes, valueLength)
-    #else
+@JSFunction func Promise_resolve_8JSObjectC(_ promise: JSObject, _ value: JSObject) throws(JSException)
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "promise_resolve_BridgeJSRuntimeTests_8JSObjectC")
+fileprivate func promise_resolve_BridgeJSRuntimeTests_8JSObjectC_extern(_ promise: Int32, _ value: Int32) -> Void
+#else
+fileprivate func promise_resolve_BridgeJSRuntimeTests_8JSObjectC_extern(_ promise: Int32, _ value: Int32) -> Void {
     fatalError("Only available on WebAssembly")
-    #endif
+}
+#endif
+@inline(never) fileprivate func promise_resolve_BridgeJSRuntimeTests_8JSObjectC(_ promise: Int32, _ value: Int32) -> Void {
+    return promise_resolve_BridgeJSRuntimeTests_8JSObjectC_extern(promise, value)
 }
 
-@_expose(wasm, "bjs_SwiftDataProcessor_httpStatus_get")
-@_cdecl("bjs_SwiftDataProcessor_httpStatus_get")
-public func _bjs_SwiftDataProcessor_httpStatus_get(_ _self: UnsafeMutableRawPointer) -> Void {
-    #if arch(wasm32)
-    let ret = SwiftDataProcessor.bridgeJSLiftParameter(_self).httpStatus
-    return ret.bridgeJSLowerReturn()
-    #else
-    fatalError("Only available on WebAssembly")
-    #endif
+func _$Promise_resolve_8JSObjectC(_ promise: JSObject, _ value: JSObject) throws(JSException) -> Void {
+    let valueValue = value.bridgeJSLowerParameter()
+    let promiseValue = promise.bridgeJSLowerParameter()
+    promise_resolve_BridgeJSRuntimeTests_8JSObjectC(promiseValue, valueValue)
+    if let error = _swift_js_take_exception() { throw error }
 }
 
-@_expose(wasm, "bjs_SwiftDataProcessor_httpStatus_set")
-@_cdecl("bjs_SwiftDataProcessor_httpStatus_set")
-public func _bjs_SwiftDataProcessor_httpStatus_set(_ _self: UnsafeMutableRawPointer, _ valueIsSome: Int32, _ valueValue: Int32) -> Void {
-    #if arch(wasm32)
-    SwiftDataProcessor.bridgeJSLiftParameter(_self).httpStatus = Optional<HttpStatus>.bridgeJSLiftParameter(valueIsSome, valueValue)
-    #else
+@JSFunction func Promise_resolve_5ThemeO(_ promise: JSObject, _ value: Theme) throws(JSException)
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "promise_resolve_BridgeJSRuntimeTests_5ThemeO")
+fileprivate func promise_resolve_BridgeJSRuntimeTests_5ThemeO_extern(_ promise: Int32, _ valueBytes: Int32, _ valueLength: Int32) -> Void
+#else
+fileprivate func promise_resolve_BridgeJSRuntimeTests_5ThemeO_extern(_ promise: Int32, _ valueBytes: Int32, _ valueLength: Int32) -> Void {
     fatalError("Only available on WebAssembly")
-    #endif
+}
+#endif
+@inline(never) fileprivate func promise_resolve_BridgeJSRuntimeTests_5ThemeO(_ promise: Int32, _ valueBytes: Int32, _ valueLength: Int32) -> Void {
+    return promise_resolve_BridgeJSRuntimeTests_5ThemeO_extern(promise, valueBytes, valueLength)
 }
 
-@_expose(wasm, "bjs_SwiftDataProcessor_apiResult_get")
-@_cdecl("bjs_SwiftDataProcessor_apiResult_get")
-public func _bjs_SwiftDataProcessor_apiResult_get(_ _self: UnsafeMutableRawPointer) -> Void {
-    #if arch(wasm32)
-    let ret = SwiftDataProcessor.bridgeJSLiftParameter(_self).apiResult
-    return ret.bridgeJSLowerReturn()
-    #else
-    fatalError("Only available on WebAssembly")
-    #endif
+func _$Promise_resolve_5ThemeO(_ promise: JSObject, _ value: Theme) throws(JSException) -> Void {
+    value.bridgeJSWithLoweredParameter { (valueBytes, valueLength) in
+        let promiseValue = promise.bridgeJSLowerParameter()
+        promise_resolve_BridgeJSRuntimeTests_5ThemeO(promiseValue, valueBytes, valueLength)
+    }
+    if let error = _swift_js_take_exception() { throw error }
 }
 
-@_expose(wasm, "bjs_SwiftDataProcessor_apiResult_set")
-@_cdecl("bjs_SwiftDataProcessor_apiResult_set")
-public func _bjs_SwiftDataProcessor_apiResult_set(_ _self: UnsafeMutableRawPointer, _ valueIsSome: Int32, _ valueCaseId: Int32) -> Void {
-    #if arch(wasm32)
-    SwiftDataProcessor.bridgeJSLiftParameter(_self).apiResult = Optional<APIResult>.bridgeJSLiftParameter(valueIsSome, valueCaseId)
-    #else
+@JSFunction func Promise_resolve_9DirectionO(_ promise: JSObject, _ value: Direction) throws(JSException)
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "promise_resolve_BridgeJSRuntimeTests_9DirectionO")
+fileprivate func promise_resolve_BridgeJSRuntimeTests_9DirectionO_extern(_ promise: Int32, _ value: Int32) -> Void
+#else
+fileprivate func promise_resolve_BridgeJSRuntimeTests_9DirectionO_extern(_ promise: Int32, _ value: Int32) -> Void {
     fatalError("Only available on WebAssembly")
-    #endif
+}
+#endif
+@inline(never) fileprivate func promise_resolve_BridgeJSRuntimeTests_9DirectionO(_ promise: Int32, _ value: Int32) -> Void {
+    return promise_resolve_BridgeJSRuntimeTests_9DirectionO_extern(promise, value)
 }
 
-@_expose(wasm, "bjs_SwiftDataProcessor_helper_get")
-@_cdecl("bjs_SwiftDataProcessor_helper_get")
-public func _bjs_SwiftDataProcessor_helper_get(_ _self: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer {
-    #if arch(wasm32)
-    let ret = SwiftDataProcessor.bridgeJSLiftParameter(_self).helper
-    return ret.bridgeJSLowerReturn()
-    #else
-    fatalError("Only available on WebAssembly")
-    #endif
+func _$Promise_resolve_9DirectionO(_ promise: JSObject, _ value: Direction) throws(JSException) -> Void {
+    let valueValue = value.bridgeJSLowerParameter()
+    let promiseValue = promise.bridgeJSLowerParameter()
+    promise_resolve_BridgeJSRuntimeTests_9DirectionO(promiseValue, valueValue)
+    if let error = _swift_js_take_exception() { throw error }
 }
 
-@_expose(wasm, "bjs_SwiftDataProcessor_helper_set")
-@_cdecl("bjs_SwiftDataProcessor_helper_set")
-public func _bjs_SwiftDataProcessor_helper_set(_ _self: UnsafeMutableRawPointer, _ value: UnsafeMutableRawPointer) -> Void {
-    #if arch(wasm32)
-    SwiftDataProcessor.bridgeJSLiftParameter(_self).helper = Greeter.bridgeJSLiftParameter(value)
-    #else
+@JSFunction func Promise_resolve_Sq5ThemeO(_ promise: JSObject, _ value: Optional<Theme>) throws(JSException)
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "promise_resolve_BridgeJSRuntimeTests_Sq5ThemeO")
+fileprivate func promise_resolve_BridgeJSRuntimeTests_Sq5ThemeO_extern(_ promise: Int32, _ valueIsSome: Int32, _ valueBytes: Int32, _ valueLength: Int32) -> Void
+#else
+fileprivate func promise_resolve_BridgeJSRuntimeTests_Sq5ThemeO_extern(_ promise: Int32, _ valueIsSome: Int32, _ valueBytes: Int32, _ valueLength: Int32) -> Void {
     fatalError("Only available on WebAssembly")
-    #endif
+}
+#endif
+@inline(never) fileprivate func promise_resolve_BridgeJSRuntimeTests_Sq5ThemeO(_ promise: Int32, _ valueIsSome: Int32, _ valueBytes: Int32, _ valueLength: Int32) -> Void {
+    return promise_resolve_BridgeJSRuntimeTests_Sq5ThemeO_extern(promise, valueIsSome, valueBytes, valueLength)
 }
 
-@_expose(wasm, "bjs_SwiftDataProcessor_optionalHelper_get")
-@_cdecl("bjs_SwiftDataProcessor_optionalHelper_get")
-public func _bjs_SwiftDataProcessor_optionalHelper_get(_ _self: UnsafeMutableRawPointer) -> Void {
-    #if arch(wasm32)
-    let ret = SwiftDataProcessor.bridgeJSLiftParameter(_self).optionalHelper
-    return ret.bridgeJSLowerReturn()
-    #else
-    fatalError("Only available on WebAssembly")
-    #endif
+func _$Promise_resolve_Sq5ThemeO(_ promise: JSObject, _ value: Optional<Theme>) throws(JSException) -> Void {
+    value.bridgeJSWithLoweredParameter { (valueIsSome, valueBytes, valueLength) in
+        let promiseValue = promise.bridgeJSLowerParameter()
+        promise_resolve_BridgeJSRuntimeTests_Sq5ThemeO(promiseValue, valueIsSome, valueBytes, valueLength)
+    }
+    if let error = _swift_js_take_exception() { throw error }
 }
 
-@_expose(wasm, "bjs_SwiftDataProcessor_optionalHelper_set")
-@_cdecl("bjs_SwiftDataProcessor_optionalHelper_set")
-public func _bjs_SwiftDataProcessor_optionalHelper_set(_ _self: UnsafeMutableRawPointer, _ valueIsSome: Int32, _ valueValue: UnsafeMutableRawPointer) -> Void {
-    #if arch(wasm32)
-    SwiftDataProcessor.bridgeJSLiftParameter(_self).optionalHelper = Optional<Greeter>.bridgeJSLiftParameter(valueIsSome, valueValue)
-    #else
+@JSFunction func Promise_resolve_Sq9DirectionO(_ promise: JSObject, _ value: Optional<Direction>) throws(JSException)
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "promise_resolve_BridgeJSRuntimeTests_Sq9DirectionO")
+fileprivate func promise_resolve_BridgeJSRuntimeTests_Sq9DirectionO_extern(_ promise: Int32, _ valueIsSome: Int32, _ valueValue: Int32) -> Void
+#else
+fileprivate func promise_resolve_BridgeJSRuntimeTests_Sq9DirectionO_extern(_ promise: Int32, _ valueIsSome: Int32, _ valueValue: Int32) -> Void {
     fatalError("Only available on WebAssembly")
-    #endif
+}
+#endif
+@inline(never) fileprivate func promise_resolve_BridgeJSRuntimeTests_Sq9DirectionO(_ promise: Int32, _ valueIsSome: Int32, _ valueValue: Int32) -> Void {
+    return promise_resolve_BridgeJSRuntimeTests_Sq9DirectionO_extern(promise, valueIsSome, valueValue)
 }
 
-@_expose(wasm, "bjs_SwiftDataProcessor_deinit")
-@_cdecl("bjs_SwiftDataProcessor_deinit")
-public func _bjs_SwiftDataProcessor_deinit(_ pointer: UnsafeMutableRawPointer) -> Void {
-    #if arch(wasm32)
-    Unmanaged<SwiftDataProcessor>.fromOpaque(pointer).release()
-    #else
+func _$Promise_resolve_Sq9DirectionO(_ promise: JSObject, _ value: Optional<Direction>) throws(JSException) -> Void {
+    let (valueIsSome, valueValue) = value.bridgeJSLowerParameter()
+    let promiseValue = promise.bridgeJSLowerParameter()
+    promise_resolve_BridgeJSRuntimeTests_Sq9DirectionO(promiseValue, valueIsSome, valueValue)
+    if let error = _swift_js_take_exception() { throw error }
+}
+
+@JSFunction func Promise_resolve_Sa9DirectionO(_ promise: JSObject, _ value: [Direction]) throws(JSException)
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "promise_resolve_BridgeJSRuntimeTests_Sa9DirectionO")
+fileprivate func promise_resolve_BridgeJSRuntimeTests_Sa9DirectionO_extern(_ promise: Int32) -> Void
+#else
+fileprivate func promise_resolve_BridgeJSRuntimeTests_Sa9DirectionO_extern(_ promise: Int32) -> Void {
     fatalError("Only available on WebAssembly")
-    #endif
+}
+#endif
+@inline(never) fileprivate func promise_resolve_BridgeJSRuntimeTests_Sa9DirectionO(_ promise: Int32) -> Void {
+    return promise_resolve_BridgeJSRuntimeTests_Sa9DirectionO_extern(promise)
 }
 
-extension SwiftDataProcessor: ConvertibleToJSValue, _BridgedSwiftHeapObject, _BridgedSwiftProtocolExportable {
-    var jsValue: JSValue {
-        return .object(JSObject(id: UInt32(bitPattern: _bjs_SwiftDataProcessor_wrap(Unmanaged.passRetained(self).toOpaque()))))
-    }
-    consuming func bridgeJSLowerAsProtocolReturn() -> Int32 {
-        _bjs_SwiftDataProcessor_wrap(Unmanaged.passRetained(self).toOpaque())
-    }
+func _$Promise_resolve_Sa9DirectionO(_ promise: JSObject, _ value: [Direction]) throws(JSException) -> Void {
+    let _ = value.bridgeJSLowerParameter()
+    let promiseValue = promise.bridgeJSLowerParameter()
+    promise_resolve_BridgeJSRuntimeTests_Sa9DirectionO(promiseValue)
+    if let error = _swift_js_take_exception() { throw error }
 }
 
+@JSFunction func Promise_resolve_SD9DirectionO(_ promise: JSObject, _ value: [String: Direction]) throws(JSException)
+
 #if arch(wasm32)
-@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_SwiftDataProcessor_wrap")
-fileprivate func _bjs_SwiftDataProcessor_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32
+@_extern(wasm, module: "bjs", name: "promise_resolve_BridgeJSRuntimeTests_SD9DirectionO")
+fileprivate func promise_resolve_BridgeJSRuntimeTests_SD9DirectionO_extern(_ promise: Int32) -> Void
 #else
-fileprivate func _bjs_SwiftDataProcessor_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 {
+fileprivate func promise_resolve_BridgeJSRuntimeTests_SD9DirectionO_extern(_ promise: Int32) -> Void {
     fatalError("Only available on WebAssembly")
 }
 #endif
-@inline(never) fileprivate func _bjs_SwiftDataProcessor_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 {
-    return _bjs_SwiftDataProcessor_wrap_extern(pointer)
+@inline(never) fileprivate func promise_resolve_BridgeJSRuntimeTests_SD9DirectionO(_ promise: Int32) -> Void {
+    return promise_resolve_BridgeJSRuntimeTests_SD9DirectionO_extern(promise)
 }
 
-@_expose(wasm, "bjs_ProtocolReturnTests_static_createNativeProcessor")
-@_cdecl("bjs_ProtocolReturnTests_static_createNativeProcessor")
-public func _bjs_ProtocolReturnTests_static_createNativeProcessor() -> Int32 {
-    #if arch(wasm32)
-    let ret = ProtocolReturnTests.createNativeProcessor() as! _BridgedSwiftProtocolExportable
-    return ret.bridgeJSLowerAsProtocolReturn()
-    #else
-    fatalError("Only available on WebAssembly")
-    #endif
+func _$Promise_resolve_SD9DirectionO(_ promise: JSObject, _ value: [String: Direction]) throws(JSException) -> Void {
+    let _ = value.bridgeJSLowerParameter()
+    let promiseValue = promise.bridgeJSLowerParameter()
+    promise_resolve_BridgeJSRuntimeTests_SD9DirectionO(promiseValue)
+    if let error = _swift_js_take_exception() { throw error }
 }
 
-@_expose(wasm, "bjs_ProtocolReturnTests_static_createNativeProcessorOptional")
-@_cdecl("bjs_ProtocolReturnTests_static_createNativeProcessorOptional")
-public func _bjs_ProtocolReturnTests_static_createNativeProcessorOptional() -> Void {
-    #if arch(wasm32)
-    let ret = ProtocolReturnTests.createNativeProcessorOptional()
-    if let ret {
-        _swift_js_return_optional_object(1, (ret as! _BridgedSwiftProtocolExportable).bridgeJSLowerAsProtocolReturn())
-    } else {
-        _swift_js_return_optional_object(0, 0)
-    }
-    #else
+@JSFunction func Promise_resolve_Sa5ThemeO(_ promise: JSObject, _ value: [Theme]) throws(JSException)
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "promise_resolve_BridgeJSRuntimeTests_Sa5ThemeO")
+fileprivate func promise_resolve_BridgeJSRuntimeTests_Sa5ThemeO_extern(_ promise: Int32) -> Void
+#else
+fileprivate func promise_resolve_BridgeJSRuntimeTests_Sa5ThemeO_extern(_ promise: Int32) -> Void {
     fatalError("Only available on WebAssembly")
-    #endif
+}
+#endif
+@inline(never) fileprivate func promise_resolve_BridgeJSRuntimeTests_Sa5ThemeO(_ promise: Int32) -> Void {
+    return promise_resolve_BridgeJSRuntimeTests_Sa5ThemeO_extern(promise)
+}
+
+func _$Promise_resolve_Sa5ThemeO(_ promise: JSObject, _ value: [Theme]) throws(JSException) -> Void {
+    let _ = value.bridgeJSLowerParameter()
+    let promiseValue = promise.bridgeJSLowerParameter()
+    promise_resolve_BridgeJSRuntimeTests_Sa5ThemeO(promiseValue)
+    if let error = _swift_js_take_exception() { throw error }
 }
 
-@_expose(wasm, "bjs_ProtocolReturnTests_static_createNativeProcessorNil")
-@_cdecl("bjs_ProtocolReturnTests_static_createNativeProcessorNil")
-public func _bjs_ProtocolReturnTests_static_createNativeProcessorNil() -> Void {
-    #if arch(wasm32)
-    let ret = ProtocolReturnTests.createNativeProcessorNil()
-    if let ret {
-        _swift_js_return_optional_object(1, (ret as! _BridgedSwiftProtocolExportable).bridgeJSLowerAsProtocolReturn())
-    } else {
-        _swift_js_return_optional_object(0, 0)
-    }
-    #else
+@JSFunction func Promise_resolve_SD5ThemeO(_ promise: JSObject, _ value: [String: Theme]) throws(JSException)
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "promise_resolve_BridgeJSRuntimeTests_SD5ThemeO")
+fileprivate func promise_resolve_BridgeJSRuntimeTests_SD5ThemeO_extern(_ promise: Int32) -> Void
+#else
+fileprivate func promise_resolve_BridgeJSRuntimeTests_SD5ThemeO_extern(_ promise: Int32) -> Void {
     fatalError("Only available on WebAssembly")
-    #endif
+}
+#endif
+@inline(never) fileprivate func promise_resolve_BridgeJSRuntimeTests_SD5ThemeO(_ promise: Int32) -> Void {
+    return promise_resolve_BridgeJSRuntimeTests_SD5ThemeO_extern(promise)
 }
 
-@_expose(wasm, "bjs_ProtocolReturnTests_static_createNativeProcessorArray")
-@_cdecl("bjs_ProtocolReturnTests_static_createNativeProcessorArray")
-public func _bjs_ProtocolReturnTests_static_createNativeProcessorArray() -> Void {
-    #if arch(wasm32)
-    let ret = ProtocolReturnTests.createNativeProcessorArray()
-    for __bjs_elem_ret in ret {
-        _swift_js_push_i32((__bjs_elem_ret as! _BridgedSwiftProtocolExportable).bridgeJSLowerAsProtocolReturn())
-    }
-    _swift_js_push_i32(Int32(ret.count))
-    #else
-    fatalError("Only available on WebAssembly")
-    #endif
+func _$Promise_resolve_SD5ThemeO(_ promise: JSObject, _ value: [String: Theme]) throws(JSException) -> Void {
+    let _ = value.bridgeJSLowerParameter()
+    let promiseValue = promise.bridgeJSLowerParameter()
+    promise_resolve_BridgeJSRuntimeTests_SD5ThemeO(promiseValue)
+    if let error = _swift_js_take_exception() { throw error }
 }
 
-@_expose(wasm, "bjs_ProtocolReturnTests_static_createNativeProcessorDictionary")
-@_cdecl("bjs_ProtocolReturnTests_static_createNativeProcessorDictionary")
-public func _bjs_ProtocolReturnTests_static_createNativeProcessorDictionary() -> Void {
-    #if arch(wasm32)
-    let ret = ProtocolReturnTests.createNativeProcessorDictionary()
-    for __bjs_kv_ret in ret {
-        __bjs_kv_ret.key.bridgeJSStackPush()
-        _swift_js_push_i32((__bjs_kv_ret.value as! _BridgedSwiftProtocolExportable).bridgeJSLowerAsProtocolReturn())
-    }
-    _swift_js_push_i32(Int32(ret.count))
-    #else
+@JSFunction func Promise_resolve_8FileSizeO(_ promise: JSObject, _ value: FileSize) throws(JSException)
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "promise_resolve_BridgeJSRuntimeTests_8FileSizeO")
+fileprivate func promise_resolve_BridgeJSRuntimeTests_8FileSizeO_extern(_ promise: Int32, _ value: Int64) -> Void
+#else
+fileprivate func promise_resolve_BridgeJSRuntimeTests_8FileSizeO_extern(_ promise: Int32, _ value: Int64) -> Void {
     fatalError("Only available on WebAssembly")
-    #endif
+}
+#endif
+@inline(never) fileprivate func promise_resolve_BridgeJSRuntimeTests_8FileSizeO(_ promise: Int32, _ value: Int64) -> Void {
+    return promise_resolve_BridgeJSRuntimeTests_8FileSizeO_extern(promise, value)
 }
 
-@_expose(wasm, "bjs_ProtocolReturnTests_deinit")
-@_cdecl("bjs_ProtocolReturnTests_deinit")
-public func _bjs_ProtocolReturnTests_deinit(_ pointer: UnsafeMutableRawPointer) -> Void {
-    #if arch(wasm32)
-    Unmanaged<ProtocolReturnTests>.fromOpaque(pointer).release()
-    #else
+func _$Promise_resolve_8FileSizeO(_ promise: JSObject, _ value: FileSize) throws(JSException) -> Void {
+    let valueValue = value.bridgeJSLowerParameter()
+    let promiseValue = promise.bridgeJSLowerParameter()
+    promise_resolve_BridgeJSRuntimeTests_8FileSizeO(promiseValue, valueValue)
+    if let error = _swift_js_take_exception() { throw error }
+}
+
+@JSFunction func Promise_resolve_Sq8FileSizeO(_ promise: JSObject, _ value: Optional<FileSize>) throws(JSException)
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "promise_resolve_BridgeJSRuntimeTests_Sq8FileSizeO")
+fileprivate func promise_resolve_BridgeJSRuntimeTests_Sq8FileSizeO_extern(_ promise: Int32, _ valueIsSome: Int32, _ valueValue: Int64) -> Void
+#else
+fileprivate func promise_resolve_BridgeJSRuntimeTests_Sq8FileSizeO_extern(_ promise: Int32, _ valueIsSome: Int32, _ valueValue: Int64) -> Void {
     fatalError("Only available on WebAssembly")
-    #endif
+}
+#endif
+@inline(never) fileprivate func promise_resolve_BridgeJSRuntimeTests_Sq8FileSizeO(_ promise: Int32, _ valueIsSome: Int32, _ valueValue: Int64) -> Void {
+    return promise_resolve_BridgeJSRuntimeTests_Sq8FileSizeO_extern(promise, valueIsSome, valueValue)
 }
 
-extension ProtocolReturnTests: ConvertibleToJSValue, _BridgedSwiftHeapObject, _BridgedSwiftProtocolExportable {
-    var jsValue: JSValue {
-        return .object(JSObject(id: UInt32(bitPattern: _bjs_ProtocolReturnTests_wrap(Unmanaged.passRetained(self).toOpaque()))))
-    }
-    consuming func bridgeJSLowerAsProtocolReturn() -> Int32 {
-        _bjs_ProtocolReturnTests_wrap(Unmanaged.passRetained(self).toOpaque())
-    }
+func _$Promise_resolve_Sq8FileSizeO(_ promise: JSObject, _ value: Optional<FileSize>) throws(JSException) -> Void {
+    let (valueIsSome, valueValue) = value.bridgeJSLowerParameter()
+    let promiseValue = promise.bridgeJSLowerParameter()
+    promise_resolve_BridgeJSRuntimeTests_Sq8FileSizeO(promiseValue, valueIsSome, valueValue)
+    if let error = _swift_js_take_exception() { throw error }
 }
 
+@JSFunction func Promise_resolve_18AsyncPayloadResultO(_ promise: JSObject, _ value: AsyncPayloadResult) throws(JSException)
+
 #if arch(wasm32)
-@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_ProtocolReturnTests_wrap")
-fileprivate func _bjs_ProtocolReturnTests_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32
+@_extern(wasm, module: "bjs", name: "promise_resolve_BridgeJSRuntimeTests_18AsyncPayloadResultO")
+fileprivate func promise_resolve_BridgeJSRuntimeTests_18AsyncPayloadResultO_extern(_ promise: Int32, _ value: Int32) -> Void
 #else
-fileprivate func _bjs_ProtocolReturnTests_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 {
+fileprivate func promise_resolve_BridgeJSRuntimeTests_18AsyncPayloadResultO_extern(_ promise: Int32, _ value: Int32) -> Void {
     fatalError("Only available on WebAssembly")
 }
 #endif
-@inline(never) fileprivate func _bjs_ProtocolReturnTests_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 {
-    return _bjs_ProtocolReturnTests_wrap_extern(pointer)
+@inline(never) fileprivate func promise_resolve_BridgeJSRuntimeTests_18AsyncPayloadResultO(_ promise: Int32, _ value: Int32) -> Void {
+    return promise_resolve_BridgeJSRuntimeTests_18AsyncPayloadResultO_extern(promise, value)
 }
 
-@_expose(wasm, "bjs_TextProcessor_init")
-@_cdecl("bjs_TextProcessor_init")
-public func _bjs_TextProcessor_init(_ transform: Int32) -> UnsafeMutableRawPointer {
-    #if arch(wasm32)
-    let ret = TextProcessor(transform: _BJS_Closure_20BridgeJSRuntimeTestsSS_SS.bridgeJSLift(transform))
-    return ret.bridgeJSLowerReturn()
-    #else
-    fatalError("Only available on WebAssembly")
-    #endif
+func _$Promise_resolve_18AsyncPayloadResultO(_ promise: JSObject, _ value: AsyncPayloadResult) throws(JSException) -> Void {
+    let valueCaseId = value.bridgeJSLowerParameter()
+    let promiseValue = promise.bridgeJSLowerParameter()
+    promise_resolve_BridgeJSRuntimeTests_18AsyncPayloadResultO(promiseValue, valueCaseId)
+    if let error = _swift_js_take_exception() { throw error }
 }
 
-@_expose(wasm, "bjs_TextProcessor_process")
-@_cdecl("bjs_TextProcessor_process")
-public func _bjs_TextProcessor_process(_ _self: UnsafeMutableRawPointer, _ textBytes: Int32, _ textLength: Int32) -> Void {
-    #if arch(wasm32)
-    let ret = TextProcessor.bridgeJSLiftParameter(_self).process(_: String.bridgeJSLiftParameter(textBytes, textLength))
-    return ret.bridgeJSLowerReturn()
-    #else
+@JSFunction func Promise_resolve_Sq18AsyncPayloadResultO(_ promise: JSObject, _ value: Optional<AsyncPayloadResult>) throws(JSException)
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "promise_resolve_BridgeJSRuntimeTests_Sq18AsyncPayloadResultO")
+fileprivate func promise_resolve_BridgeJSRuntimeTests_Sq18AsyncPayloadResultO_extern(_ promise: Int32, _ valueIsSome: Int32, _ valueCaseId: Int32) -> Void
+#else
+fileprivate func promise_resolve_BridgeJSRuntimeTests_Sq18AsyncPayloadResultO_extern(_ promise: Int32, _ valueIsSome: Int32, _ valueCaseId: Int32) -> Void {
     fatalError("Only available on WebAssembly")
-    #endif
+}
+#endif
+@inline(never) fileprivate func promise_resolve_BridgeJSRuntimeTests_Sq18AsyncPayloadResultO(_ promise: Int32, _ valueIsSome: Int32, _ valueCaseId: Int32) -> Void {
+    return promise_resolve_BridgeJSRuntimeTests_Sq18AsyncPayloadResultO_extern(promise, valueIsSome, valueCaseId)
 }
 
-@_expose(wasm, "bjs_TextProcessor_processWithCustom")
-@_cdecl("bjs_TextProcessor_processWithCustom")
-public func _bjs_TextProcessor_processWithCustom(_ _self: UnsafeMutableRawPointer, _ textBytes: Int32, _ textLength: Int32, _ customTransform: Int32) -> Void {
-    #if arch(wasm32)
-    let ret = TextProcessor.bridgeJSLiftParameter(_self).processWithCustom(_: String.bridgeJSLiftParameter(textBytes, textLength), customTransform: _BJS_Closure_20BridgeJSRuntimeTestsSiSSSd_SS.bridgeJSLift(customTransform))
-    return ret.bridgeJSLowerReturn()
-    #else
-    fatalError("Only available on WebAssembly")
-    #endif
+func _$Promise_resolve_Sq18AsyncPayloadResultO(_ promise: JSObject, _ value: Optional<AsyncPayloadResult>) throws(JSException) -> Void {
+    let (valueIsSome, valueCaseId) = value.bridgeJSLowerParameter()
+    let promiseValue = promise.bridgeJSLowerParameter()
+    promise_resolve_BridgeJSRuntimeTests_Sq18AsyncPayloadResultO(promiseValue, valueIsSome, valueCaseId)
+    if let error = _swift_js_take_exception() { throw error }
 }
 
-@_expose(wasm, "bjs_TextProcessor_getTransform")
-@_cdecl("bjs_TextProcessor_getTransform")
-public func _bjs_TextProcessor_getTransform(_ _self: UnsafeMutableRawPointer) -> Int32 {
-    #if arch(wasm32)
-    let ret = TextProcessor.bridgeJSLiftParameter(_self).getTransform()
-    return JSTypedClosure(ret).bridgeJSLowerReturn()
-    #else
+@JSFunction func Promise_resolve_11PublicPointV(_ promise: JSObject, _ value: PublicPoint) throws(JSException)
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "promise_resolve_BridgeJSRuntimeTests_11PublicPointV")
+fileprivate func promise_resolve_BridgeJSRuntimeTests_11PublicPointV_extern(_ promise: Int32) -> Void
+#else
+fileprivate func promise_resolve_BridgeJSRuntimeTests_11PublicPointV_extern(_ promise: Int32) -> Void {
     fatalError("Only available on WebAssembly")
-    #endif
+}
+#endif
+@inline(never) fileprivate func promise_resolve_BridgeJSRuntimeTests_11PublicPointV(_ promise: Int32) -> Void {
+    return promise_resolve_BridgeJSRuntimeTests_11PublicPointV_extern(promise)
 }
 
-@_expose(wasm, "bjs_TextProcessor_processOptionalString")
-@_cdecl("bjs_TextProcessor_processOptionalString")
-public func _bjs_TextProcessor_processOptionalString(_ _self: UnsafeMutableRawPointer, _ callback: Int32) -> Void {
-    #if arch(wasm32)
-    let ret = TextProcessor.bridgeJSLiftParameter(_self).processOptionalString(_: _BJS_Closure_20BridgeJSRuntimeTestsSqSS_SS.bridgeJSLift(callback))
-    return ret.bridgeJSLowerReturn()
-    #else
-    fatalError("Only available on WebAssembly")
-    #endif
+func _$Promise_resolve_11PublicPointV(_ promise: JSObject, _ value: PublicPoint) throws(JSException) -> Void {
+    let _ = value.bridgeJSLowerParameter()
+    let promiseValue = promise.bridgeJSLowerParameter()
+    promise_resolve_BridgeJSRuntimeTests_11PublicPointV(promiseValue)
+    if let error = _swift_js_take_exception() { throw error }
 }
 
-@_expose(wasm, "bjs_TextProcessor_processOptionalInt")
-@_cdecl("bjs_TextProcessor_processOptionalInt")
-public func _bjs_TextProcessor_processOptionalInt(_ _self: UnsafeMutableRawPointer, _ callback: Int32) -> Void {
-    #if arch(wasm32)
-    let ret = TextProcessor.bridgeJSLiftParameter(_self).processOptionalInt(_: _BJS_Closure_20BridgeJSRuntimeTestsSqSi_SS.bridgeJSLift(callback))
-    return ret.bridgeJSLowerReturn()
-    #else
+@JSFunction func Promise_resolve_7ContactV(_ promise: JSObject, _ value: Contact) throws(JSException)
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "promise_resolve_BridgeJSRuntimeTests_7ContactV")
+fileprivate func promise_resolve_BridgeJSRuntimeTests_7ContactV_extern(_ promise: Int32) -> Void
+#else
+fileprivate func promise_resolve_BridgeJSRuntimeTests_7ContactV_extern(_ promise: Int32) -> Void {
     fatalError("Only available on WebAssembly")
-    #endif
+}
+#endif
+@inline(never) fileprivate func promise_resolve_BridgeJSRuntimeTests_7ContactV(_ promise: Int32) -> Void {
+    return promise_resolve_BridgeJSRuntimeTests_7ContactV_extern(promise)
 }
 
-@_expose(wasm, "bjs_TextProcessor_processOptionalGreeter")
-@_cdecl("bjs_TextProcessor_processOptionalGreeter")
-public func _bjs_TextProcessor_processOptionalGreeter(_ _self: UnsafeMutableRawPointer, _ callback: Int32) -> Void {
-    #if arch(wasm32)
-    let ret = TextProcessor.bridgeJSLiftParameter(_self).processOptionalGreeter(_: _BJS_Closure_20BridgeJSRuntimeTestsSq7GreeterC_SS.bridgeJSLift(callback))
-    return ret.bridgeJSLowerReturn()
-    #else
-    fatalError("Only available on WebAssembly")
-    #endif
+func _$Promise_resolve_7ContactV(_ promise: JSObject, _ value: Contact) throws(JSException) -> Void {
+    let _ = value.bridgeJSLowerParameter()
+    let promiseValue = promise.bridgeJSLowerParameter()
+    promise_resolve_BridgeJSRuntimeTests_7ContactV(promiseValue)
+    if let error = _swift_js_take_exception() { throw error }
 }
 
-@_expose(wasm, "bjs_TextProcessor_makeOptionalStringFormatter")
-@_cdecl("bjs_TextProcessor_makeOptionalStringFormatter")
-public func _bjs_TextProcessor_makeOptionalStringFormatter(_ _self: UnsafeMutableRawPointer) -> Int32 {
-    #if arch(wasm32)
-    let ret = TextProcessor.bridgeJSLiftParameter(_self).makeOptionalStringFormatter()
-    return JSTypedClosure(ret).bridgeJSLowerReturn()
-    #else
+@JSFunction func Promise_resolve_Sa11PublicPointV(_ promise: JSObject, _ value: [PublicPoint]) throws(JSException)
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "promise_resolve_BridgeJSRuntimeTests_Sa11PublicPointV")
+fileprivate func promise_resolve_BridgeJSRuntimeTests_Sa11PublicPointV_extern(_ promise: Int32) -> Void
+#else
+fileprivate func promise_resolve_BridgeJSRuntimeTests_Sa11PublicPointV_extern(_ promise: Int32) -> Void {
     fatalError("Only available on WebAssembly")
-    #endif
+}
+#endif
+@inline(never) fileprivate func promise_resolve_BridgeJSRuntimeTests_Sa11PublicPointV(_ promise: Int32) -> Void {
+    return promise_resolve_BridgeJSRuntimeTests_Sa11PublicPointV_extern(promise)
 }
 
-@_expose(wasm, "bjs_TextProcessor_makeOptionalGreeterCreator")
-@_cdecl("bjs_TextProcessor_makeOptionalGreeterCreator")
-public func _bjs_TextProcessor_makeOptionalGreeterCreator(_ _self: UnsafeMutableRawPointer) -> Int32 {
-    #if arch(wasm32)
-    let ret = TextProcessor.bridgeJSLiftParameter(_self).makeOptionalGreeterCreator()
-    return JSTypedClosure(ret).bridgeJSLowerReturn()
-    #else
-    fatalError("Only available on WebAssembly")
-    #endif
+func _$Promise_resolve_Sa11PublicPointV(_ promise: JSObject, _ value: [PublicPoint]) throws(JSException) -> Void {
+    let _ = value.bridgeJSLowerParameter()
+    let promiseValue = promise.bridgeJSLowerParameter()
+    promise_resolve_BridgeJSRuntimeTests_Sa11PublicPointV(promiseValue)
+    if let error = _swift_js_take_exception() { throw error }
 }
 
-@_expose(wasm, "bjs_TextProcessor_processDirection")
-@_cdecl("bjs_TextProcessor_processDirection")
-public func _bjs_TextProcessor_processDirection(_ _self: UnsafeMutableRawPointer, _ callback: Int32) -> Void {
-    #if arch(wasm32)
-    let ret = TextProcessor.bridgeJSLiftParameter(_self).processDirection(_: _BJS_Closure_20BridgeJSRuntimeTests9DirectionO_SS.bridgeJSLift(callback))
-    return ret.bridgeJSLowerReturn()
-    #else
+@JSFunction func Promise_resolve_Sq11PublicPointV(_ promise: JSObject, _ value: Optional<PublicPoint>) throws(JSException)
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "promise_resolve_BridgeJSRuntimeTests_Sq11PublicPointV")
+fileprivate func promise_resolve_BridgeJSRuntimeTests_Sq11PublicPointV_extern(_ promise: Int32) -> Void
+#else
+fileprivate func promise_resolve_BridgeJSRuntimeTests_Sq11PublicPointV_extern(_ promise: Int32) -> Void {
     fatalError("Only available on WebAssembly")
-    #endif
+}
+#endif
+@inline(never) fileprivate func promise_resolve_BridgeJSRuntimeTests_Sq11PublicPointV(_ promise: Int32) -> Void {
+    return promise_resolve_BridgeJSRuntimeTests_Sq11PublicPointV_extern(promise)
 }
 
-@_expose(wasm, "bjs_TextProcessor_processTheme")
-@_cdecl("bjs_TextProcessor_processTheme")
-public func _bjs_TextProcessor_processTheme(_ _self: UnsafeMutableRawPointer, _ callback: Int32) -> Void {
-    #if arch(wasm32)
-    let ret = TextProcessor.bridgeJSLiftParameter(_self).processTheme(_: _BJS_Closure_20BridgeJSRuntimeTests5ThemeO_SS.bridgeJSLift(callback))
-    return ret.bridgeJSLowerReturn()
-    #else
-    fatalError("Only available on WebAssembly")
-    #endif
+func _$Promise_resolve_Sq11PublicPointV(_ promise: JSObject, _ value: Optional<PublicPoint>) throws(JSException) -> Void {
+    let _ = value.bridgeJSLowerParameter()
+    let promiseValue = promise.bridgeJSLowerParameter()
+    promise_resolve_BridgeJSRuntimeTests_Sq11PublicPointV(promiseValue)
+    if let error = _swift_js_take_exception() { throw error }
 }
 
-@_expose(wasm, "bjs_TextProcessor_processHttpStatus")
-@_cdecl("bjs_TextProcessor_processHttpStatus")
-public func _bjs_TextProcessor_processHttpStatus(_ _self: UnsafeMutableRawPointer, _ callback: Int32) -> Int32 {
-    #if arch(wasm32)
-    let ret = TextProcessor.bridgeJSLiftParameter(_self).processHttpStatus(_: _BJS_Closure_20BridgeJSRuntimeTests10HttpStatusO_Si.bridgeJSLift(callback))
-    return ret.bridgeJSLowerReturn()
-    #else
+@JSFunction func Promise_resolve_SD11PublicPointV(_ promise: JSObject, _ value: [String: PublicPoint]) throws(JSException)
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "promise_resolve_BridgeJSRuntimeTests_SD11PublicPointV")
+fileprivate func promise_resolve_BridgeJSRuntimeTests_SD11PublicPointV_extern(_ promise: Int32) -> Void
+#else
+fileprivate func promise_resolve_BridgeJSRuntimeTests_SD11PublicPointV_extern(_ promise: Int32) -> Void {
     fatalError("Only available on WebAssembly")
-    #endif
+}
+#endif
+@inline(never) fileprivate func promise_resolve_BridgeJSRuntimeTests_SD11PublicPointV(_ promise: Int32) -> Void {
+    return promise_resolve_BridgeJSRuntimeTests_SD11PublicPointV_extern(promise)
 }
 
-@_expose(wasm, "bjs_TextProcessor_processAPIResult")
-@_cdecl("bjs_TextProcessor_processAPIResult")
-public func _bjs_TextProcessor_processAPIResult(_ _self: UnsafeMutableRawPointer, _ callback: Int32) -> Void {
-    #if arch(wasm32)
-    let ret = TextProcessor.bridgeJSLiftParameter(_self).processAPIResult(_: _BJS_Closure_20BridgeJSRuntimeTests9APIResultO_SS.bridgeJSLift(callback))
-    return ret.bridgeJSLowerReturn()
-    #else
-    fatalError("Only available on WebAssembly")
-    #endif
+func _$Promise_resolve_SD11PublicPointV(_ promise: JSObject, _ value: [String: PublicPoint]) throws(JSException) -> Void {
+    let _ = value.bridgeJSLowerParameter()
+    let promiseValue = promise.bridgeJSLowerParameter()
+    promise_resolve_BridgeJSRuntimeTests_SD11PublicPointV(promiseValue)
+    if let error = _swift_js_take_exception() { throw error }
 }
 
-@_expose(wasm, "bjs_TextProcessor_makeDirectionChecker")
-@_cdecl("bjs_TextProcessor_makeDirectionChecker")
-public func _bjs_TextProcessor_makeDirectionChecker(_ _self: UnsafeMutableRawPointer) -> Int32 {
-    #if arch(wasm32)
-    let ret = TextProcessor.bridgeJSLiftParameter(_self).makeDirectionChecker()
-    return JSTypedClosure(ret).bridgeJSLowerReturn()
-    #else
+@JSFunction func Promise_resolve_9DataPointV(_ promise: JSObject, _ value: DataPoint) throws(JSException)
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "promise_resolve_BridgeJSRuntimeTests_9DataPointV")
+fileprivate func promise_resolve_BridgeJSRuntimeTests_9DataPointV_extern(_ promise: Int32) -> Void
+#else
+fileprivate func promise_resolve_BridgeJSRuntimeTests_9DataPointV_extern(_ promise: Int32) -> Void {
     fatalError("Only available on WebAssembly")
-    #endif
+}
+#endif
+@inline(never) fileprivate func promise_resolve_BridgeJSRuntimeTests_9DataPointV(_ promise: Int32) -> Void {
+    return promise_resolve_BridgeJSRuntimeTests_9DataPointV_extern(promise)
 }
 
-@_expose(wasm, "bjs_TextProcessor_makeThemeValidator")
-@_cdecl("bjs_TextProcessor_makeThemeValidator")
-public func _bjs_TextProcessor_makeThemeValidator(_ _self: UnsafeMutableRawPointer) -> Int32 {
-    #if arch(wasm32)
-    let ret = TextProcessor.bridgeJSLiftParameter(_self).makeThemeValidator()
-    return JSTypedClosure(ret).bridgeJSLowerReturn()
-    #else
-    fatalError("Only available on WebAssembly")
-    #endif
+func _$Promise_resolve_9DataPointV(_ promise: JSObject, _ value: DataPoint) throws(JSException) -> Void {
+    let _ = value.bridgeJSLowerParameter()
+    let promiseValue = promise.bridgeJSLowerParameter()
+    promise_resolve_BridgeJSRuntimeTests_9DataPointV(promiseValue)
+    if let error = _swift_js_take_exception() { throw error }
 }
 
-@_expose(wasm, "bjs_TextProcessor_makeStatusCodeExtractor")
-@_cdecl("bjs_TextProcessor_makeStatusCodeExtractor")
-public func _bjs_TextProcessor_makeStatusCodeExtractor(_ _self: UnsafeMutableRawPointer) -> Int32 {
-    #if arch(wasm32)
-    let ret = TextProcessor.bridgeJSLiftParameter(_self).makeStatusCodeExtractor()
-    return JSTypedClosure(ret).bridgeJSLowerReturn()
-    #else
+extension Polygon: _BridgedSwiftAlias, _BridgedSwiftStackType {}
+
+extension Tag: _BridgedSwiftAlias, _BridgedSwiftStackType {}
+
+extension TagHolder: _BridgedSwiftAlias, _BridgedSwiftStackType {}
+
+extension Coordinate: _BridgedSwiftAlias, _BridgedSwiftStruct {}
+
+extension Priority: _BridgedSwiftAlias, _BridgedSwiftStackType {}
+
+extension Alert: _BridgedSwiftAlias, _BridgedSwiftCaseEnum {}
+
+extension UserId: _BridgedSwiftAlias, _BridgedSwiftStackType {}
+
+extension Tagged: _BridgedSwiftAlias, _BridgedSwiftStackType {}
+
+extension Canvas: _BridgedSwiftAlias, _BridgedSwiftStackType {}
+
+extension AliasedTag: _BridgedSwiftAlias, _BridgedSwiftAssociatedValueEnum {}
+
+extension Boxed: _BridgedSwiftAlias, _BridgedSwiftStackType {}
+
+#if arch(wasm32)
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_Surface_init")
+fileprivate func bjs_Surface_init_extern(_ labelBytes: Int32, _ labelLength: Int32) -> Int32
+#else
+fileprivate func bjs_Surface_init_extern(_ labelBytes: Int32, _ labelLength: Int32) -> Int32 {
     fatalError("Only available on WebAssembly")
-    #endif
+}
+#endif
+@inline(never) fileprivate func bjs_Surface_init(_ labelBytes: Int32, _ labelLength: Int32) -> Int32 {
+    return bjs_Surface_init_extern(labelBytes, labelLength)
 }
 
-@_expose(wasm, "bjs_TextProcessor_makeAPIResultHandler")
-@_cdecl("bjs_TextProcessor_makeAPIResultHandler")
-public func _bjs_TextProcessor_makeAPIResultHandler(_ _self: UnsafeMutableRawPointer) -> Int32 {
-    #if arch(wasm32)
-    let ret = TextProcessor.bridgeJSLiftParameter(_self).makeAPIResultHandler()
-    return JSTypedClosure(ret).bridgeJSLowerReturn()
-    #else
+#if arch(wasm32)
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_Surface_label_get")
+fileprivate func bjs_Surface_label_get_extern(_ self: Int32) -> Int32
+#else
+fileprivate func bjs_Surface_label_get_extern(_ self: Int32) -> Int32 {
     fatalError("Only available on WebAssembly")
-    #endif
+}
+#endif
+@inline(never) fileprivate func bjs_Surface_label_get(_ self: Int32) -> Int32 {
+    return bjs_Surface_label_get_extern(self)
 }
 
-@_expose(wasm, "bjs_TextProcessor_processOptionalDirection")
-@_cdecl("bjs_TextProcessor_processOptionalDirection")
-public func _bjs_TextProcessor_processOptionalDirection(_ _self: UnsafeMutableRawPointer, _ callback: Int32) -> Void {
-    #if arch(wasm32)
-    let ret = TextProcessor.bridgeJSLiftParameter(_self).processOptionalDirection(_: _BJS_Closure_20BridgeJSRuntimeTestsSq9DirectionO_SS.bridgeJSLift(callback))
-    return ret.bridgeJSLowerReturn()
-    #else
-    fatalError("Only available on WebAssembly")
-    #endif
+func _$Surface_init(_ label: String) throws(JSException) -> JSObject {
+    let ret0 = label.bridgeJSWithLoweredParameter { (labelBytes, labelLength) in
+        let ret = bjs_Surface_init(labelBytes, labelLength)
+        return ret
+    }
+    let ret = ret0
+    if let error = _swift_js_take_exception() {
+        throw error
+    }
+    return JSObject.bridgeJSLiftReturn(ret)
 }
 
-@_expose(wasm, "bjs_TextProcessor_processOptionalTheme")
-@_cdecl("bjs_TextProcessor_processOptionalTheme")
-public func _bjs_TextProcessor_processOptionalTheme(_ _self: UnsafeMutableRawPointer, _ callback: Int32) -> Void {
-    #if arch(wasm32)
-    let ret = TextProcessor.bridgeJSLiftParameter(_self).processOptionalTheme(_: _BJS_Closure_20BridgeJSRuntimeTestsSq5ThemeO_SS.bridgeJSLift(callback))
-    return ret.bridgeJSLowerReturn()
-    #else
-    fatalError("Only available on WebAssembly")
-    #endif
+func _$Surface_label_get(_ self: JSObject) throws(JSException) -> String {
+    let selfValue = self.bridgeJSLowerParameter()
+    let ret = bjs_Surface_label_get(selfValue)
+    if let error = _swift_js_take_exception() {
+        throw error
+    }
+    return String.bridgeJSLiftReturn(ret)
 }
 
-@_expose(wasm, "bjs_TextProcessor_processOptionalAPIResult")
-@_cdecl("bjs_TextProcessor_processOptionalAPIResult")
-public func _bjs_TextProcessor_processOptionalAPIResult(_ _self: UnsafeMutableRawPointer, _ callback: Int32) -> Void {
-    #if arch(wasm32)
-    let ret = TextProcessor.bridgeJSLiftParameter(_self).processOptionalAPIResult(_: _BJS_Closure_20BridgeJSRuntimeTestsSq9APIResultO_SS.bridgeJSLift(callback))
-    return ret.bridgeJSLowerReturn()
-    #else
+#if arch(wasm32)
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_AliasImports_jsRoundTripTagged_static")
+fileprivate func bjs_AliasImports_jsRoundTripTagged_static_extern(_ valueBytes: Int32, _ valueLength: Int32) -> Int32
+#else
+fileprivate func bjs_AliasImports_jsRoundTripTagged_static_extern(_ valueBytes: Int32, _ valueLength: Int32) -> Int32 {
     fatalError("Only available on WebAssembly")
-    #endif
+}
+#endif
+@inline(never) fileprivate func bjs_AliasImports_jsRoundTripTagged_static(_ valueBytes: Int32, _ valueLength: Int32) -> Int32 {
+    return bjs_AliasImports_jsRoundTripTagged_static_extern(valueBytes, valueLength)
 }
 
-@_expose(wasm, "bjs_TextProcessor_makeOptionalDirectionFormatter")
-@_cdecl("bjs_TextProcessor_makeOptionalDirectionFormatter")
-public func _bjs_TextProcessor_makeOptionalDirectionFormatter(_ _self: UnsafeMutableRawPointer) -> Int32 {
-    #if arch(wasm32)
-    let ret = TextProcessor.bridgeJSLiftParameter(_self).makeOptionalDirectionFormatter()
-    return JSTypedClosure(ret).bridgeJSLowerReturn()
-    #else
+#if arch(wasm32)
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_AliasImports_jsRoundTripOptionalTagged_static")
+fileprivate func bjs_AliasImports_jsRoundTripOptionalTagged_static_extern(_ valueIsSome: Int32, _ valueBytes: Int32, _ valueLength: Int32) -> Void
+#else
+fileprivate func bjs_AliasImports_jsRoundTripOptionalTagged_static_extern(_ valueIsSome: Int32, _ valueBytes: Int32, _ valueLength: Int32) -> Void {
     fatalError("Only available on WebAssembly")
-    #endif
+}
+#endif
+@inline(never) fileprivate func bjs_AliasImports_jsRoundTripOptionalTagged_static(_ valueIsSome: Int32, _ valueBytes: Int32, _ valueLength: Int32) -> Void {
+    return bjs_AliasImports_jsRoundTripOptionalTagged_static_extern(valueIsSome, valueBytes, valueLength)
 }
 
-@_expose(wasm, "bjs_TextProcessor_processDataProcessor")
-@_cdecl("bjs_TextProcessor_processDataProcessor")
-public func _bjs_TextProcessor_processDataProcessor(_ _self: UnsafeMutableRawPointer, _ callback: Int32) -> Void {
-    #if arch(wasm32)
-    let ret = TextProcessor.bridgeJSLiftParameter(_self).processDataProcessor(_: _BJS_Closure_20BridgeJSRuntimeTests13DataProcessorP_SS.bridgeJSLift(callback))
-    return ret.bridgeJSLowerReturn()
-    #else
+#if arch(wasm32)
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_AliasImports_jsProduceOptionalCanvas_static")
+fileprivate func bjs_AliasImports_jsProduceOptionalCanvas_static_extern(_ labelIsSome: Int32, _ labelBytes: Int32, _ labelLength: Int32) -> Void
+#else
+fileprivate func bjs_AliasImports_jsProduceOptionalCanvas_static_extern(_ labelIsSome: Int32, _ labelBytes: Int32, _ labelLength: Int32) -> Void {
     fatalError("Only available on WebAssembly")
-    #endif
+}
+#endif
+@inline(never) fileprivate func bjs_AliasImports_jsProduceOptionalCanvas_static(_ labelIsSome: Int32, _ labelBytes: Int32, _ labelLength: Int32) -> Void {
+    return bjs_AliasImports_jsProduceOptionalCanvas_static_extern(labelIsSome, labelBytes, labelLength)
 }
 
-@_expose(wasm, "bjs_TextProcessor_makeDataProcessorFactory")
-@_cdecl("bjs_TextProcessor_makeDataProcessorFactory")
-public func _bjs_TextProcessor_makeDataProcessorFactory(_ _self: UnsafeMutableRawPointer) -> Int32 {
-    #if arch(wasm32)
-    let ret = TextProcessor.bridgeJSLiftParameter(_self).makeDataProcessorFactory()
-    return JSTypedClosure(ret).bridgeJSLowerReturn()
-    #else
+#if arch(wasm32)
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_AliasImports_jsRoundTripAliasedTags_static")
+fileprivate func bjs_AliasImports_jsRoundTripAliasedTags_static_extern() -> Void
+#else
+fileprivate func bjs_AliasImports_jsRoundTripAliasedTags_static_extern() -> Void {
     fatalError("Only available on WebAssembly")
-    #endif
+}
+#endif
+@inline(never) fileprivate func bjs_AliasImports_jsRoundTripAliasedTags_static() -> Void {
+    return bjs_AliasImports_jsRoundTripAliasedTags_static_extern()
 }
 
-@_expose(wasm, "bjs_TextProcessor_roundtripDataProcessor")
-@_cdecl("bjs_TextProcessor_roundtripDataProcessor")
-public func _bjs_TextProcessor_roundtripDataProcessor(_ _self: UnsafeMutableRawPointer, _ callback: Int32) -> Int32 {
-    #if arch(wasm32)
-    let ret = TextProcessor.bridgeJSLiftParameter(_self).roundtripDataProcessor(_: _BJS_Closure_20BridgeJSRuntimeTests13DataProcessorP_13DataProcessorP.bridgeJSLift(callback))
-    return JSTypedClosure(ret).bridgeJSLowerReturn()
-    #else
+#if arch(wasm32)
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_AliasImports_jsRoundTripPolygon_static")
+fileprivate func bjs_AliasImports_jsRoundTripPolygon_static_extern(_ value: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer
+#else
+fileprivate func bjs_AliasImports_jsRoundTripPolygon_static_extern(_ value: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer {
     fatalError("Only available on WebAssembly")
-    #endif
+}
+#endif
+@inline(never) fileprivate func bjs_AliasImports_jsRoundTripPolygon_static(_ value: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer {
+    return bjs_AliasImports_jsRoundTripPolygon_static_extern(value)
 }
 
-@_expose(wasm, "bjs_TextProcessor_processOptionalDataProcessor")
-@_cdecl("bjs_TextProcessor_processOptionalDataProcessor")
-public func _bjs_TextProcessor_processOptionalDataProcessor(_ _self: UnsafeMutableRawPointer, _ callback: Int32) -> Void {
-    #if arch(wasm32)
-    let ret = TextProcessor.bridgeJSLiftParameter(_self).processOptionalDataProcessor(_: _BJS_Closure_20BridgeJSRuntimeTestsSq13DataProcessorP_SS.bridgeJSLift(callback))
-    return ret.bridgeJSLowerReturn()
-    #else
+#if arch(wasm32)
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_AliasImports_jsRoundTripCoordinate_static")
+fileprivate func bjs_AliasImports_jsRoundTripCoordinate_static_extern() -> Void
+#else
+fileprivate func bjs_AliasImports_jsRoundTripCoordinate_static_extern() -> Void {
     fatalError("Only available on WebAssembly")
-    #endif
+}
+#endif
+@inline(never) fileprivate func bjs_AliasImports_jsRoundTripCoordinate_static() -> Void {
+    return bjs_AliasImports_jsRoundTripCoordinate_static_extern()
 }
 
-@_expose(wasm, "bjs_TextProcessor_processVector")
-@_cdecl("bjs_TextProcessor_processVector")
-public func _bjs_TextProcessor_processVector(_ _self: UnsafeMutableRawPointer, _ callback: Int32) -> Float64 {
-    #if arch(wasm32)
-    let ret = TextProcessor.bridgeJSLiftParameter(_self).processVector(_: _BJS_Closure_20BridgeJSRuntimeTestsSd_8Vector2DV.bridgeJSLift(callback))
-    return ret.bridgeJSLowerReturn()
-    #else
+#if arch(wasm32)
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_AliasImports_jsRoundTripUserId_static")
+fileprivate func bjs_AliasImports_jsRoundTripUserId_static_extern(_ value: Int32) -> Int32
+#else
+fileprivate func bjs_AliasImports_jsRoundTripUserId_static_extern(_ value: Int32) -> Int32 {
     fatalError("Only available on WebAssembly")
-    #endif
+}
+#endif
+@inline(never) fileprivate func bjs_AliasImports_jsRoundTripUserId_static(_ value: Int32) -> Int32 {
+    return bjs_AliasImports_jsRoundTripUserId_static_extern(value)
 }
 
-@_expose(wasm, "bjs_TextProcessor_processOptionalVector")
-@_cdecl("bjs_TextProcessor_processOptionalVector")
-public func _bjs_TextProcessor_processOptionalVector(_ _self: UnsafeMutableRawPointer, _ callback: Int32) -> Void {
-    #if arch(wasm32)
-    let ret = TextProcessor.bridgeJSLiftParameter(_self).processOptionalVector(_: _BJS_Closure_20BridgeJSRuntimeTestsSd_Sq8Vector2DV.bridgeJSLift(callback))
-    return ret.bridgeJSLowerReturn()
-    #else
+#if arch(wasm32)
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_AliasImports_jsRoundTripOptionalUserId_static")
+fileprivate func bjs_AliasImports_jsRoundTripOptionalUserId_static_extern(_ valueIsSome: Int32, _ valueValue: Int32) -> Void
+#else
+fileprivate func bjs_AliasImports_jsRoundTripOptionalUserId_static_extern(_ valueIsSome: Int32, _ valueValue: Int32) -> Void {
     fatalError("Only available on WebAssembly")
-    #endif
+}
+#endif
+@inline(never) fileprivate func bjs_AliasImports_jsRoundTripOptionalUserId_static(_ valueIsSome: Int32, _ valueValue: Int32) -> Void {
+    return bjs_AliasImports_jsRoundTripOptionalUserId_static_extern(valueIsSome, valueValue)
 }
 
-@_expose(wasm, "bjs_TextProcessor_deinit")
-@_cdecl("bjs_TextProcessor_deinit")
-public func _bjs_TextProcessor_deinit(_ pointer: UnsafeMutableRawPointer) -> Void {
-    #if arch(wasm32)
-    Unmanaged<TextProcessor>.fromOpaque(pointer).release()
-    #else
-    fatalError("Only available on WebAssembly")
-    #endif
+func _$AliasImports_jsRoundTripTagged(_ value: Tagged) throws(JSException) -> Tagged {
+    let ret0 = value.bridgeJSWithLoweredParameter { (valueBytes, valueLength) in
+        let ret = bjs_AliasImports_jsRoundTripTagged_static(valueBytes, valueLength)
+        return ret
+    }
+    let ret = ret0
+    if let error = _swift_js_take_exception() {
+        throw error
+    }
+    return Tagged.bridgeJSLiftReturn(ret)
 }
 
-extension TextProcessor: ConvertibleToJSValue, _BridgedSwiftHeapObject, _BridgedSwiftProtocolExportable {
-    var jsValue: JSValue {
-        return .object(JSObject(id: UInt32(bitPattern: _bjs_TextProcessor_wrap(Unmanaged.passRetained(self).toOpaque()))))
+func _$AliasImports_jsRoundTripOptionalTagged(_ value: Optional<Tagged>) throws(JSException) -> Optional<Tagged> {
+    value.bridgeJSWithLoweredParameter { (valueIsSome, valueBytes, valueLength) in
+        bjs_AliasImports_jsRoundTripOptionalTagged_static(valueIsSome, valueBytes, valueLength)
     }
-    consuming func bridgeJSLowerAsProtocolReturn() -> Int32 {
-        _bjs_TextProcessor_wrap(Unmanaged.passRetained(self).toOpaque())
+    if let error = _swift_js_take_exception() {
+        throw error
     }
+    return Optional<Tagged>.bridgeJSLiftReturnFromSideChannel()
 }
 
-#if arch(wasm32)
-@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_TextProcessor_wrap")
-fileprivate func _bjs_TextProcessor_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32
-#else
-fileprivate func _bjs_TextProcessor_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 {
-    fatalError("Only available on WebAssembly")
+func _$AliasImports_jsProduceOptionalCanvas(_ label: Optional<String>) throws(JSException) -> Optional<Canvas> {
+    label.bridgeJSWithLoweredParameter { (labelIsSome, labelBytes, labelLength) in
+        bjs_AliasImports_jsProduceOptionalCanvas_static(labelIsSome, labelBytes, labelLength)
+    }
+    if let error = _swift_js_take_exception() {
+        throw error
+    }
+    return Optional<Canvas>.bridgeJSLiftReturn()
 }
-#endif
-@inline(never) fileprivate func _bjs_TextProcessor_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 {
-    return _bjs_TextProcessor_wrap_extern(pointer)
+
+func _$AliasImports_jsRoundTripAliasedTags(_ values: [Optional<AliasedTag>]) throws(JSException) -> [Optional<AliasedTag>] {
+    let _ = values.bridgeJSLowerParameter()
+    bjs_AliasImports_jsRoundTripAliasedTags_static()
+    if let error = _swift_js_take_exception() {
+        throw error
+    }
+    return [Optional<AliasedTag>].bridgeJSLiftReturn()
 }
 
-@_expose(wasm, "bjs_OptionalHolder_init")
-@_cdecl("bjs_OptionalHolder_init")
-public func _bjs_OptionalHolder_init(_ nullableGreeterIsSome: Int32, _ nullableGreeterValue: UnsafeMutableRawPointer, _ undefinedNumberIsSome: Int32, _ undefinedNumberValue: Float64) -> UnsafeMutableRawPointer {
-    #if arch(wasm32)
-    let ret = OptionalHolder(nullableGreeter: Optional<Greeter>.bridgeJSLiftParameter(nullableGreeterIsSome, nullableGreeterValue), undefinedNumber: JSUndefinedOr<Double>.bridgeJSLiftParameter(undefinedNumberIsSome, undefinedNumberValue))
-    return ret.bridgeJSLowerReturn()
-    #else
-    fatalError("Only available on WebAssembly")
-    #endif
+func _$AliasImports_jsRoundTripPolygon(_ value: Polygon) throws(JSException) -> Polygon {
+    let valuePointer = value.bridgeJSLowerParameter()
+    let ret = bjs_AliasImports_jsRoundTripPolygon_static(valuePointer)
+    if let error = _swift_js_take_exception() {
+        throw error
+    }
+    return Polygon.bridgeJSLiftReturn(ret)
 }
 
-@_expose(wasm, "bjs_OptionalHolder_nullableGreeter_get")
-@_cdecl("bjs_OptionalHolder_nullableGreeter_get")
-public func _bjs_OptionalHolder_nullableGreeter_get(_ _self: UnsafeMutableRawPointer) -> Void {
-    #if arch(wasm32)
-    let ret = OptionalHolder.bridgeJSLiftParameter(_self).nullableGreeter
-    return ret.bridgeJSLowerReturn()
-    #else
-    fatalError("Only available on WebAssembly")
-    #endif
+func _$AliasImports_jsRoundTripCoordinate(_ value: Coordinate) throws(JSException) -> Coordinate {
+    let _ = value.bridgeJSLowerParameter()
+    bjs_AliasImports_jsRoundTripCoordinate_static()
+    if let error = _swift_js_take_exception() {
+        throw error
+    }
+    return Coordinate.bridgeJSLiftReturn()
 }
 
-@_expose(wasm, "bjs_OptionalHolder_nullableGreeter_set")
-@_cdecl("bjs_OptionalHolder_nullableGreeter_set")
-public func _bjs_OptionalHolder_nullableGreeter_set(_ _self: UnsafeMutableRawPointer, _ valueIsSome: Int32, _ valueValue: UnsafeMutableRawPointer) -> Void {
-    #if arch(wasm32)
-    OptionalHolder.bridgeJSLiftParameter(_self).nullableGreeter = Optional<Greeter>.bridgeJSLiftParameter(valueIsSome, valueValue)
-    #else
-    fatalError("Only available on WebAssembly")
-    #endif
+func _$AliasImports_jsRoundTripUserId(_ value: UserId) throws(JSException) -> UserId {
+    let valueValue = value.bridgeJSLowerParameter()
+    let ret = bjs_AliasImports_jsRoundTripUserId_static(valueValue)
+    if let error = _swift_js_take_exception() {
+        throw error
+    }
+    return UserId.bridgeJSLiftReturn(ret)
 }
 
-@_expose(wasm, "bjs_OptionalHolder_undefinedNumber_get")
-@_cdecl("bjs_OptionalHolder_undefinedNumber_get")
-public func _bjs_OptionalHolder_undefinedNumber_get(_ _self: UnsafeMutableRawPointer) -> Void {
-    #if arch(wasm32)
-    let ret = OptionalHolder.bridgeJSLiftParameter(_self).undefinedNumber
-    return ret.bridgeJSLowerReturn()
-    #else
-    fatalError("Only available on WebAssembly")
-    #endif
+func _$AliasImports_jsRoundTripOptionalUserId(_ value: Optional<UserId>) throws(JSException) -> Optional<UserId> {
+    let (valueIsSome, valueValue) = value.bridgeJSLowerParameter()
+    bjs_AliasImports_jsRoundTripOptionalUserId_static(valueIsSome, valueValue)
+    if let error = _swift_js_take_exception() {
+        throw error
+    }
+    return Optional<UserId>.bridgeJSLiftReturnFromSideChannel()
 }
 
-@_expose(wasm, "bjs_OptionalHolder_undefinedNumber_set")
-@_cdecl("bjs_OptionalHolder_undefinedNumber_set")
-public func _bjs_OptionalHolder_undefinedNumber_set(_ _self: UnsafeMutableRawPointer, _ valueIsSome: Int32, _ valueValue: Float64) -> Void {
-    #if arch(wasm32)
-    OptionalHolder.bridgeJSLiftParameter(_self).undefinedNumber = JSUndefinedOr<Double>.bridgeJSLiftParameter(valueIsSome, valueValue)
-    #else
+#if arch(wasm32)
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_ArrayElementObject_init")
+fileprivate func bjs_ArrayElementObject_init_extern(_ idBytes: Int32, _ idLength: Int32) -> Int32
+#else
+fileprivate func bjs_ArrayElementObject_init_extern(_ idBytes: Int32, _ idLength: Int32) -> Int32 {
     fatalError("Only available on WebAssembly")
-    #endif
+}
+#endif
+@inline(never) fileprivate func bjs_ArrayElementObject_init(_ idBytes: Int32, _ idLength: Int32) -> Int32 {
+    return bjs_ArrayElementObject_init_extern(idBytes, idLength)
 }
 
-@_expose(wasm, "bjs_OptionalHolder_deinit")
-@_cdecl("bjs_OptionalHolder_deinit")
-public func _bjs_OptionalHolder_deinit(_ pointer: UnsafeMutableRawPointer) -> Void {
-    #if arch(wasm32)
-    Unmanaged<OptionalHolder>.fromOpaque(pointer).release()
-    #else
+#if arch(wasm32)
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_ArrayElementObject_id_get")
+fileprivate func bjs_ArrayElementObject_id_get_extern(_ self: Int32) -> Int32
+#else
+fileprivate func bjs_ArrayElementObject_id_get_extern(_ self: Int32) -> Int32 {
     fatalError("Only available on WebAssembly")
-    #endif
+}
+#endif
+@inline(never) fileprivate func bjs_ArrayElementObject_id_get(_ self: Int32) -> Int32 {
+    return bjs_ArrayElementObject_id_get_extern(self)
 }
 
-extension OptionalHolder: ConvertibleToJSValue, _BridgedSwiftHeapObject, _BridgedSwiftProtocolExportable {
-    var jsValue: JSValue {
-        return .object(JSObject(id: UInt32(bitPattern: _bjs_OptionalHolder_wrap(Unmanaged.passRetained(self).toOpaque()))))
+func _$ArrayElementObject_init(_ id: String) throws(JSException) -> JSObject {
+    let ret0 = id.bridgeJSWithLoweredParameter { (idBytes, idLength) in
+        let ret = bjs_ArrayElementObject_init(idBytes, idLength)
+        return ret
     }
-    consuming func bridgeJSLowerAsProtocolReturn() -> Int32 {
-        _bjs_OptionalHolder_wrap(Unmanaged.passRetained(self).toOpaque())
+    let ret = ret0
+    if let error = _swift_js_take_exception() {
+        throw error
+    }
+    return JSObject.bridgeJSLiftReturn(ret)
+}
+
+func _$ArrayElementObject_id_get(_ self: JSObject) throws(JSException) -> String {
+    let selfValue = self.bridgeJSLowerParameter()
+    let ret = bjs_ArrayElementObject_id_get(selfValue)
+    if let error = _swift_js_take_exception() {
+        throw error
     }
+    return String.bridgeJSLiftReturn(ret)
 }
 
 #if arch(wasm32)
-@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_OptionalHolder_wrap")
-fileprivate func _bjs_OptionalHolder_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_ArraySupportImports_jsIntArrayLength_static")
+fileprivate func bjs_ArraySupportImports_jsIntArrayLength_static_extern() -> Int32
 #else
-fileprivate func _bjs_OptionalHolder_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 {
+fileprivate func bjs_ArraySupportImports_jsIntArrayLength_static_extern() -> Int32 {
     fatalError("Only available on WebAssembly")
 }
 #endif
-@inline(never) fileprivate func _bjs_OptionalHolder_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 {
-    return _bjs_OptionalHolder_wrap_extern(pointer)
+@inline(never) fileprivate func bjs_ArraySupportImports_jsIntArrayLength_static() -> Int32 {
+    return bjs_ArraySupportImports_jsIntArrayLength_static_extern()
 }
 
-@_expose(wasm, "bjs_OptionalPropertyHolder_init")
-@_cdecl("bjs_OptionalPropertyHolder_init")
-public func _bjs_OptionalPropertyHolder_init(_ optionalNameIsSome: Int32, _ optionalNameBytes: Int32, _ optionalNameLength: Int32) -> UnsafeMutableRawPointer {
-    #if arch(wasm32)
-    let ret = OptionalPropertyHolder(optionalName: Optional<String>.bridgeJSLiftParameter(optionalNameIsSome, optionalNameBytes, optionalNameLength))
-    return ret.bridgeJSLowerReturn()
-    #else
+#if arch(wasm32)
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_ArraySupportImports_jsRoundTripIntArray_static")
+fileprivate func bjs_ArraySupportImports_jsRoundTripIntArray_static_extern() -> Void
+#else
+fileprivate func bjs_ArraySupportImports_jsRoundTripIntArray_static_extern() -> Void {
     fatalError("Only available on WebAssembly")
-    #endif
 }
-
-@_expose(wasm, "bjs_OptionalPropertyHolder_optionalName_get")
-@_cdecl("bjs_OptionalPropertyHolder_optionalName_get")
-public func _bjs_OptionalPropertyHolder_optionalName_get(_ _self: UnsafeMutableRawPointer) -> Void {
-    #if arch(wasm32)
-    let ret = OptionalPropertyHolder.bridgeJSLiftParameter(_self).optionalName
-    return ret.bridgeJSLowerReturn()
-    #else
-    fatalError("Only available on WebAssembly")
-    #endif
+#endif
+@inline(never) fileprivate func bjs_ArraySupportImports_jsRoundTripIntArray_static() -> Void {
+    return bjs_ArraySupportImports_jsRoundTripIntArray_static_extern()
 }
 
-@_expose(wasm, "bjs_OptionalPropertyHolder_optionalName_set")
-@_cdecl("bjs_OptionalPropertyHolder_optionalName_set")
-public func _bjs_OptionalPropertyHolder_optionalName_set(_ _self: UnsafeMutableRawPointer, _ valueIsSome: Int32, _ valueBytes: Int32, _ valueLength: Int32) -> Void {
-    #if arch(wasm32)
-    OptionalPropertyHolder.bridgeJSLiftParameter(_self).optionalName = Optional<String>.bridgeJSLiftParameter(valueIsSome, valueBytes, valueLength)
-    #else
+#if arch(wasm32)
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_ArraySupportImports_jsRoundTripNumberArray_static")
+fileprivate func bjs_ArraySupportImports_jsRoundTripNumberArray_static_extern() -> Void
+#else
+fileprivate func bjs_ArraySupportImports_jsRoundTripNumberArray_static_extern() -> Void {
     fatalError("Only available on WebAssembly")
-    #endif
 }
-
-@_expose(wasm, "bjs_OptionalPropertyHolder_optionalAge_get")
-@_cdecl("bjs_OptionalPropertyHolder_optionalAge_get")
-public func _bjs_OptionalPropertyHolder_optionalAge_get(_ _self: UnsafeMutableRawPointer) -> Void {
-    #if arch(wasm32)
-    let ret = OptionalPropertyHolder.bridgeJSLiftParameter(_self).optionalAge
-    return ret.bridgeJSLowerReturn()
-    #else
-    fatalError("Only available on WebAssembly")
-    #endif
+#endif
+@inline(never) fileprivate func bjs_ArraySupportImports_jsRoundTripNumberArray_static() -> Void {
+    return bjs_ArraySupportImports_jsRoundTripNumberArray_static_extern()
 }
 
-@_expose(wasm, "bjs_OptionalPropertyHolder_optionalAge_set")
-@_cdecl("bjs_OptionalPropertyHolder_optionalAge_set")
-public func _bjs_OptionalPropertyHolder_optionalAge_set(_ _self: UnsafeMutableRawPointer, _ valueIsSome: Int32, _ valueValue: Int32) -> Void {
-    #if arch(wasm32)
-    OptionalPropertyHolder.bridgeJSLiftParameter(_self).optionalAge = Optional<Int>.bridgeJSLiftParameter(valueIsSome, valueValue)
-    #else
+#if arch(wasm32)
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_ArraySupportImports_jsRoundTripStringArray_static")
+fileprivate func bjs_ArraySupportImports_jsRoundTripStringArray_static_extern() -> Void
+#else
+fileprivate func bjs_ArraySupportImports_jsRoundTripStringArray_static_extern() -> Void {
     fatalError("Only available on WebAssembly")
-    #endif
 }
-
-@_expose(wasm, "bjs_OptionalPropertyHolder_optionalGreeter_get")
-@_cdecl("bjs_OptionalPropertyHolder_optionalGreeter_get")
-public func _bjs_OptionalPropertyHolder_optionalGreeter_get(_ _self: UnsafeMutableRawPointer) -> Void {
-    #if arch(wasm32)
-    let ret = OptionalPropertyHolder.bridgeJSLiftParameter(_self).optionalGreeter
-    return ret.bridgeJSLowerReturn()
-    #else
-    fatalError("Only available on WebAssembly")
-    #endif
+#endif
+@inline(never) fileprivate func bjs_ArraySupportImports_jsRoundTripStringArray_static() -> Void {
+    return bjs_ArraySupportImports_jsRoundTripStringArray_static_extern()
 }
 
-@_expose(wasm, "bjs_OptionalPropertyHolder_optionalGreeter_set")
-@_cdecl("bjs_OptionalPropertyHolder_optionalGreeter_set")
-public func _bjs_OptionalPropertyHolder_optionalGreeter_set(_ _self: UnsafeMutableRawPointer, _ valueIsSome: Int32, _ valueValue: UnsafeMutableRawPointer) -> Void {
-    #if arch(wasm32)
-    OptionalPropertyHolder.bridgeJSLiftParameter(_self).optionalGreeter = Optional<Greeter>.bridgeJSLiftParameter(valueIsSome, valueValue)
-    #else
+#if arch(wasm32)
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_ArraySupportImports_jsRoundTripBoolArray_static")
+fileprivate func bjs_ArraySupportImports_jsRoundTripBoolArray_static_extern() -> Void
+#else
+fileprivate func bjs_ArraySupportImports_jsRoundTripBoolArray_static_extern() -> Void {
     fatalError("Only available on WebAssembly")
-    #endif
+}
+#endif
+@inline(never) fileprivate func bjs_ArraySupportImports_jsRoundTripBoolArray_static() -> Void {
+    return bjs_ArraySupportImports_jsRoundTripBoolArray_static_extern()
 }
 
-@_expose(wasm, "bjs_OptionalPropertyHolder_deinit")
-@_cdecl("bjs_OptionalPropertyHolder_deinit")
-public func _bjs_OptionalPropertyHolder_deinit(_ pointer: UnsafeMutableRawPointer) -> Void {
-    #if arch(wasm32)
-    Unmanaged<OptionalPropertyHolder>.fromOpaque(pointer).release()
-    #else
+#if arch(wasm32)
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_ArraySupportImports_jsRoundTripJSValueArray_static")
+fileprivate func bjs_ArraySupportImports_jsRoundTripJSValueArray_static_extern() -> Void
+#else
+fileprivate func bjs_ArraySupportImports_jsRoundTripJSValueArray_static_extern() -> Void {
     fatalError("Only available on WebAssembly")
-    #endif
 }
-
-extension OptionalPropertyHolder: ConvertibleToJSValue, _BridgedSwiftHeapObject, _BridgedSwiftProtocolExportable {
-    var jsValue: JSValue {
-        return .object(JSObject(id: UInt32(bitPattern: _bjs_OptionalPropertyHolder_wrap(Unmanaged.passRetained(self).toOpaque()))))
-    }
-    consuming func bridgeJSLowerAsProtocolReturn() -> Int32 {
-        _bjs_OptionalPropertyHolder_wrap(Unmanaged.passRetained(self).toOpaque())
-    }
+#endif
+@inline(never) fileprivate func bjs_ArraySupportImports_jsRoundTripJSValueArray_static() -> Void {
+    return bjs_ArraySupportImports_jsRoundTripJSValueArray_static_extern()
 }
 
 #if arch(wasm32)
-@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_OptionalPropertyHolder_wrap")
-fileprivate func _bjs_OptionalPropertyHolder_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_ArraySupportImports_jsRoundTripJSObjectArray_static")
+fileprivate func bjs_ArraySupportImports_jsRoundTripJSObjectArray_static_extern() -> Void
 #else
-fileprivate func _bjs_OptionalPropertyHolder_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 {
+fileprivate func bjs_ArraySupportImports_jsRoundTripJSObjectArray_static_extern() -> Void {
     fatalError("Only available on WebAssembly")
 }
 #endif
-@inline(never) fileprivate func _bjs_OptionalPropertyHolder_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 {
-    return _bjs_OptionalPropertyHolder_wrap_extern(pointer)
+@inline(never) fileprivate func bjs_ArraySupportImports_jsRoundTripJSObjectArray_static() -> Void {
+    return bjs_ArraySupportImports_jsRoundTripJSObjectArray_static_extern()
 }
 
-@_expose(wasm, "bjs_Container_init")
-@_cdecl("bjs_Container_init")
-public func _bjs_Container_init() -> UnsafeMutableRawPointer {
-    #if arch(wasm32)
-    let _tmp_config = Optional<Config>.bridgeJSLiftParameter()
-    let _tmp_location = DataPoint.bridgeJSLiftParameter()
-    let ret = Container(location: _tmp_location, config: _tmp_config)
-    return ret.bridgeJSLowerReturn()
-    #else
+#if arch(wasm32)
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_ArraySupportImports_jsRoundTripJSClassArray_static")
+fileprivate func bjs_ArraySupportImports_jsRoundTripJSClassArray_static_extern() -> Void
+#else
+fileprivate func bjs_ArraySupportImports_jsRoundTripJSClassArray_static_extern() -> Void {
     fatalError("Only available on WebAssembly")
-    #endif
 }
-
-@_expose(wasm, "bjs_Container_location_get")
-@_cdecl("bjs_Container_location_get")
-public func _bjs_Container_location_get(_ _self: UnsafeMutableRawPointer) -> Void {
-    #if arch(wasm32)
-    let ret = Container.bridgeJSLiftParameter(_self).location
-    return ret.bridgeJSLowerReturn()
-    #else
-    fatalError("Only available on WebAssembly")
-    #endif
+#endif
+@inline(never) fileprivate func bjs_ArraySupportImports_jsRoundTripJSClassArray_static() -> Void {
+    return bjs_ArraySupportImports_jsRoundTripJSClassArray_static_extern()
 }
 
-@_expose(wasm, "bjs_Container_location_set")
-@_cdecl("bjs_Container_location_set")
-public func _bjs_Container_location_set(_ _self: UnsafeMutableRawPointer) -> Void {
-    #if arch(wasm32)
-    Container.bridgeJSLiftParameter(_self).location = DataPoint.bridgeJSLiftParameter()
-    #else
+#if arch(wasm32)
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_ArraySupportImports_jsRoundTripOptionalIntArray_static")
+fileprivate func bjs_ArraySupportImports_jsRoundTripOptionalIntArray_static_extern() -> Void
+#else
+fileprivate func bjs_ArraySupportImports_jsRoundTripOptionalIntArray_static_extern() -> Void {
     fatalError("Only available on WebAssembly")
-    #endif
 }
-
-@_expose(wasm, "bjs_Container_config_get")
-@_cdecl("bjs_Container_config_get")
-public func _bjs_Container_config_get(_ _self: UnsafeMutableRawPointer) -> Void {
-    #if arch(wasm32)
-    let ret = Container.bridgeJSLiftParameter(_self).config
-    return ret.bridgeJSLowerReturn()
-    #else
-    fatalError("Only available on WebAssembly")
-    #endif
+#endif
+@inline(never) fileprivate func bjs_ArraySupportImports_jsRoundTripOptionalIntArray_static() -> Void {
+    return bjs_ArraySupportImports_jsRoundTripOptionalIntArray_static_extern()
 }
 
-@_expose(wasm, "bjs_Container_config_set")
-@_cdecl("bjs_Container_config_set")
-public func _bjs_Container_config_set(_ _self: UnsafeMutableRawPointer) -> Void {
-    #if arch(wasm32)
-    Container.bridgeJSLiftParameter(_self).config = Optional<Config>.bridgeJSLiftParameter()
-    #else
+#if arch(wasm32)
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_ArraySupportImports_jsRoundTripOptionalStringArray_static")
+fileprivate func bjs_ArraySupportImports_jsRoundTripOptionalStringArray_static_extern() -> Void
+#else
+fileprivate func bjs_ArraySupportImports_jsRoundTripOptionalStringArray_static_extern() -> Void {
     fatalError("Only available on WebAssembly")
-    #endif
 }
-
-@_expose(wasm, "bjs_Container_deinit")
-@_cdecl("bjs_Container_deinit")
-public func _bjs_Container_deinit(_ pointer: UnsafeMutableRawPointer) -> Void {
-    #if arch(wasm32)
-    Unmanaged<Container>.fromOpaque(pointer).release()
-    #else
-    fatalError("Only available on WebAssembly")
-    #endif
+#endif
+@inline(never) fileprivate func bjs_ArraySupportImports_jsRoundTripOptionalStringArray_static() -> Void {
+    return bjs_ArraySupportImports_jsRoundTripOptionalStringArray_static_extern()
 }
 
-extension Container: ConvertibleToJSValue, _BridgedSwiftHeapObject, _BridgedSwiftProtocolExportable {
-    var jsValue: JSValue {
-        return .object(JSObject(id: UInt32(bitPattern: _bjs_Container_wrap(Unmanaged.passRetained(self).toOpaque()))))
-    }
-    consuming func bridgeJSLowerAsProtocolReturn() -> Int32 {
-        _bjs_Container_wrap(Unmanaged.passRetained(self).toOpaque())
-    }
+#if arch(wasm32)
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_ArraySupportImports_jsRoundTripOptionalBoolArray_static")
+fileprivate func bjs_ArraySupportImports_jsRoundTripOptionalBoolArray_static_extern() -> Void
+#else
+fileprivate func bjs_ArraySupportImports_jsRoundTripOptionalBoolArray_static_extern() -> Void {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func bjs_ArraySupportImports_jsRoundTripOptionalBoolArray_static() -> Void {
+    return bjs_ArraySupportImports_jsRoundTripOptionalBoolArray_static_extern()
 }
 
 #if arch(wasm32)
-@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_Container_wrap")
-fileprivate func _bjs_Container_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_ArraySupportImports_jsRoundTripOptionalJSValueArray_static")
+fileprivate func bjs_ArraySupportImports_jsRoundTripOptionalJSValueArray_static_extern() -> Void
 #else
-fileprivate func _bjs_Container_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 {
+fileprivate func bjs_ArraySupportImports_jsRoundTripOptionalJSValueArray_static_extern() -> Void {
     fatalError("Only available on WebAssembly")
 }
 #endif
-@inline(never) fileprivate func _bjs_Container_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 {
-    return _bjs_Container_wrap_extern(pointer)
+@inline(never) fileprivate func bjs_ArraySupportImports_jsRoundTripOptionalJSValueArray_static() -> Void {
+    return bjs_ArraySupportImports_jsRoundTripOptionalJSValueArray_static_extern()
 }
 
-@_expose(wasm, "bjs_LeakCheck_init")
-@_cdecl("bjs_LeakCheck_init")
-public func _bjs_LeakCheck_init() -> UnsafeMutableRawPointer {
-    #if arch(wasm32)
-    let ret = LeakCheck()
-    return ret.bridgeJSLowerReturn()
-    #else
+#if arch(wasm32)
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_ArraySupportImports_jsRoundTripOptionalJSObjectArray_static")
+fileprivate func bjs_ArraySupportImports_jsRoundTripOptionalJSObjectArray_static_extern() -> Void
+#else
+fileprivate func bjs_ArraySupportImports_jsRoundTripOptionalJSObjectArray_static_extern() -> Void {
     fatalError("Only available on WebAssembly")
-    #endif
+}
+#endif
+@inline(never) fileprivate func bjs_ArraySupportImports_jsRoundTripOptionalJSObjectArray_static() -> Void {
+    return bjs_ArraySupportImports_jsRoundTripOptionalJSObjectArray_static_extern()
 }
 
-@_expose(wasm, "bjs_LeakCheck_deinit")
-@_cdecl("bjs_LeakCheck_deinit")
-public func _bjs_LeakCheck_deinit(_ pointer: UnsafeMutableRawPointer) -> Void {
-    #if arch(wasm32)
-    Unmanaged<LeakCheck>.fromOpaque(pointer).release()
-    #else
+#if arch(wasm32)
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_ArraySupportImports_jsRoundTripOptionalJSClassArray_static")
+fileprivate func bjs_ArraySupportImports_jsRoundTripOptionalJSClassArray_static_extern() -> Void
+#else
+fileprivate func bjs_ArraySupportImports_jsRoundTripOptionalJSClassArray_static_extern() -> Void {
     fatalError("Only available on WebAssembly")
-    #endif
 }
-
-extension LeakCheck: ConvertibleToJSValue, _BridgedSwiftHeapObject, _BridgedSwiftProtocolExportable {
-    public var jsValue: JSValue {
-        return .object(JSObject(id: UInt32(bitPattern: _bjs_LeakCheck_wrap(Unmanaged.passRetained(self).toOpaque()))))
-    }
-    public consuming func bridgeJSLowerAsProtocolReturn() -> Int32 {
-        _bjs_LeakCheck_wrap(Unmanaged.passRetained(self).toOpaque())
-    }
+#endif
+@inline(never) fileprivate func bjs_ArraySupportImports_jsRoundTripOptionalJSClassArray_static() -> Void {
+    return bjs_ArraySupportImports_jsRoundTripOptionalJSClassArray_static_extern()
 }
 
 #if arch(wasm32)
-@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_LeakCheck_wrap")
-fileprivate func _bjs_LeakCheck_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_ArraySupportImports_jsSumNumberArray_static")
+fileprivate func bjs_ArraySupportImports_jsSumNumberArray_static_extern() -> Float64
 #else
-fileprivate func _bjs_LeakCheck_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 {
+fileprivate func bjs_ArraySupportImports_jsSumNumberArray_static_extern() -> Float64 {
     fatalError("Only available on WebAssembly")
 }
 #endif
-@inline(never) fileprivate func _bjs_LeakCheck_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 {
-    return _bjs_LeakCheck_wrap_extern(pointer)
+@inline(never) fileprivate func bjs_ArraySupportImports_jsSumNumberArray_static() -> Float64 {
+    return bjs_ArraySupportImports_jsSumNumberArray_static_extern()
 }
 
 #if arch(wasm32)
-@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_ArrayElementObject_init")
-fileprivate func bjs_ArrayElementObject_init_extern(_ idBytes: Int32, _ idLength: Int32) -> Int32
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_ArraySupportImports_jsCreateNumberArray_static")
+fileprivate func bjs_ArraySupportImports_jsCreateNumberArray_static_extern() -> Void
 #else
-fileprivate func bjs_ArrayElementObject_init_extern(_ idBytes: Int32, _ idLength: Int32) -> Int32 {
+fileprivate func bjs_ArraySupportImports_jsCreateNumberArray_static_extern() -> Void {
     fatalError("Only available on WebAssembly")
 }
 #endif
-@inline(never) fileprivate func bjs_ArrayElementObject_init(_ idBytes: Int32, _ idLength: Int32) -> Int32 {
-    return bjs_ArrayElementObject_init_extern(idBytes, idLength)
+@inline(never) fileprivate func bjs_ArraySupportImports_jsCreateNumberArray_static() -> Void {
+    return bjs_ArraySupportImports_jsCreateNumberArray_static_extern()
 }
 
 #if arch(wasm32)
-@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_ArrayElementObject_id_get")
-fileprivate func bjs_ArrayElementObject_id_get_extern(_ self: Int32) -> Int32
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_ArraySupportImports_runJsArraySupportTests_static")
+fileprivate func bjs_ArraySupportImports_runJsArraySupportTests_static_extern() -> Void
 #else
-fileprivate func bjs_ArrayElementObject_id_get_extern(_ self: Int32) -> Int32 {
+fileprivate func bjs_ArraySupportImports_runJsArraySupportTests_static_extern() -> Void {
     fatalError("Only available on WebAssembly")
 }
 #endif
-@inline(never) fileprivate func bjs_ArrayElementObject_id_get(_ self: Int32) -> Int32 {
-    return bjs_ArrayElementObject_id_get_extern(self)
+@inline(never) fileprivate func bjs_ArraySupportImports_runJsArraySupportTests_static() -> Void {
+    return bjs_ArraySupportImports_runJsArraySupportTests_static_extern()
 }
 
-func _$ArrayElementObject_init(_ id: String) throws(JSException) -> JSObject {
-    let ret0 = id.bridgeJSWithLoweredParameter { (idBytes, idLength) in
-        let ret = bjs_ArrayElementObject_init(idBytes, idLength)
-        return ret
+func _$ArraySupportImports_jsIntArrayLength(_ items: [Int]) throws(JSException) -> Int {
+    let _ = items.bridgeJSLowerParameter()
+    let ret = bjs_ArraySupportImports_jsIntArrayLength_static()
+    if let error = _swift_js_take_exception() {
+        throw error
     }
-    let ret = ret0
+    return Int.bridgeJSLiftReturn(ret)
+}
+
+func _$ArraySupportImports_jsRoundTripIntArray(_ items: [Int]) throws(JSException) -> [Int] {
+    let _ = items.bridgeJSLowerParameter()
+    bjs_ArraySupportImports_jsRoundTripIntArray_static()
     if let error = _swift_js_take_exception() {
         throw error
     }
-    return JSObject.bridgeJSLiftReturn(ret)
+    return [Int].bridgeJSLiftReturn()
 }
 
-func _$ArrayElementObject_id_get(_ self: JSObject) throws(JSException) -> String {
-    let selfValue = self.bridgeJSLowerParameter()
-    let ret = bjs_ArrayElementObject_id_get(selfValue)
+func _$ArraySupportImports_jsRoundTripNumberArray(_ values: [Double]) throws(JSException) -> [Double] {
+    let _ = values.bridgeJSLowerParameter()
+    bjs_ArraySupportImports_jsRoundTripNumberArray_static()
     if let error = _swift_js_take_exception() {
         throw error
     }
-    return String.bridgeJSLiftReturn(ret)
+    return [Double].bridgeJSLiftReturn()
 }
 
-#if arch(wasm32)
-@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_ArraySupportImports_jsIntArrayLength_static")
-fileprivate func bjs_ArraySupportImports_jsIntArrayLength_static_extern() -> Int32
-#else
-fileprivate func bjs_ArraySupportImports_jsIntArrayLength_static_extern() -> Int32 {
-    fatalError("Only available on WebAssembly")
+func _$ArraySupportImports_jsRoundTripStringArray(_ values: [String]) throws(JSException) -> [String] {
+    let _ = values.bridgeJSLowerParameter()
+    bjs_ArraySupportImports_jsRoundTripStringArray_static()
+    if let error = _swift_js_take_exception() {
+        throw error
+    }
+    return [String].bridgeJSLiftReturn()
 }
-#endif
-@inline(never) fileprivate func bjs_ArraySupportImports_jsIntArrayLength_static() -> Int32 {
-    return bjs_ArraySupportImports_jsIntArrayLength_static_extern()
+
+func _$ArraySupportImports_jsRoundTripBoolArray(_ values: [Bool]) throws(JSException) -> [Bool] {
+    let _ = values.bridgeJSLowerParameter()
+    bjs_ArraySupportImports_jsRoundTripBoolArray_static()
+    if let error = _swift_js_take_exception() {
+        throw error
+    }
+    return [Bool].bridgeJSLiftReturn()
 }
 
-#if arch(wasm32)
-@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_ArraySupportImports_jsRoundTripIntArray_static")
-fileprivate func bjs_ArraySupportImports_jsRoundTripIntArray_static_extern() -> Void
-#else
-fileprivate func bjs_ArraySupportImports_jsRoundTripIntArray_static_extern() -> Void {
-    fatalError("Only available on WebAssembly")
+func _$ArraySupportImports_jsRoundTripJSValueArray(_ v: [JSValue]) throws(JSException) -> [JSValue] {
+    let _ = v.bridgeJSLowerParameter()
+    bjs_ArraySupportImports_jsRoundTripJSValueArray_static()
+    if let error = _swift_js_take_exception() {
+        throw error
+    }
+    return [JSValue].bridgeJSLiftReturn()
 }
-#endif
-@inline(never) fileprivate func bjs_ArraySupportImports_jsRoundTripIntArray_static() -> Void {
-    return bjs_ArraySupportImports_jsRoundTripIntArray_static_extern()
+
+func _$ArraySupportImports_jsRoundTripJSObjectArray(_ values: [JSObject]) throws(JSException) -> [JSObject] {
+    let _ = values.bridgeJSLowerParameter()
+    bjs_ArraySupportImports_jsRoundTripJSObjectArray_static()
+    if let error = _swift_js_take_exception() {
+        throw error
+    }
+    return [JSObject].bridgeJSLiftReturn()
 }
 
-#if arch(wasm32)
-@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_ArraySupportImports_jsRoundTripNumberArray_static")
-fileprivate func bjs_ArraySupportImports_jsRoundTripNumberArray_static_extern() -> Void
-#else
-fileprivate func bjs_ArraySupportImports_jsRoundTripNumberArray_static_extern() -> Void {
-    fatalError("Only available on WebAssembly")
+func _$ArraySupportImports_jsRoundTripJSClassArray(_ values: [ArrayElementObject]) throws(JSException) -> [ArrayElementObject] {
+    let _ = values.bridgeJSLowerParameter()
+    bjs_ArraySupportImports_jsRoundTripJSClassArray_static()
+    if let error = _swift_js_take_exception() {
+        throw error
+    }
+    return [ArrayElementObject].bridgeJSLiftReturn()
 }
-#endif
-@inline(never) fileprivate func bjs_ArraySupportImports_jsRoundTripNumberArray_static() -> Void {
-    return bjs_ArraySupportImports_jsRoundTripNumberArray_static_extern()
+
+func _$ArraySupportImports_jsRoundTripOptionalIntArray(_ values: [Optional<Int>]) throws(JSException) -> [Optional<Int>] {
+    let _ = values.bridgeJSLowerParameter()
+    bjs_ArraySupportImports_jsRoundTripOptionalIntArray_static()
+    if let error = _swift_js_take_exception() {
+        throw error
+    }
+    return [Optional<Int>].bridgeJSLiftReturn()
 }
 
-#if arch(wasm32)
-@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_ArraySupportImports_jsRoundTripStringArray_static")
-fileprivate func bjs_ArraySupportImports_jsRoundTripStringArray_static_extern() -> Void
-#else
-fileprivate func bjs_ArraySupportImports_jsRoundTripStringArray_static_extern() -> Void {
-    fatalError("Only available on WebAssembly")
+func _$ArraySupportImports_jsRoundTripOptionalStringArray(_ values: [Optional<String>]) throws(JSException) -> [Optional<String>] {
+    let _ = values.bridgeJSLowerParameter()
+    bjs_ArraySupportImports_jsRoundTripOptionalStringArray_static()
+    if let error = _swift_js_take_exception() {
+        throw error
+    }
+    return [Optional<String>].bridgeJSLiftReturn()
 }
-#endif
-@inline(never) fileprivate func bjs_ArraySupportImports_jsRoundTripStringArray_static() -> Void {
-    return bjs_ArraySupportImports_jsRoundTripStringArray_static_extern()
+
+func _$ArraySupportImports_jsRoundTripOptionalBoolArray(_ values: [Optional<Bool>]) throws(JSException) -> [Optional<Bool>] {
+    let _ = values.bridgeJSLowerParameter()
+    bjs_ArraySupportImports_jsRoundTripOptionalBoolArray_static()
+    if let error = _swift_js_take_exception() {
+        throw error
+    }
+    return [Optional<Bool>].bridgeJSLiftReturn()
+}
+
+func _$ArraySupportImports_jsRoundTripOptionalJSValueArray(_ values: [Optional<JSValue>]) throws(JSException) -> [Optional<JSValue>] {
+    let _ = values.bridgeJSLowerParameter()
+    bjs_ArraySupportImports_jsRoundTripOptionalJSValueArray_static()
+    if let error = _swift_js_take_exception() {
+        throw error
+    }
+    return [Optional<JSValue>].bridgeJSLiftReturn()
+}
+
+func _$ArraySupportImports_jsRoundTripOptionalJSObjectArray(_ values: [Optional<JSObject>]) throws(JSException) -> [Optional<JSObject>] {
+    let _ = values.bridgeJSLowerParameter()
+    bjs_ArraySupportImports_jsRoundTripOptionalJSObjectArray_static()
+    if let error = _swift_js_take_exception() {
+        throw error
+    }
+    return [Optional<JSObject>].bridgeJSLiftReturn()
+}
+
+func _$ArraySupportImports_jsRoundTripOptionalJSClassArray(_ values: [Optional<ArrayElementObject>]) throws(JSException) -> [Optional<ArrayElementObject>] {
+    let _ = values.bridgeJSLowerParameter()
+    bjs_ArraySupportImports_jsRoundTripOptionalJSClassArray_static()
+    if let error = _swift_js_take_exception() {
+        throw error
+    }
+    return [Optional<ArrayElementObject>].bridgeJSLiftReturn()
+}
+
+func _$ArraySupportImports_jsSumNumberArray(_ values: [Double]) throws(JSException) -> Double {
+    let _ = values.bridgeJSLowerParameter()
+    let ret = bjs_ArraySupportImports_jsSumNumberArray_static()
+    if let error = _swift_js_take_exception() {
+        throw error
+    }
+    return Double.bridgeJSLiftReturn(ret)
+}
+
+func _$ArraySupportImports_jsCreateNumberArray() throws(JSException) -> [Double] {
+    bjs_ArraySupportImports_jsCreateNumberArray_static()
+    if let error = _swift_js_take_exception() {
+        throw error
+    }
+    return [Double].bridgeJSLiftReturn()
+}
+
+func _$ArraySupportImports_runJsArraySupportTests() throws(JSException) -> Void {
+    bjs_ArraySupportImports_runJsArraySupportTests_static()
+    if let error = _swift_js_take_exception() {
+        throw error
+    }
 }
 
 #if arch(wasm32)
-@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_ArraySupportImports_jsRoundTripBoolArray_static")
-fileprivate func bjs_ArraySupportImports_jsRoundTripBoolArray_static_extern() -> Void
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_AsyncImportImports_jsAsyncRoundTripVoid_static")
+fileprivate func bjs_AsyncImportImports_jsAsyncRoundTripVoid_static_extern(_ resolveRef: Int32, _ rejectRef: Int32) -> Void
 #else
-fileprivate func bjs_ArraySupportImports_jsRoundTripBoolArray_static_extern() -> Void {
+fileprivate func bjs_AsyncImportImports_jsAsyncRoundTripVoid_static_extern(_ resolveRef: Int32, _ rejectRef: Int32) -> Void {
     fatalError("Only available on WebAssembly")
 }
 #endif
-@inline(never) fileprivate func bjs_ArraySupportImports_jsRoundTripBoolArray_static() -> Void {
-    return bjs_ArraySupportImports_jsRoundTripBoolArray_static_extern()
+@inline(never) fileprivate func bjs_AsyncImportImports_jsAsyncRoundTripVoid_static(_ resolveRef: Int32, _ rejectRef: Int32) -> Void {
+    return bjs_AsyncImportImports_jsAsyncRoundTripVoid_static_extern(resolveRef, rejectRef)
 }
 
 #if arch(wasm32)
-@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_ArraySupportImports_jsRoundTripJSValueArray_static")
-fileprivate func bjs_ArraySupportImports_jsRoundTripJSValueArray_static_extern() -> Void
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_AsyncImportImports_jsAsyncRoundTripNumber_static")
+fileprivate func bjs_AsyncImportImports_jsAsyncRoundTripNumber_static_extern(_ resolveRef: Int32, _ rejectRef: Int32, _ v: Float64) -> Void
 #else
-fileprivate func bjs_ArraySupportImports_jsRoundTripJSValueArray_static_extern() -> Void {
+fileprivate func bjs_AsyncImportImports_jsAsyncRoundTripNumber_static_extern(_ resolveRef: Int32, _ rejectRef: Int32, _ v: Float64) -> Void {
     fatalError("Only available on WebAssembly")
 }
 #endif
-@inline(never) fileprivate func bjs_ArraySupportImports_jsRoundTripJSValueArray_static() -> Void {
-    return bjs_ArraySupportImports_jsRoundTripJSValueArray_static_extern()
+@inline(never) fileprivate func bjs_AsyncImportImports_jsAsyncRoundTripNumber_static(_ resolveRef: Int32, _ rejectRef: Int32, _ v: Float64) -> Void {
+    return bjs_AsyncImportImports_jsAsyncRoundTripNumber_static_extern(resolveRef, rejectRef, v)
 }
 
 #if arch(wasm32)
-@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_ArraySupportImports_jsRoundTripJSObjectArray_static")
-fileprivate func bjs_ArraySupportImports_jsRoundTripJSObjectArray_static_extern() -> Void
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_AsyncImportImports_jsAsyncRoundTripBool_static")
+fileprivate func bjs_AsyncImportImports_jsAsyncRoundTripBool_static_extern(_ resolveRef: Int32, _ rejectRef: Int32, _ v: Int32) -> Void
 #else
-fileprivate func bjs_ArraySupportImports_jsRoundTripJSObjectArray_static_extern() -> Void {
+fileprivate func bjs_AsyncImportImports_jsAsyncRoundTripBool_static_extern(_ resolveRef: Int32, _ rejectRef: Int32, _ v: Int32) -> Void {
     fatalError("Only available on WebAssembly")
 }
 #endif
-@inline(never) fileprivate func bjs_ArraySupportImports_jsRoundTripJSObjectArray_static() -> Void {
-    return bjs_ArraySupportImports_jsRoundTripJSObjectArray_static_extern()
+@inline(never) fileprivate func bjs_AsyncImportImports_jsAsyncRoundTripBool_static(_ resolveRef: Int32, _ rejectRef: Int32, _ v: Int32) -> Void {
+    return bjs_AsyncImportImports_jsAsyncRoundTripBool_static_extern(resolveRef, rejectRef, v)
 }
 
 #if arch(wasm32)
-@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_ArraySupportImports_jsRoundTripJSClassArray_static")
-fileprivate func bjs_ArraySupportImports_jsRoundTripJSClassArray_static_extern() -> Void
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_AsyncImportImports_jsAsyncRoundTripString_static")
+fileprivate func bjs_AsyncImportImports_jsAsyncRoundTripString_static_extern(_ resolveRef: Int32, _ rejectRef: Int32, _ vBytes: Int32, _ vLength: Int32) -> Void
 #else
-fileprivate func bjs_ArraySupportImports_jsRoundTripJSClassArray_static_extern() -> Void {
+fileprivate func bjs_AsyncImportImports_jsAsyncRoundTripString_static_extern(_ resolveRef: Int32, _ rejectRef: Int32, _ vBytes: Int32, _ vLength: Int32) -> Void {
     fatalError("Only available on WebAssembly")
 }
 #endif
-@inline(never) fileprivate func bjs_ArraySupportImports_jsRoundTripJSClassArray_static() -> Void {
-    return bjs_ArraySupportImports_jsRoundTripJSClassArray_static_extern()
+@inline(never) fileprivate func bjs_AsyncImportImports_jsAsyncRoundTripString_static(_ resolveRef: Int32, _ rejectRef: Int32, _ vBytes: Int32, _ vLength: Int32) -> Void {
+    return bjs_AsyncImportImports_jsAsyncRoundTripString_static_extern(resolveRef, rejectRef, vBytes, vLength)
 }
 
 #if arch(wasm32)
-@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_ArraySupportImports_jsRoundTripOptionalIntArray_static")
-fileprivate func bjs_ArraySupportImports_jsRoundTripOptionalIntArray_static_extern() -> Void
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_AsyncImportImports_jsAsyncRoundTripOptionalString_static")
+fileprivate func bjs_AsyncImportImports_jsAsyncRoundTripOptionalString_static_extern(_ resolveRef: Int32, _ rejectRef: Int32, _ vIsSome: Int32, _ vBytes: Int32, _ vLength: Int32) -> Void
 #else
-fileprivate func bjs_ArraySupportImports_jsRoundTripOptionalIntArray_static_extern() -> Void {
+fileprivate func bjs_AsyncImportImports_jsAsyncRoundTripOptionalString_static_extern(_ resolveRef: Int32, _ rejectRef: Int32, _ vIsSome: Int32, _ vBytes: Int32, _ vLength: Int32) -> Void {
     fatalError("Only available on WebAssembly")
 }
 #endif
-@inline(never) fileprivate func bjs_ArraySupportImports_jsRoundTripOptionalIntArray_static() -> Void {
-    return bjs_ArraySupportImports_jsRoundTripOptionalIntArray_static_extern()
+@inline(never) fileprivate func bjs_AsyncImportImports_jsAsyncRoundTripOptionalString_static(_ resolveRef: Int32, _ rejectRef: Int32, _ vIsSome: Int32, _ vBytes: Int32, _ vLength: Int32) -> Void {
+    return bjs_AsyncImportImports_jsAsyncRoundTripOptionalString_static_extern(resolveRef, rejectRef, vIsSome, vBytes, vLength)
 }
 
 #if arch(wasm32)
-@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_ArraySupportImports_jsRoundTripOptionalStringArray_static")
-fileprivate func bjs_ArraySupportImports_jsRoundTripOptionalStringArray_static_extern() -> Void
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_AsyncImportImports_jsAsyncRoundTripOptionalNumber_static")
+fileprivate func bjs_AsyncImportImports_jsAsyncRoundTripOptionalNumber_static_extern(_ resolveRef: Int32, _ rejectRef: Int32, _ vIsSome: Int32, _ vValue: Float64) -> Void
 #else
-fileprivate func bjs_ArraySupportImports_jsRoundTripOptionalStringArray_static_extern() -> Void {
+fileprivate func bjs_AsyncImportImports_jsAsyncRoundTripOptionalNumber_static_extern(_ resolveRef: Int32, _ rejectRef: Int32, _ vIsSome: Int32, _ vValue: Float64) -> Void {
     fatalError("Only available on WebAssembly")
 }
 #endif
-@inline(never) fileprivate func bjs_ArraySupportImports_jsRoundTripOptionalStringArray_static() -> Void {
-    return bjs_ArraySupportImports_jsRoundTripOptionalStringArray_static_extern()
+@inline(never) fileprivate func bjs_AsyncImportImports_jsAsyncRoundTripOptionalNumber_static(_ resolveRef: Int32, _ rejectRef: Int32, _ vIsSome: Int32, _ vValue: Float64) -> Void {
+    return bjs_AsyncImportImports_jsAsyncRoundTripOptionalNumber_static_extern(resolveRef, rejectRef, vIsSome, vValue)
 }
 
 #if arch(wasm32)
-@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_ArraySupportImports_jsRoundTripOptionalBoolArray_static")
-fileprivate func bjs_ArraySupportImports_jsRoundTripOptionalBoolArray_static_extern() -> Void
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_AsyncImportImports_jsAsyncRoundTripBoolArray_static")
+fileprivate func bjs_AsyncImportImports_jsAsyncRoundTripBoolArray_static_extern(_ resolveRef: Int32, _ rejectRef: Int32) -> Void
 #else
-fileprivate func bjs_ArraySupportImports_jsRoundTripOptionalBoolArray_static_extern() -> Void {
+fileprivate func bjs_AsyncImportImports_jsAsyncRoundTripBoolArray_static_extern(_ resolveRef: Int32, _ rejectRef: Int32) -> Void {
     fatalError("Only available on WebAssembly")
 }
 #endif
-@inline(never) fileprivate func bjs_ArraySupportImports_jsRoundTripOptionalBoolArray_static() -> Void {
-    return bjs_ArraySupportImports_jsRoundTripOptionalBoolArray_static_extern()
+@inline(never) fileprivate func bjs_AsyncImportImports_jsAsyncRoundTripBoolArray_static(_ resolveRef: Int32, _ rejectRef: Int32) -> Void {
+    return bjs_AsyncImportImports_jsAsyncRoundTripBoolArray_static_extern(resolveRef, rejectRef)
 }
 
 #if arch(wasm32)
-@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_ArraySupportImports_jsRoundTripOptionalJSValueArray_static")
-fileprivate func bjs_ArraySupportImports_jsRoundTripOptionalJSValueArray_static_extern() -> Void
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_AsyncImportImports_jsAsyncRoundTripIntArray_static")
+fileprivate func bjs_AsyncImportImports_jsAsyncRoundTripIntArray_static_extern(_ resolveRef: Int32, _ rejectRef: Int32) -> Void
 #else
-fileprivate func bjs_ArraySupportImports_jsRoundTripOptionalJSValueArray_static_extern() -> Void {
+fileprivate func bjs_AsyncImportImports_jsAsyncRoundTripIntArray_static_extern(_ resolveRef: Int32, _ rejectRef: Int32) -> Void {
     fatalError("Only available on WebAssembly")
 }
 #endif
-@inline(never) fileprivate func bjs_ArraySupportImports_jsRoundTripOptionalJSValueArray_static() -> Void {
-    return bjs_ArraySupportImports_jsRoundTripOptionalJSValueArray_static_extern()
+@inline(never) fileprivate func bjs_AsyncImportImports_jsAsyncRoundTripIntArray_static(_ resolveRef: Int32, _ rejectRef: Int32) -> Void {
+    return bjs_AsyncImportImports_jsAsyncRoundTripIntArray_static_extern(resolveRef, rejectRef)
 }
 
 #if arch(wasm32)
-@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_ArraySupportImports_jsRoundTripOptionalJSObjectArray_static")
-fileprivate func bjs_ArraySupportImports_jsRoundTripOptionalJSObjectArray_static_extern() -> Void
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_AsyncImportImports_jsAsyncRoundTripStringArray_static")
+fileprivate func bjs_AsyncImportImports_jsAsyncRoundTripStringArray_static_extern(_ resolveRef: Int32, _ rejectRef: Int32) -> Void
 #else
-fileprivate func bjs_ArraySupportImports_jsRoundTripOptionalJSObjectArray_static_extern() -> Void {
+fileprivate func bjs_AsyncImportImports_jsAsyncRoundTripStringArray_static_extern(_ resolveRef: Int32, _ rejectRef: Int32) -> Void {
     fatalError("Only available on WebAssembly")
 }
 #endif
-@inline(never) fileprivate func bjs_ArraySupportImports_jsRoundTripOptionalJSObjectArray_static() -> Void {
-    return bjs_ArraySupportImports_jsRoundTripOptionalJSObjectArray_static_extern()
+@inline(never) fileprivate func bjs_AsyncImportImports_jsAsyncRoundTripStringArray_static(_ resolveRef: Int32, _ rejectRef: Int32) -> Void {
+    return bjs_AsyncImportImports_jsAsyncRoundTripStringArray_static_extern(resolveRef, rejectRef)
 }
 
 #if arch(wasm32)
-@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_ArraySupportImports_jsRoundTripOptionalJSClassArray_static")
-fileprivate func bjs_ArraySupportImports_jsRoundTripOptionalJSClassArray_static_extern() -> Void
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_AsyncImportImports_jsAsyncRoundTripFeatureFlag_static")
+fileprivate func bjs_AsyncImportImports_jsAsyncRoundTripFeatureFlag_static_extern(_ resolveRef: Int32, _ rejectRef: Int32, _ vBytes: Int32, _ vLength: Int32) -> Void
 #else
-fileprivate func bjs_ArraySupportImports_jsRoundTripOptionalJSClassArray_static_extern() -> Void {
+fileprivate func bjs_AsyncImportImports_jsAsyncRoundTripFeatureFlag_static_extern(_ resolveRef: Int32, _ rejectRef: Int32, _ vBytes: Int32, _ vLength: Int32) -> Void {
     fatalError("Only available on WebAssembly")
 }
 #endif
-@inline(never) fileprivate func bjs_ArraySupportImports_jsRoundTripOptionalJSClassArray_static() -> Void {
-    return bjs_ArraySupportImports_jsRoundTripOptionalJSClassArray_static_extern()
+@inline(never) fileprivate func bjs_AsyncImportImports_jsAsyncRoundTripFeatureFlag_static(_ resolveRef: Int32, _ rejectRef: Int32, _ vBytes: Int32, _ vLength: Int32) -> Void {
+    return bjs_AsyncImportImports_jsAsyncRoundTripFeatureFlag_static_extern(resolveRef, rejectRef, vBytes, vLength)
 }
 
 #if arch(wasm32)
-@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_ArraySupportImports_jsSumNumberArray_static")
-fileprivate func bjs_ArraySupportImports_jsSumNumberArray_static_extern() -> Float64
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_AsyncImportImports_jsAsyncRoundTripAssociatedValueEnum_static")
+fileprivate func bjs_AsyncImportImports_jsAsyncRoundTripAssociatedValueEnum_static_extern(_ resolveRef: Int32, _ rejectRef: Int32, _ v: Int32) -> Void
 #else
-fileprivate func bjs_ArraySupportImports_jsSumNumberArray_static_extern() -> Float64 {
+fileprivate func bjs_AsyncImportImports_jsAsyncRoundTripAssociatedValueEnum_static_extern(_ resolveRef: Int32, _ rejectRef: Int32, _ v: Int32) -> Void {
     fatalError("Only available on WebAssembly")
 }
 #endif
-@inline(never) fileprivate func bjs_ArraySupportImports_jsSumNumberArray_static() -> Float64 {
-    return bjs_ArraySupportImports_jsSumNumberArray_static_extern()
+@inline(never) fileprivate func bjs_AsyncImportImports_jsAsyncRoundTripAssociatedValueEnum_static(_ resolveRef: Int32, _ rejectRef: Int32, _ v: Int32) -> Void {
+    return bjs_AsyncImportImports_jsAsyncRoundTripAssociatedValueEnum_static_extern(resolveRef, rejectRef, v)
 }
 
 #if arch(wasm32)
-@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_ArraySupportImports_jsCreateNumberArray_static")
-fileprivate func bjs_ArraySupportImports_jsCreateNumberArray_static_extern() -> Void
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_AsyncImportImports_jsAsyncRoundTripOptionalAssociatedValueEnum_static")
+fileprivate func bjs_AsyncImportImports_jsAsyncRoundTripOptionalAssociatedValueEnum_static_extern(_ resolveRef: Int32, _ rejectRef: Int32, _ vIsSome: Int32, _ vCaseId: Int32) -> Void
 #else
-fileprivate func bjs_ArraySupportImports_jsCreateNumberArray_static_extern() -> Void {
+fileprivate func bjs_AsyncImportImports_jsAsyncRoundTripOptionalAssociatedValueEnum_static_extern(_ resolveRef: Int32, _ rejectRef: Int32, _ vIsSome: Int32, _ vCaseId: Int32) -> Void {
     fatalError("Only available on WebAssembly")
 }
 #endif
-@inline(never) fileprivate func bjs_ArraySupportImports_jsCreateNumberArray_static() -> Void {
-    return bjs_ArraySupportImports_jsCreateNumberArray_static_extern()
+@inline(never) fileprivate func bjs_AsyncImportImports_jsAsyncRoundTripOptionalAssociatedValueEnum_static(_ resolveRef: Int32, _ rejectRef: Int32, _ vIsSome: Int32, _ vCaseId: Int32) -> Void {
+    return bjs_AsyncImportImports_jsAsyncRoundTripOptionalAssociatedValueEnum_static_extern(resolveRef, rejectRef, vIsSome, vCaseId)
 }
 
-#if arch(wasm32)
-@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_ArraySupportImports_runJsArraySupportTests_static")
-fileprivate func bjs_ArraySupportImports_runJsArraySupportTests_static_extern() -> Void
-#else
-fileprivate func bjs_ArraySupportImports_runJsArraySupportTests_static_extern() -> Void {
-    fatalError("Only available on WebAssembly")
+func _$AsyncImportImports_jsAsyncRoundTripVoid() async throws(JSException) -> Void {
+    try await _bjs_awaitPromise(makeResolveClosure: {
+            JSTypedClosure<() -> Void>($0)
+        }, makeRejectClosure: {
+            JSTypedClosure<(sending JSValue) -> Void>($0)
+        }) { resolveRef, rejectRef in
+        bjs_AsyncImportImports_jsAsyncRoundTripVoid_static(resolveRef, rejectRef)
+    }
 }
-#endif
-@inline(never) fileprivate func bjs_ArraySupportImports_runJsArraySupportTests_static() -> Void {
-    return bjs_ArraySupportImports_runJsArraySupportTests_static_extern()
+
+func _$AsyncImportImports_jsAsyncRoundTripNumber(_ v: Double) async throws(JSException) -> Double {
+    let resolved = try await _bjs_awaitPromise(makeResolveClosure: {
+            JSTypedClosure<(sending Double) -> Void>($0)
+        }, makeRejectClosure: {
+            JSTypedClosure<(sending JSValue) -> Void>($0)
+        }) { resolveRef, rejectRef in
+        let vValue = v.bridgeJSLowerParameter()
+        bjs_AsyncImportImports_jsAsyncRoundTripNumber_static(resolveRef, rejectRef, vValue)
+    }
+    return resolved
 }
 
-func _$ArraySupportImports_jsIntArrayLength(_ items: [Int]) throws(JSException) -> Int {
-    let _ = items.bridgeJSLowerParameter()
-    let ret = bjs_ArraySupportImports_jsIntArrayLength_static()
-    if let error = _swift_js_take_exception() {
-        throw error
+func _$AsyncImportImports_jsAsyncRoundTripBool(_ v: Bool) async throws(JSException) -> Bool {
+    let resolved = try await _bjs_awaitPromise(makeResolveClosure: {
+            JSTypedClosure<(sending Bool) -> Void>($0)
+        }, makeRejectClosure: {
+            JSTypedClosure<(sending JSValue) -> Void>($0)
+        }) { resolveRef, rejectRef in
+        let vValue = v.bridgeJSLowerParameter()
+        bjs_AsyncImportImports_jsAsyncRoundTripBool_static(resolveRef, rejectRef, vValue)
     }
-    return Int.bridgeJSLiftReturn(ret)
+    return resolved
 }
 
-func _$ArraySupportImports_jsRoundTripIntArray(_ items: [Int]) throws(JSException) -> [Int] {
-    let _ = items.bridgeJSLowerParameter()
-    bjs_ArraySupportImports_jsRoundTripIntArray_static()
-    if let error = _swift_js_take_exception() {
-        throw error
+func _$AsyncImportImports_jsAsyncRoundTripString(_ v: String) async throws(JSException) -> String {
+    let resolved = try await _bjs_awaitPromise(makeResolveClosure: {
+            JSTypedClosure<(sending String) -> Void>($0)
+        }, makeRejectClosure: {
+            JSTypedClosure<(sending JSValue) -> Void>($0)
+        }) { resolveRef, rejectRef in
+        v.bridgeJSWithLoweredParameter { (vBytes, vLength) in
+            bjs_AsyncImportImports_jsAsyncRoundTripString_static(resolveRef, rejectRef, vBytes, vLength)
+        }
     }
-    return [Int].bridgeJSLiftReturn()
+    return resolved
 }
 
-func _$ArraySupportImports_jsRoundTripNumberArray(_ values: [Double]) throws(JSException) -> [Double] {
-    let _ = values.bridgeJSLowerParameter()
-    bjs_ArraySupportImports_jsRoundTripNumberArray_static()
-    if let error = _swift_js_take_exception() {
-        throw error
+func _$AsyncImportImports_jsAsyncRoundTripOptionalString(_ v: Optional<String>) async throws(JSException) -> Optional<String> {
+    let resolved = try await _bjs_awaitPromise(makeResolveClosure: {
+            JSTypedClosure<(sending Optional<String>) -> Void>($0)
+        }, makeRejectClosure: {
+            JSTypedClosure<(sending JSValue) -> Void>($0)
+        }) { resolveRef, rejectRef in
+        v.bridgeJSWithLoweredParameter { (vIsSome, vBytes, vLength) in
+            bjs_AsyncImportImports_jsAsyncRoundTripOptionalString_static(resolveRef, rejectRef, vIsSome, vBytes, vLength)
+        }
     }
-    return [Double].bridgeJSLiftReturn()
+    return resolved
 }
 
-func _$ArraySupportImports_jsRoundTripStringArray(_ values: [String]) throws(JSException) -> [String] {
-    let _ = values.bridgeJSLowerParameter()
-    bjs_ArraySupportImports_jsRoundTripStringArray_static()
-    if let error = _swift_js_take_exception() {
-        throw error
+func _$AsyncImportImports_jsAsyncRoundTripOptionalNumber(_ v: Optional<Double>) async throws(JSException) -> Optional<Double> {
+    let resolved = try await _bjs_awaitPromise(makeResolveClosure: {
+            JSTypedClosure<(sending Optional<Double>) -> Void>($0)
+        }, makeRejectClosure: {
+            JSTypedClosure<(sending JSValue) -> Void>($0)
+        }) { resolveRef, rejectRef in
+        let (vIsSome, vValue) = v.bridgeJSLowerParameter()
+        bjs_AsyncImportImports_jsAsyncRoundTripOptionalNumber_static(resolveRef, rejectRef, vIsSome, vValue)
     }
-    return [String].bridgeJSLiftReturn()
+    return resolved
 }
 
-func _$ArraySupportImports_jsRoundTripBoolArray(_ values: [Bool]) throws(JSException) -> [Bool] {
-    let _ = values.bridgeJSLowerParameter()
-    bjs_ArraySupportImports_jsRoundTripBoolArray_static()
-    if let error = _swift_js_take_exception() {
-        throw error
+func _$AsyncImportImports_jsAsyncRoundTripBoolArray(_ values: [Bool]) async throws(JSException) -> [Bool] {
+    let resolved = try await _bjs_awaitPromise(makeResolveClosure: {
+            JSTypedClosure<(sending [Bool]) -> Void>($0)
+        }, makeRejectClosure: {
+            JSTypedClosure<(sending JSValue) -> Void>($0)
+        }) { resolveRef, rejectRef in
+        let _ = values.bridgeJSLowerParameter()
+        bjs_AsyncImportImports_jsAsyncRoundTripBoolArray_static(resolveRef, rejectRef)
     }
-    return [Bool].bridgeJSLiftReturn()
+    return resolved
 }
 
-func _$ArraySupportImports_jsRoundTripJSValueArray(_ v: [JSValue]) throws(JSException) -> [JSValue] {
-    let _ = v.bridgeJSLowerParameter()
-    bjs_ArraySupportImports_jsRoundTripJSValueArray_static()
-    if let error = _swift_js_take_exception() {
-        throw error
+func _$AsyncImportImports_jsAsyncRoundTripIntArray(_ values: [Double]) async throws(JSException) -> [Double] {
+    let resolved = try await _bjs_awaitPromise(makeResolveClosure: {
+            JSTypedClosure<(sending [Double]) -> Void>($0)
+        }, makeRejectClosure: {
+            JSTypedClosure<(sending JSValue) -> Void>($0)
+        }) { resolveRef, rejectRef in
+        let _ = values.bridgeJSLowerParameter()
+        bjs_AsyncImportImports_jsAsyncRoundTripIntArray_static(resolveRef, rejectRef)
     }
-    return [JSValue].bridgeJSLiftReturn()
+    return resolved
+}
+
+func _$AsyncImportImports_jsAsyncRoundTripStringArray(_ values: [String]) async throws(JSException) -> [String] {
+    let resolved = try await _bjs_awaitPromise(makeResolveClosure: {
+            JSTypedClosure<(sending [String]) -> Void>($0)
+        }, makeRejectClosure: {
+            JSTypedClosure<(sending JSValue) -> Void>($0)
+        }) { resolveRef, rejectRef in
+        let _ = values.bridgeJSLowerParameter()
+        bjs_AsyncImportImports_jsAsyncRoundTripStringArray_static(resolveRef, rejectRef)
+    }
+    return resolved
+}
+
+func _$AsyncImportImports_jsAsyncRoundTripFeatureFlag(_ v: FeatureFlag) async throws(JSException) -> FeatureFlag {
+    let resolved = try await _bjs_awaitPromise(makeResolveClosure: {
+            JSTypedClosure<(sending FeatureFlag) -> Void>($0)
+        }, makeRejectClosure: {
+            JSTypedClosure<(sending JSValue) -> Void>($0)
+        }) { resolveRef, rejectRef in
+        v.bridgeJSWithLoweredParameter { (vBytes, vLength) in
+            bjs_AsyncImportImports_jsAsyncRoundTripFeatureFlag_static(resolveRef, rejectRef, vBytes, vLength)
+        }
+    }
+    return resolved
 }
 
-func _$ArraySupportImports_jsRoundTripJSObjectArray(_ values: [JSObject]) throws(JSException) -> [JSObject] {
-    let _ = values.bridgeJSLowerParameter()
-    bjs_ArraySupportImports_jsRoundTripJSObjectArray_static()
-    if let error = _swift_js_take_exception() {
-        throw error
+func _$AsyncImportImports_jsAsyncRoundTripAssociatedValueEnum(_ v: AsyncImportedPayloadResult) async throws(JSException) -> AsyncImportedPayloadResult {
+    let resolved = try await _bjs_awaitPromise(makeResolveClosure: {
+            JSTypedClosure<(sending AsyncImportedPayloadResult) -> Void>($0)
+        }, makeRejectClosure: {
+            JSTypedClosure<(sending JSValue) -> Void>($0)
+        }) { resolveRef, rejectRef in
+        let vCaseId = v.bridgeJSLowerParameter()
+        bjs_AsyncImportImports_jsAsyncRoundTripAssociatedValueEnum_static(resolveRef, rejectRef, vCaseId)
     }
-    return [JSObject].bridgeJSLiftReturn()
+    return resolved
 }
 
-func _$ArraySupportImports_jsRoundTripJSClassArray(_ values: [ArrayElementObject]) throws(JSException) -> [ArrayElementObject] {
-    let _ = values.bridgeJSLowerParameter()
-    bjs_ArraySupportImports_jsRoundTripJSClassArray_static()
-    if let error = _swift_js_take_exception() {
-        throw error
+func _$AsyncImportImports_jsAsyncRoundTripOptionalAssociatedValueEnum(_ v: Optional<AsyncImportedPayloadResult>) async throws(JSException) -> Optional<AsyncImportedPayloadResult> {
+    let resolved = try await _bjs_awaitPromise(makeResolveClosure: {
+            JSTypedClosure<(sending Optional<AsyncImportedPayloadResult>) -> Void>($0)
+        }, makeRejectClosure: {
+            JSTypedClosure<(sending JSValue) -> Void>($0)
+        }) { resolveRef, rejectRef in
+        let (vIsSome, vCaseId) = v.bridgeJSLowerParameter()
+        bjs_AsyncImportImports_jsAsyncRoundTripOptionalAssociatedValueEnum_static(resolveRef, rejectRef, vIsSome, vCaseId)
     }
-    return [ArrayElementObject].bridgeJSLiftReturn()
+    return resolved
 }
 
-func _$ArraySupportImports_jsRoundTripOptionalIntArray(_ values: [Optional<Int>]) throws(JSException) -> [Optional<Int>] {
-    let _ = values.bridgeJSLowerParameter()
-    bjs_ArraySupportImports_jsRoundTripOptionalIntArray_static()
-    if let error = _swift_js_take_exception() {
-        throw error
-    }
-    return [Optional<Int>].bridgeJSLiftReturn()
+#if arch(wasm32)
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_ClosureAsyncImports_runJsClosureAsyncTests_static")
+fileprivate func bjs_ClosureAsyncImports_runJsClosureAsyncTests_static_extern(_ resolveRef: Int32, _ rejectRef: Int32) -> Void
+#else
+fileprivate func bjs_ClosureAsyncImports_runJsClosureAsyncTests_static_extern(_ resolveRef: Int32, _ rejectRef: Int32) -> Void {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func bjs_ClosureAsyncImports_runJsClosureAsyncTests_static(_ resolveRef: Int32, _ rejectRef: Int32) -> Void {
+    return bjs_ClosureAsyncImports_runJsClosureAsyncTests_static_extern(resolveRef, rejectRef)
 }
 
-func _$ArraySupportImports_jsRoundTripOptionalStringArray(_ values: [Optional<String>]) throws(JSException) -> [Optional<String>] {
-    let _ = values.bridgeJSLowerParameter()
-    bjs_ArraySupportImports_jsRoundTripOptionalStringArray_static()
-    if let error = _swift_js_take_exception() {
-        throw error
+func _$ClosureAsyncImports_runJsClosureAsyncTests() async throws(JSException) -> Void {
+    try await _bjs_awaitPromise(makeResolveClosure: {
+            JSTypedClosure<() -> Void>($0)
+        }, makeRejectClosure: {
+            JSTypedClosure<(sending JSValue) -> Void>($0)
+        }) { resolveRef, rejectRef in
+        bjs_ClosureAsyncImports_runJsClosureAsyncTests_static(resolveRef, rejectRef)
     }
-    return [Optional<String>].bridgeJSLiftReturn()
 }
 
-func _$ArraySupportImports_jsRoundTripOptionalBoolArray(_ values: [Optional<Bool>]) throws(JSException) -> [Optional<Bool>] {
-    let _ = values.bridgeJSLowerParameter()
-    bjs_ArraySupportImports_jsRoundTripOptionalBoolArray_static()
-    if let error = _swift_js_take_exception() {
-        throw error
-    }
-    return [Optional<Bool>].bridgeJSLiftReturn()
+#if arch(wasm32)
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_ClosureSupportImports_jsApplyVoid_static")
+fileprivate func bjs_ClosureSupportImports_jsApplyVoid_static_extern(_ callback: Int32) -> Void
+#else
+fileprivate func bjs_ClosureSupportImports_jsApplyVoid_static_extern(_ callback: Int32) -> Void {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func bjs_ClosureSupportImports_jsApplyVoid_static(_ callback: Int32) -> Void {
+    return bjs_ClosureSupportImports_jsApplyVoid_static_extern(callback)
 }
 
-func _$ArraySupportImports_jsRoundTripOptionalJSValueArray(_ values: [Optional<JSValue>]) throws(JSException) -> [Optional<JSValue>] {
-    let _ = values.bridgeJSLowerParameter()
-    bjs_ArraySupportImports_jsRoundTripOptionalJSValueArray_static()
-    if let error = _swift_js_take_exception() {
-        throw error
-    }
-    return [Optional<JSValue>].bridgeJSLiftReturn()
+#if arch(wasm32)
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_ClosureSupportImports_jsApplyBool_static")
+fileprivate func bjs_ClosureSupportImports_jsApplyBool_static_extern(_ callback: Int32) -> Int32
+#else
+fileprivate func bjs_ClosureSupportImports_jsApplyBool_static_extern(_ callback: Int32) -> Int32 {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func bjs_ClosureSupportImports_jsApplyBool_static(_ callback: Int32) -> Int32 {
+    return bjs_ClosureSupportImports_jsApplyBool_static_extern(callback)
 }
 
-func _$ArraySupportImports_jsRoundTripOptionalJSObjectArray(_ values: [Optional<JSObject>]) throws(JSException) -> [Optional<JSObject>] {
-    let _ = values.bridgeJSLowerParameter()
-    bjs_ArraySupportImports_jsRoundTripOptionalJSObjectArray_static()
-    if let error = _swift_js_take_exception() {
-        throw error
-    }
-    return [Optional<JSObject>].bridgeJSLiftReturn()
+#if arch(wasm32)
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_ClosureSupportImports_jsApplyInt_static")
+fileprivate func bjs_ClosureSupportImports_jsApplyInt_static_extern(_ value: Int32, _ transform: Int32) -> Int32
+#else
+fileprivate func bjs_ClosureSupportImports_jsApplyInt_static_extern(_ value: Int32, _ transform: Int32) -> Int32 {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func bjs_ClosureSupportImports_jsApplyInt_static(_ value: Int32, _ transform: Int32) -> Int32 {
+    return bjs_ClosureSupportImports_jsApplyInt_static_extern(value, transform)
 }
 
-func _$ArraySupportImports_jsRoundTripOptionalJSClassArray(_ values: [Optional<ArrayElementObject>]) throws(JSException) -> [Optional<ArrayElementObject>] {
-    let _ = values.bridgeJSLowerParameter()
-    bjs_ArraySupportImports_jsRoundTripOptionalJSClassArray_static()
-    if let error = _swift_js_take_exception() {
-        throw error
-    }
-    return [Optional<ArrayElementObject>].bridgeJSLiftReturn()
+#if arch(wasm32)
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_ClosureSupportImports_jsApplyDouble_static")
+fileprivate func bjs_ClosureSupportImports_jsApplyDouble_static_extern(_ value: Float64, _ transform: Int32) -> Float64
+#else
+fileprivate func bjs_ClosureSupportImports_jsApplyDouble_static_extern(_ value: Float64, _ transform: Int32) -> Float64 {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func bjs_ClosureSupportImports_jsApplyDouble_static(_ value: Float64, _ transform: Int32) -> Float64 {
+    return bjs_ClosureSupportImports_jsApplyDouble_static_extern(value, transform)
 }
 
-func _$ArraySupportImports_jsSumNumberArray(_ values: [Double]) throws(JSException) -> Double {
-    let _ = values.bridgeJSLowerParameter()
-    let ret = bjs_ArraySupportImports_jsSumNumberArray_static()
-    if let error = _swift_js_take_exception() {
-        throw error
-    }
-    return Double.bridgeJSLiftReturn(ret)
+#if arch(wasm32)
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_ClosureSupportImports_jsApplyString_static")
+fileprivate func bjs_ClosureSupportImports_jsApplyString_static_extern(_ valueBytes: Int32, _ valueLength: Int32, _ transform: Int32) -> Int32
+#else
+fileprivate func bjs_ClosureSupportImports_jsApplyString_static_extern(_ valueBytes: Int32, _ valueLength: Int32, _ transform: Int32) -> Int32 {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func bjs_ClosureSupportImports_jsApplyString_static(_ valueBytes: Int32, _ valueLength: Int32, _ transform: Int32) -> Int32 {
+    return bjs_ClosureSupportImports_jsApplyString_static_extern(valueBytes, valueLength, transform)
 }
 
-func _$ArraySupportImports_jsCreateNumberArray() throws(JSException) -> [Double] {
-    bjs_ArraySupportImports_jsCreateNumberArray_static()
-    if let error = _swift_js_take_exception() {
-        throw error
-    }
-    return [Double].bridgeJSLiftReturn()
+#if arch(wasm32)
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_ClosureSupportImports_jsApplyJSObject_static")
+fileprivate func bjs_ClosureSupportImports_jsApplyJSObject_static_extern(_ value: Int32, _ transform: Int32) -> Int32
+#else
+fileprivate func bjs_ClosureSupportImports_jsApplyJSObject_static_extern(_ value: Int32, _ transform: Int32) -> Int32 {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func bjs_ClosureSupportImports_jsApplyJSObject_static(_ value: Int32, _ transform: Int32) -> Int32 {
+    return bjs_ClosureSupportImports_jsApplyJSObject_static_extern(value, transform)
 }
 
-func _$ArraySupportImports_runJsArraySupportTests() throws(JSException) -> Void {
-    bjs_ArraySupportImports_runJsArraySupportTests_static()
-    if let error = _swift_js_take_exception() {
-        throw error
-    }
+#if arch(wasm32)
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_ClosureSupportImports_jsMakeIntToInt_static")
+fileprivate func bjs_ClosureSupportImports_jsMakeIntToInt_static_extern(_ base: Int32) -> Int32
+#else
+fileprivate func bjs_ClosureSupportImports_jsMakeIntToInt_static_extern(_ base: Int32) -> Int32 {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func bjs_ClosureSupportImports_jsMakeIntToInt_static(_ base: Int32) -> Int32 {
+    return bjs_ClosureSupportImports_jsMakeIntToInt_static_extern(base)
 }
 
 #if arch(wasm32)
-@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_AsyncImportImports_jsAsyncRoundTripVoid_static")
-fileprivate func bjs_AsyncImportImports_jsAsyncRoundTripVoid_static_extern(_ resolveRef: Int32, _ rejectRef: Int32) -> Void
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_ClosureSupportImports_jsMakeDoubleToDouble_static")
+fileprivate func bjs_ClosureSupportImports_jsMakeDoubleToDouble_static_extern(_ base: Float64) -> Int32
 #else
-fileprivate func bjs_AsyncImportImports_jsAsyncRoundTripVoid_static_extern(_ resolveRef: Int32, _ rejectRef: Int32) -> Void {
+fileprivate func bjs_ClosureSupportImports_jsMakeDoubleToDouble_static_extern(_ base: Float64) -> Int32 {
     fatalError("Only available on WebAssembly")
 }
 #endif
-@inline(never) fileprivate func bjs_AsyncImportImports_jsAsyncRoundTripVoid_static(_ resolveRef: Int32, _ rejectRef: Int32) -> Void {
-    return bjs_AsyncImportImports_jsAsyncRoundTripVoid_static_extern(resolveRef, rejectRef)
+@inline(never) fileprivate func bjs_ClosureSupportImports_jsMakeDoubleToDouble_static(_ base: Float64) -> Int32 {
+    return bjs_ClosureSupportImports_jsMakeDoubleToDouble_static_extern(base)
 }
 
 #if arch(wasm32)
-@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_AsyncImportImports_jsAsyncRoundTripNumber_static")
-fileprivate func bjs_AsyncImportImports_jsAsyncRoundTripNumber_static_extern(_ resolveRef: Int32, _ rejectRef: Int32, _ v: Float64) -> Void
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_ClosureSupportImports_jsMakeStringToString_static")
+fileprivate func bjs_ClosureSupportImports_jsMakeStringToString_static_extern(_ prefixBytes: Int32, _ prefixLength: Int32) -> Int32
 #else
-fileprivate func bjs_AsyncImportImports_jsAsyncRoundTripNumber_static_extern(_ resolveRef: Int32, _ rejectRef: Int32, _ v: Float64) -> Void {
+fileprivate func bjs_ClosureSupportImports_jsMakeStringToString_static_extern(_ prefixBytes: Int32, _ prefixLength: Int32) -> Int32 {
     fatalError("Only available on WebAssembly")
 }
 #endif
-@inline(never) fileprivate func bjs_AsyncImportImports_jsAsyncRoundTripNumber_static(_ resolveRef: Int32, _ rejectRef: Int32, _ v: Float64) -> Void {
-    return bjs_AsyncImportImports_jsAsyncRoundTripNumber_static_extern(resolveRef, rejectRef, v)
+@inline(never) fileprivate func bjs_ClosureSupportImports_jsMakeStringToString_static(_ prefixBytes: Int32, _ prefixLength: Int32) -> Int32 {
+    return bjs_ClosureSupportImports_jsMakeStringToString_static_extern(prefixBytes, prefixLength)
 }
 
 #if arch(wasm32)
-@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_AsyncImportImports_jsAsyncRoundTripBool_static")
-fileprivate func bjs_AsyncImportImports_jsAsyncRoundTripBool_static_extern(_ resolveRef: Int32, _ rejectRef: Int32, _ v: Int32) -> Void
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_ClosureSupportImports_jsCallTwice_static")
+fileprivate func bjs_ClosureSupportImports_jsCallTwice_static_extern(_ value: Int32, _ callback: Int32) -> Int32
 #else
-fileprivate func bjs_AsyncImportImports_jsAsyncRoundTripBool_static_extern(_ resolveRef: Int32, _ rejectRef: Int32, _ v: Int32) -> Void {
+fileprivate func bjs_ClosureSupportImports_jsCallTwice_static_extern(_ value: Int32, _ callback: Int32) -> Int32 {
     fatalError("Only available on WebAssembly")
 }
 #endif
-@inline(never) fileprivate func bjs_AsyncImportImports_jsAsyncRoundTripBool_static(_ resolveRef: Int32, _ rejectRef: Int32, _ v: Int32) -> Void {
-    return bjs_AsyncImportImports_jsAsyncRoundTripBool_static_extern(resolveRef, rejectRef, v)
+@inline(never) fileprivate func bjs_ClosureSupportImports_jsCallTwice_static(_ value: Int32, _ callback: Int32) -> Int32 {
+    return bjs_ClosureSupportImports_jsCallTwice_static_extern(value, callback)
 }
 
 #if arch(wasm32)
-@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_AsyncImportImports_jsAsyncRoundTripString_static")
-fileprivate func bjs_AsyncImportImports_jsAsyncRoundTripString_static_extern(_ resolveRef: Int32, _ rejectRef: Int32, _ vBytes: Int32, _ vLength: Int32) -> Void
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_ClosureSupportImports_jsCallBinary_static")
+fileprivate func bjs_ClosureSupportImports_jsCallBinary_static_extern(_ callback: Int32) -> Int32
 #else
-fileprivate func bjs_AsyncImportImports_jsAsyncRoundTripString_static_extern(_ resolveRef: Int32, _ rejectRef: Int32, _ vBytes: Int32, _ vLength: Int32) -> Void {
+fileprivate func bjs_ClosureSupportImports_jsCallBinary_static_extern(_ callback: Int32) -> Int32 {
     fatalError("Only available on WebAssembly")
 }
 #endif
-@inline(never) fileprivate func bjs_AsyncImportImports_jsAsyncRoundTripString_static(_ resolveRef: Int32, _ rejectRef: Int32, _ vBytes: Int32, _ vLength: Int32) -> Void {
-    return bjs_AsyncImportImports_jsAsyncRoundTripString_static_extern(resolveRef, rejectRef, vBytes, vLength)
+@inline(never) fileprivate func bjs_ClosureSupportImports_jsCallBinary_static(_ callback: Int32) -> Int32 {
+    return bjs_ClosureSupportImports_jsCallBinary_static_extern(callback)
 }
 
 #if arch(wasm32)
-@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_AsyncImportImports_jsAsyncRoundTripOptionalString_static")
-fileprivate func bjs_AsyncImportImports_jsAsyncRoundTripOptionalString_static_extern(_ resolveRef: Int32, _ rejectRef: Int32, _ vIsSome: Int32, _ vBytes: Int32, _ vLength: Int32) -> Void
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_ClosureSupportImports_jsCallTriple_static")
+fileprivate func bjs_ClosureSupportImports_jsCallTriple_static_extern(_ callback: Int32) -> Int32
 #else
-fileprivate func bjs_AsyncImportImports_jsAsyncRoundTripOptionalString_static_extern(_ resolveRef: Int32, _ rejectRef: Int32, _ vIsSome: Int32, _ vBytes: Int32, _ vLength: Int32) -> Void {
+fileprivate func bjs_ClosureSupportImports_jsCallTriple_static_extern(_ callback: Int32) -> Int32 {
     fatalError("Only available on WebAssembly")
 }
 #endif
-@inline(never) fileprivate func bjs_AsyncImportImports_jsAsyncRoundTripOptionalString_static(_ resolveRef: Int32, _ rejectRef: Int32, _ vIsSome: Int32, _ vBytes: Int32, _ vLength: Int32) -> Void {
-    return bjs_AsyncImportImports_jsAsyncRoundTripOptionalString_static_extern(resolveRef, rejectRef, vIsSome, vBytes, vLength)
+@inline(never) fileprivate func bjs_ClosureSupportImports_jsCallTriple_static(_ callback: Int32) -> Int32 {
+    return bjs_ClosureSupportImports_jsCallTriple_static_extern(callback)
 }
 
 #if arch(wasm32)
-@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_AsyncImportImports_jsAsyncRoundTripOptionalNumber_static")
-fileprivate func bjs_AsyncImportImports_jsAsyncRoundTripOptionalNumber_static_extern(_ resolveRef: Int32, _ rejectRef: Int32, _ vIsSome: Int32, _ vValue: Float64) -> Void
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_ClosureSupportImports_jsCallAfterRelease_static")
+fileprivate func bjs_ClosureSupportImports_jsCallAfterRelease_static_extern(_ callback: Int32) -> Int32
 #else
-fileprivate func bjs_AsyncImportImports_jsAsyncRoundTripOptionalNumber_static_extern(_ resolveRef: Int32, _ rejectRef: Int32, _ vIsSome: Int32, _ vValue: Float64) -> Void {
+fileprivate func bjs_ClosureSupportImports_jsCallAfterRelease_static_extern(_ callback: Int32) -> Int32 {
     fatalError("Only available on WebAssembly")
 }
 #endif
-@inline(never) fileprivate func bjs_AsyncImportImports_jsAsyncRoundTripOptionalNumber_static(_ resolveRef: Int32, _ rejectRef: Int32, _ vIsSome: Int32, _ vValue: Float64) -> Void {
-    return bjs_AsyncImportImports_jsAsyncRoundTripOptionalNumber_static_extern(resolveRef, rejectRef, vIsSome, vValue)
+@inline(never) fileprivate func bjs_ClosureSupportImports_jsCallAfterRelease_static(_ callback: Int32) -> Int32 {
+    return bjs_ClosureSupportImports_jsCallAfterRelease_static_extern(callback)
 }
 
 #if arch(wasm32)
-@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_AsyncImportImports_jsAsyncRoundTripBoolArray_static")
-fileprivate func bjs_AsyncImportImports_jsAsyncRoundTripBoolArray_static_extern(_ resolveRef: Int32, _ rejectRef: Int32) -> Void
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_ClosureSupportImports_jsOptionalInvoke_static")
+fileprivate func bjs_ClosureSupportImports_jsOptionalInvoke_static_extern(_ callbackIsSome: Int32, _ callbackFuncRef: Int32) -> Int32
 #else
-fileprivate func bjs_AsyncImportImports_jsAsyncRoundTripBoolArray_static_extern(_ resolveRef: Int32, _ rejectRef: Int32) -> Void {
+fileprivate func bjs_ClosureSupportImports_jsOptionalInvoke_static_extern(_ callbackIsSome: Int32, _ callbackFuncRef: Int32) -> Int32 {
     fatalError("Only available on WebAssembly")
 }
 #endif
-@inline(never) fileprivate func bjs_AsyncImportImports_jsAsyncRoundTripBoolArray_static(_ resolveRef: Int32, _ rejectRef: Int32) -> Void {
-    return bjs_AsyncImportImports_jsAsyncRoundTripBoolArray_static_extern(resolveRef, rejectRef)
+@inline(never) fileprivate func bjs_ClosureSupportImports_jsOptionalInvoke_static(_ callbackIsSome: Int32, _ callbackFuncRef: Int32) -> Int32 {
+    return bjs_ClosureSupportImports_jsOptionalInvoke_static_extern(callbackIsSome, callbackFuncRef)
 }
 
 #if arch(wasm32)
-@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_AsyncImportImports_jsAsyncRoundTripIntArray_static")
-fileprivate func bjs_AsyncImportImports_jsAsyncRoundTripIntArray_static_extern(_ resolveRef: Int32, _ rejectRef: Int32) -> Void
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_ClosureSupportImports_jsStoreClosure_static")
+fileprivate func bjs_ClosureSupportImports_jsStoreClosure_static_extern(_ callback: Int32) -> Void
 #else
-fileprivate func bjs_AsyncImportImports_jsAsyncRoundTripIntArray_static_extern(_ resolveRef: Int32, _ rejectRef: Int32) -> Void {
+fileprivate func bjs_ClosureSupportImports_jsStoreClosure_static_extern(_ callback: Int32) -> Void {
     fatalError("Only available on WebAssembly")
 }
 #endif
-@inline(never) fileprivate func bjs_AsyncImportImports_jsAsyncRoundTripIntArray_static(_ resolveRef: Int32, _ rejectRef: Int32) -> Void {
-    return bjs_AsyncImportImports_jsAsyncRoundTripIntArray_static_extern(resolveRef, rejectRef)
+@inline(never) fileprivate func bjs_ClosureSupportImports_jsStoreClosure_static(_ callback: Int32) -> Void {
+    return bjs_ClosureSupportImports_jsStoreClosure_static_extern(callback)
 }
 
 #if arch(wasm32)
-@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_AsyncImportImports_jsAsyncRoundTripStringArray_static")
-fileprivate func bjs_AsyncImportImports_jsAsyncRoundTripStringArray_static_extern(_ resolveRef: Int32, _ rejectRef: Int32) -> Void
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_ClosureSupportImports_jsCallStoredClosure_static")
+fileprivate func bjs_ClosureSupportImports_jsCallStoredClosure_static_extern() -> Void
+#else
+fileprivate func bjs_ClosureSupportImports_jsCallStoredClosure_static_extern() -> Void {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func bjs_ClosureSupportImports_jsCallStoredClosure_static() -> Void {
+    return bjs_ClosureSupportImports_jsCallStoredClosure_static_extern()
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_ClosureSupportImports_jsHeapCount_static")
+fileprivate func bjs_ClosureSupportImports_jsHeapCount_static_extern() -> Int32
 #else
-fileprivate func bjs_AsyncImportImports_jsAsyncRoundTripStringArray_static_extern(_ resolveRef: Int32, _ rejectRef: Int32) -> Void {
+fileprivate func bjs_ClosureSupportImports_jsHeapCount_static_extern() -> Int32 {
     fatalError("Only available on WebAssembly")
 }
 #endif
-@inline(never) fileprivate func bjs_AsyncImportImports_jsAsyncRoundTripStringArray_static(_ resolveRef: Int32, _ rejectRef: Int32) -> Void {
-    return bjs_AsyncImportImports_jsAsyncRoundTripStringArray_static_extern(resolveRef, rejectRef)
+@inline(never) fileprivate func bjs_ClosureSupportImports_jsHeapCount_static() -> Int32 {
+    return bjs_ClosureSupportImports_jsHeapCount_static_extern()
 }
 
 #if arch(wasm32)
-@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_AsyncImportImports_jsAsyncRoundTripFeatureFlag_static")
-fileprivate func bjs_AsyncImportImports_jsAsyncRoundTripFeatureFlag_static_extern(_ resolveRef: Int32, _ rejectRef: Int32, _ vBytes: Int32, _ vLength: Int32) -> Void
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_ClosureSupportImports_runJsClosureSupportTests_static")
+fileprivate func bjs_ClosureSupportImports_runJsClosureSupportTests_static_extern() -> Void
 #else
-fileprivate func bjs_AsyncImportImports_jsAsyncRoundTripFeatureFlag_static_extern(_ resolveRef: Int32, _ rejectRef: Int32, _ vBytes: Int32, _ vLength: Int32) -> Void {
+fileprivate func bjs_ClosureSupportImports_runJsClosureSupportTests_static_extern() -> Void {
     fatalError("Only available on WebAssembly")
 }
 #endif
-@inline(never) fileprivate func bjs_AsyncImportImports_jsAsyncRoundTripFeatureFlag_static(_ resolveRef: Int32, _ rejectRef: Int32, _ vBytes: Int32, _ vLength: Int32) -> Void {
-    return bjs_AsyncImportImports_jsAsyncRoundTripFeatureFlag_static_extern(resolveRef, rejectRef, vBytes, vLength)
+@inline(never) fileprivate func bjs_ClosureSupportImports_runJsClosureSupportTests_static() -> Void {
+    return bjs_ClosureSupportImports_runJsClosureSupportTests_static_extern()
 }
 
-func _$AsyncImportImports_jsAsyncRoundTripVoid() async throws(JSException) -> Void {
-    try await _bjs_awaitPromise(makeResolveClosure: {
-            JSTypedClosure<() -> Void>($0)
-        }, makeRejectClosure: {
-            JSTypedClosure<(sending JSValue) -> Void>($0)
-        }) { resolveRef, rejectRef in
-        bjs_AsyncImportImports_jsAsyncRoundTripVoid_static(resolveRef, rejectRef)
+func _$ClosureSupportImports_jsApplyVoid(_ callback: JSTypedClosure<() -> Void>) throws(JSException) -> Void {
+    let callbackFuncRef = callback.bridgeJSLowerParameter()
+    bjs_ClosureSupportImports_jsApplyVoid_static(callbackFuncRef)
+    if let error = _swift_js_take_exception() {
+        throw error
     }
 }
 
-func _$AsyncImportImports_jsAsyncRoundTripNumber(_ v: Double) async throws(JSException) -> Double {
-    let resolved = try await _bjs_awaitPromise(makeResolveClosure: {
-            JSTypedClosure<(sending Double) -> Void>($0)
-        }, makeRejectClosure: {
-            JSTypedClosure<(sending JSValue) -> Void>($0)
-        }) { resolveRef, rejectRef in
-        let vValue = v.bridgeJSLowerParameter()
-        bjs_AsyncImportImports_jsAsyncRoundTripNumber_static(resolveRef, rejectRef, vValue)
+func _$ClosureSupportImports_jsApplyBool(_ callback: JSTypedClosure<() -> Bool>) throws(JSException) -> Bool {
+    let callbackFuncRef = callback.bridgeJSLowerParameter()
+    let ret = bjs_ClosureSupportImports_jsApplyBool_static(callbackFuncRef)
+    if let error = _swift_js_take_exception() {
+        throw error
     }
-    return resolved
+    return Bool.bridgeJSLiftReturn(ret)
 }
 
-func _$AsyncImportImports_jsAsyncRoundTripBool(_ v: Bool) async throws(JSException) -> Bool {
-    let resolved = try await _bjs_awaitPromise(makeResolveClosure: {
-            JSTypedClosure<(sending Bool) -> Void>($0)
-        }, makeRejectClosure: {
-            JSTypedClosure<(sending JSValue) -> Void>($0)
-        }) { resolveRef, rejectRef in
-        let vValue = v.bridgeJSLowerParameter()
-        bjs_AsyncImportImports_jsAsyncRoundTripBool_static(resolveRef, rejectRef, vValue)
+func _$ClosureSupportImports_jsApplyInt(_ value: Int, _ transform: JSTypedClosure<(Int) -> Int>) throws(JSException) -> Int {
+    let transformFuncRef = transform.bridgeJSLowerParameter()
+    let valueValue = value.bridgeJSLowerParameter()
+    let ret = bjs_ClosureSupportImports_jsApplyInt_static(valueValue, transformFuncRef)
+    if let error = _swift_js_take_exception() {
+        throw error
     }
-    return resolved
+    return Int.bridgeJSLiftReturn(ret)
 }
 
-func _$AsyncImportImports_jsAsyncRoundTripString(_ v: String) async throws(JSException) -> String {
-    let resolved = try await _bjs_awaitPromise(makeResolveClosure: {
-            JSTypedClosure<(sending String) -> Void>($0)
-        }, makeRejectClosure: {
-            JSTypedClosure<(sending JSValue) -> Void>($0)
-        }) { resolveRef, rejectRef in
-        v.bridgeJSWithLoweredParameter { (vBytes, vLength) in
-            bjs_AsyncImportImports_jsAsyncRoundTripString_static(resolveRef, rejectRef, vBytes, vLength)
-        }
+func _$ClosureSupportImports_jsApplyDouble(_ value: Double, _ transform: JSTypedClosure<(Double) -> Double>) throws(JSException) -> Double {
+    let transformFuncRef = transform.bridgeJSLowerParameter()
+    let valueValue = value.bridgeJSLowerParameter()
+    let ret = bjs_ClosureSupportImports_jsApplyDouble_static(valueValue, transformFuncRef)
+    if let error = _swift_js_take_exception() {
+        throw error
     }
-    return resolved
+    return Double.bridgeJSLiftReturn(ret)
 }
 
-func _$AsyncImportImports_jsAsyncRoundTripOptionalString(_ v: Optional<String>) async throws(JSException) -> Optional<String> {
-    let resolved = try await _bjs_awaitPromise(makeResolveClosure: {
-            JSTypedClosure<(sending Optional<String>) -> Void>($0)
-        }, makeRejectClosure: {
-            JSTypedClosure<(sending JSValue) -> Void>($0)
-        }) { resolveRef, rejectRef in
-        v.bridgeJSWithLoweredParameter { (vIsSome, vBytes, vLength) in
-            bjs_AsyncImportImports_jsAsyncRoundTripOptionalString_static(resolveRef, rejectRef, vIsSome, vBytes, vLength)
-        }
+func _$ClosureSupportImports_jsApplyString(_ value: String, _ transform: JSTypedClosure<(String) -> String>) throws(JSException) -> String {
+    let ret0 = value.bridgeJSWithLoweredParameter { (valueBytes, valueLength) in
+        let transformFuncRef = transform.bridgeJSLowerParameter()
+        let ret = bjs_ClosureSupportImports_jsApplyString_static(valueBytes, valueLength, transformFuncRef)
+        return ret
     }
-    return resolved
+    let ret = ret0
+    if let error = _swift_js_take_exception() {
+        throw error
+    }
+    return String.bridgeJSLiftReturn(ret)
 }
 
-func _$AsyncImportImports_jsAsyncRoundTripOptionalNumber(_ v: Optional<Double>) async throws(JSException) -> Optional<Double> {
-    let resolved = try await _bjs_awaitPromise(makeResolveClosure: {
-            JSTypedClosure<(sending Optional<Double>) -> Void>($0)
-        }, makeRejectClosure: {
-            JSTypedClosure<(sending JSValue) -> Void>($0)
-        }) { resolveRef, rejectRef in
-        let (vIsSome, vValue) = v.bridgeJSLowerParameter()
-        bjs_AsyncImportImports_jsAsyncRoundTripOptionalNumber_static(resolveRef, rejectRef, vIsSome, vValue)
+func _$ClosureSupportImports_jsApplyJSObject(_ value: JSObject, _ transform: JSTypedClosure<(JSObject) -> JSObject>) throws(JSException) -> JSObject {
+    let transformFuncRef = transform.bridgeJSLowerParameter()
+    let valueValue = value.bridgeJSLowerParameter()
+    let ret = bjs_ClosureSupportImports_jsApplyJSObject_static(valueValue, transformFuncRef)
+    if let error = _swift_js_take_exception() {
+        throw error
     }
-    return resolved
+    return JSObject.bridgeJSLiftReturn(ret)
 }
 
-func _$AsyncImportImports_jsAsyncRoundTripBoolArray(_ values: [Bool]) async throws(JSException) -> [Bool] {
-    let resolved = try await _bjs_awaitPromise(makeResolveClosure: {
-            JSTypedClosure<(sending [Bool]) -> Void>($0)
-        }, makeRejectClosure: {
-            JSTypedClosure<(sending JSValue) -> Void>($0)
-        }) { resolveRef, rejectRef in
-        let _ = values.bridgeJSLowerParameter()
-        bjs_AsyncImportImports_jsAsyncRoundTripBoolArray_static(resolveRef, rejectRef)
+func _$ClosureSupportImports_jsMakeIntToInt(_ base: Int) throws(JSException) -> (Int) -> Int {
+    let baseValue = base.bridgeJSLowerParameter()
+    let ret = bjs_ClosureSupportImports_jsMakeIntToInt_static(baseValue)
+    if let error = _swift_js_take_exception() {
+        throw error
     }
-    return resolved
+    return _BJS_Closure_20BridgeJSRuntimeTestsSi_Si.bridgeJSLift(ret)
 }
 
-func _$AsyncImportImports_jsAsyncRoundTripIntArray(_ values: [Double]) async throws(JSException) -> [Double] {
-    let resolved = try await _bjs_awaitPromise(makeResolveClosure: {
-            JSTypedClosure<(sending [Double]) -> Void>($0)
-        }, makeRejectClosure: {
-            JSTypedClosure<(sending JSValue) -> Void>($0)
-        }) { resolveRef, rejectRef in
-        let _ = values.bridgeJSLowerParameter()
-        bjs_AsyncImportImports_jsAsyncRoundTripIntArray_static(resolveRef, rejectRef)
+func _$ClosureSupportImports_jsMakeDoubleToDouble(_ base: Double) throws(JSException) -> (Double) -> Double {
+    let baseValue = base.bridgeJSLowerParameter()
+    let ret = bjs_ClosureSupportImports_jsMakeDoubleToDouble_static(baseValue)
+    if let error = _swift_js_take_exception() {
+        throw error
     }
-    return resolved
+    return _BJS_Closure_20BridgeJSRuntimeTestsSd_Sd.bridgeJSLift(ret)
 }
 
-func _$AsyncImportImports_jsAsyncRoundTripStringArray(_ values: [String]) async throws(JSException) -> [String] {
-    let resolved = try await _bjs_awaitPromise(makeResolveClosure: {
-            JSTypedClosure<(sending [String]) -> Void>($0)
-        }, makeRejectClosure: {
-            JSTypedClosure<(sending JSValue) -> Void>($0)
-        }) { resolveRef, rejectRef in
-        let _ = values.bridgeJSLowerParameter()
-        bjs_AsyncImportImports_jsAsyncRoundTripStringArray_static(resolveRef, rejectRef)
+func _$ClosureSupportImports_jsMakeStringToString(_ prefix: String) throws(JSException) -> (String) -> String {
+    let ret0 = prefix.bridgeJSWithLoweredParameter { (prefixBytes, prefixLength) in
+        let ret = bjs_ClosureSupportImports_jsMakeStringToString_static(prefixBytes, prefixLength)
+        return ret
     }
-    return resolved
+    let ret = ret0
+    if let error = _swift_js_take_exception() {
+        throw error
+    }
+    return _BJS_Closure_20BridgeJSRuntimeTestsSS_SS.bridgeJSLift(ret)
 }
 
-func _$AsyncImportImports_jsAsyncRoundTripFeatureFlag(_ v: FeatureFlag) async throws(JSException) -> FeatureFlag {
-    let resolved = try await _bjs_awaitPromise(makeResolveClosure: {
-            JSTypedClosure<(sending FeatureFlag) -> Void>($0)
-        }, makeRejectClosure: {
-            JSTypedClosure<(sending JSValue) -> Void>($0)
-        }) { resolveRef, rejectRef in
-        v.bridgeJSWithLoweredParameter { (vBytes, vLength) in
-            bjs_AsyncImportImports_jsAsyncRoundTripFeatureFlag_static(resolveRef, rejectRef, vBytes, vLength)
-        }
+func _$ClosureSupportImports_jsCallTwice(_ value: Int, _ callback: JSTypedClosure<(Int) -> Void>) throws(JSException) -> Int {
+    let callbackFuncRef = callback.bridgeJSLowerParameter()
+    let valueValue = value.bridgeJSLowerParameter()
+    let ret = bjs_ClosureSupportImports_jsCallTwice_static(valueValue, callbackFuncRef)
+    if let error = _swift_js_take_exception() {
+        throw error
     }
-    return resolved
+    return Int.bridgeJSLiftReturn(ret)
 }
 
-#if arch(wasm32)
-@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_ClosureSupportImports_jsApplyVoid_static")
-fileprivate func bjs_ClosureSupportImports_jsApplyVoid_static_extern(_ callback: Int32) -> Void
-#else
-fileprivate func bjs_ClosureSupportImports_jsApplyVoid_static_extern(_ callback: Int32) -> Void {
-    fatalError("Only available on WebAssembly")
+func _$ClosureSupportImports_jsCallBinary(_ callback: JSTypedClosure<(Int, Int) -> Int>) throws(JSException) -> Int {
+    let callbackFuncRef = callback.bridgeJSLowerParameter()
+    let ret = bjs_ClosureSupportImports_jsCallBinary_static(callbackFuncRef)
+    if let error = _swift_js_take_exception() {
+        throw error
+    }
+    return Int.bridgeJSLiftReturn(ret)
 }
-#endif
-@inline(never) fileprivate func bjs_ClosureSupportImports_jsApplyVoid_static(_ callback: Int32) -> Void {
-    return bjs_ClosureSupportImports_jsApplyVoid_static_extern(callback)
+
+func _$ClosureSupportImports_jsCallTriple(_ callback: JSTypedClosure<(Int, Int, Int) -> Int>) throws(JSException) -> Int {
+    let callbackFuncRef = callback.bridgeJSLowerParameter()
+    let ret = bjs_ClosureSupportImports_jsCallTriple_static(callbackFuncRef)
+    if let error = _swift_js_take_exception() {
+        throw error
+    }
+    return Int.bridgeJSLiftReturn(ret)
 }
 
-#if arch(wasm32)
-@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_ClosureSupportImports_jsApplyBool_static")
-fileprivate func bjs_ClosureSupportImports_jsApplyBool_static_extern(_ callback: Int32) -> Int32
-#else
-fileprivate func bjs_ClosureSupportImports_jsApplyBool_static_extern(_ callback: Int32) -> Int32 {
-    fatalError("Only available on WebAssembly")
+func _$ClosureSupportImports_jsCallAfterRelease(_ callback: JSTypedClosure<() -> Void>) throws(JSException) -> String {
+    let callbackFuncRef = callback.bridgeJSLowerParameter()
+    let ret = bjs_ClosureSupportImports_jsCallAfterRelease_static(callbackFuncRef)
+    if let error = _swift_js_take_exception() {
+        throw error
+    }
+    return String.bridgeJSLiftReturn(ret)
 }
-#endif
-@inline(never) fileprivate func bjs_ClosureSupportImports_jsApplyBool_static(_ callback: Int32) -> Int32 {
-    return bjs_ClosureSupportImports_jsApplyBool_static_extern(callback)
+
+func _$ClosureSupportImports_jsOptionalInvoke(_ callback: Optional<JSTypedClosure<() -> Bool>>) throws(JSException) -> Bool {
+    let (callbackIsSome, callbackFuncRef) = callback.bridgeJSLowerParameter()
+    let ret = bjs_ClosureSupportImports_jsOptionalInvoke_static(callbackIsSome, callbackFuncRef)
+    if let error = _swift_js_take_exception() {
+        throw error
+    }
+    return Bool.bridgeJSLiftReturn(ret)
+}
+
+func _$ClosureSupportImports_jsStoreClosure(_ callback: JSTypedClosure<() -> Void>) throws(JSException) -> Void {
+    let callbackFuncRef = callback.bridgeJSLowerParameter()
+    bjs_ClosureSupportImports_jsStoreClosure_static(callbackFuncRef)
+    if let error = _swift_js_take_exception() {
+        throw error
+    }
+}
+
+func _$ClosureSupportImports_jsCallStoredClosure() throws(JSException) -> Void {
+    bjs_ClosureSupportImports_jsCallStoredClosure_static()
+    if let error = _swift_js_take_exception() {
+        throw error
+    }
+}
+
+func _$ClosureSupportImports_jsHeapCount() throws(JSException) -> Int {
+    let ret = bjs_ClosureSupportImports_jsHeapCount_static()
+    if let error = _swift_js_take_exception() {
+        throw error
+    }
+    return Int.bridgeJSLiftReturn(ret)
+}
+
+func _$ClosureSupportImports_runJsClosureSupportTests() throws(JSException) -> Void {
+    bjs_ClosureSupportImports_runJsClosureSupportTests_static()
+    if let error = _swift_js_take_exception() {
+        throw error
+    }
 }
 
 #if arch(wasm32)
-@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_ClosureSupportImports_jsApplyInt_static")
-fileprivate func bjs_ClosureSupportImports_jsApplyInt_static_extern(_ value: Int32, _ transform: Int32) -> Int32
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_ClosureThrowsImports_runJsClosureThrowsTests_static")
+fileprivate func bjs_ClosureThrowsImports_runJsClosureThrowsTests_static_extern() -> Void
 #else
-fileprivate func bjs_ClosureSupportImports_jsApplyInt_static_extern(_ value: Int32, _ transform: Int32) -> Int32 {
+fileprivate func bjs_ClosureThrowsImports_runJsClosureThrowsTests_static_extern() -> Void {
     fatalError("Only available on WebAssembly")
 }
 #endif
-@inline(never) fileprivate func bjs_ClosureSupportImports_jsApplyInt_static(_ value: Int32, _ transform: Int32) -> Int32 {
-    return bjs_ClosureSupportImports_jsApplyInt_static_extern(value, transform)
+@inline(never) fileprivate func bjs_ClosureThrowsImports_runJsClosureThrowsTests_static() -> Void {
+    return bjs_ClosureThrowsImports_runJsClosureThrowsTests_static_extern()
+}
+
+func _$ClosureThrowsImports_runJsClosureThrowsTests() throws(JSException) -> Void {
+    bjs_ClosureThrowsImports_runJsClosureThrowsTests_static()
+    if let error = _swift_js_take_exception() {
+        throw error
+    }
 }
 
 #if arch(wasm32)
-@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_ClosureSupportImports_jsApplyDouble_static")
-fileprivate func bjs_ClosureSupportImports_jsApplyDouble_static_extern(_ value: Float64, _ transform: Int32) -> Float64
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DefaultArgumentImports_runJsDefaultArgumentTests_static")
+fileprivate func bjs_DefaultArgumentImports_runJsDefaultArgumentTests_static_extern() -> Void
 #else
-fileprivate func bjs_ClosureSupportImports_jsApplyDouble_static_extern(_ value: Float64, _ transform: Int32) -> Float64 {
+fileprivate func bjs_DefaultArgumentImports_runJsDefaultArgumentTests_static_extern() -> Void {
     fatalError("Only available on WebAssembly")
 }
 #endif
-@inline(never) fileprivate func bjs_ClosureSupportImports_jsApplyDouble_static(_ value: Float64, _ transform: Int32) -> Float64 {
-    return bjs_ClosureSupportImports_jsApplyDouble_static_extern(value, transform)
+@inline(never) fileprivate func bjs_DefaultArgumentImports_runJsDefaultArgumentTests_static() -> Void {
+    return bjs_DefaultArgumentImports_runJsDefaultArgumentTests_static_extern()
+}
+
+func _$DefaultArgumentImports_runJsDefaultArgumentTests() throws(JSException) -> Void {
+    bjs_DefaultArgumentImports_runJsDefaultArgumentTests_static()
+    if let error = _swift_js_take_exception() {
+        throw error
+    }
 }
 
 #if arch(wasm32)
-@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_ClosureSupportImports_jsApplyString_static")
-fileprivate func bjs_ClosureSupportImports_jsApplyString_static_extern(_ valueBytes: Int32, _ valueLength: Int32, _ transform: Int32) -> Int32
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DictionarySupportImports_jsRoundTripDictionaryInt_static")
+fileprivate func bjs_DictionarySupportImports_jsRoundTripDictionaryInt_static_extern() -> Void
 #else
-fileprivate func bjs_ClosureSupportImports_jsApplyString_static_extern(_ valueBytes: Int32, _ valueLength: Int32, _ transform: Int32) -> Int32 {
+fileprivate func bjs_DictionarySupportImports_jsRoundTripDictionaryInt_static_extern() -> Void {
     fatalError("Only available on WebAssembly")
 }
 #endif
-@inline(never) fileprivate func bjs_ClosureSupportImports_jsApplyString_static(_ valueBytes: Int32, _ valueLength: Int32, _ transform: Int32) -> Int32 {
-    return bjs_ClosureSupportImports_jsApplyString_static_extern(valueBytes, valueLength, transform)
+@inline(never) fileprivate func bjs_DictionarySupportImports_jsRoundTripDictionaryInt_static() -> Void {
+    return bjs_DictionarySupportImports_jsRoundTripDictionaryInt_static_extern()
 }
 
 #if arch(wasm32)
-@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_ClosureSupportImports_jsApplyJSObject_static")
-fileprivate func bjs_ClosureSupportImports_jsApplyJSObject_static_extern(_ value: Int32, _ transform: Int32) -> Int32
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DictionarySupportImports_jsRoundTripDictionaryBool_static")
+fileprivate func bjs_DictionarySupportImports_jsRoundTripDictionaryBool_static_extern() -> Void
 #else
-fileprivate func bjs_ClosureSupportImports_jsApplyJSObject_static_extern(_ value: Int32, _ transform: Int32) -> Int32 {
+fileprivate func bjs_DictionarySupportImports_jsRoundTripDictionaryBool_static_extern() -> Void {
     fatalError("Only available on WebAssembly")
 }
 #endif
-@inline(never) fileprivate func bjs_ClosureSupportImports_jsApplyJSObject_static(_ value: Int32, _ transform: Int32) -> Int32 {
-    return bjs_ClosureSupportImports_jsApplyJSObject_static_extern(value, transform)
+@inline(never) fileprivate func bjs_DictionarySupportImports_jsRoundTripDictionaryBool_static() -> Void {
+    return bjs_DictionarySupportImports_jsRoundTripDictionaryBool_static_extern()
 }
 
 #if arch(wasm32)
-@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_ClosureSupportImports_jsMakeIntToInt_static")
-fileprivate func bjs_ClosureSupportImports_jsMakeIntToInt_static_extern(_ base: Int32) -> Int32
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DictionarySupportImports_jsRoundTripDictionaryDouble_static")
+fileprivate func bjs_DictionarySupportImports_jsRoundTripDictionaryDouble_static_extern() -> Void
 #else
-fileprivate func bjs_ClosureSupportImports_jsMakeIntToInt_static_extern(_ base: Int32) -> Int32 {
+fileprivate func bjs_DictionarySupportImports_jsRoundTripDictionaryDouble_static_extern() -> Void {
     fatalError("Only available on WebAssembly")
 }
 #endif
-@inline(never) fileprivate func bjs_ClosureSupportImports_jsMakeIntToInt_static(_ base: Int32) -> Int32 {
-    return bjs_ClosureSupportImports_jsMakeIntToInt_static_extern(base)
+@inline(never) fileprivate func bjs_DictionarySupportImports_jsRoundTripDictionaryDouble_static() -> Void {
+    return bjs_DictionarySupportImports_jsRoundTripDictionaryDouble_static_extern()
 }
 
 #if arch(wasm32)
-@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_ClosureSupportImports_jsMakeDoubleToDouble_static")
-fileprivate func bjs_ClosureSupportImports_jsMakeDoubleToDouble_static_extern(_ base: Float64) -> Int32
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DictionarySupportImports_jsRoundTripDictionaryJSObject_static")
+fileprivate func bjs_DictionarySupportImports_jsRoundTripDictionaryJSObject_static_extern() -> Void
 #else
-fileprivate func bjs_ClosureSupportImports_jsMakeDoubleToDouble_static_extern(_ base: Float64) -> Int32 {
+fileprivate func bjs_DictionarySupportImports_jsRoundTripDictionaryJSObject_static_extern() -> Void {
     fatalError("Only available on WebAssembly")
 }
 #endif
-@inline(never) fileprivate func bjs_ClosureSupportImports_jsMakeDoubleToDouble_static(_ base: Float64) -> Int32 {
-    return bjs_ClosureSupportImports_jsMakeDoubleToDouble_static_extern(base)
+@inline(never) fileprivate func bjs_DictionarySupportImports_jsRoundTripDictionaryJSObject_static() -> Void {
+    return bjs_DictionarySupportImports_jsRoundTripDictionaryJSObject_static_extern()
 }
 
 #if arch(wasm32)
-@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_ClosureSupportImports_jsMakeStringToString_static")
-fileprivate func bjs_ClosureSupportImports_jsMakeStringToString_static_extern(_ prefixBytes: Int32, _ prefixLength: Int32) -> Int32
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DictionarySupportImports_jsRoundTripDictionaryJSValue_static")
+fileprivate func bjs_DictionarySupportImports_jsRoundTripDictionaryJSValue_static_extern() -> Void
 #else
-fileprivate func bjs_ClosureSupportImports_jsMakeStringToString_static_extern(_ prefixBytes: Int32, _ prefixLength: Int32) -> Int32 {
+fileprivate func bjs_DictionarySupportImports_jsRoundTripDictionaryJSValue_static_extern() -> Void {
     fatalError("Only available on WebAssembly")
 }
 #endif
-@inline(never) fileprivate func bjs_ClosureSupportImports_jsMakeStringToString_static(_ prefixBytes: Int32, _ prefixLength: Int32) -> Int32 {
-    return bjs_ClosureSupportImports_jsMakeStringToString_static_extern(prefixBytes, prefixLength)
+@inline(never) fileprivate func bjs_DictionarySupportImports_jsRoundTripDictionaryJSValue_static() -> Void {
+    return bjs_DictionarySupportImports_jsRoundTripDictionaryJSValue_static_extern()
 }
 
 #if arch(wasm32)
-@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_ClosureSupportImports_jsCallTwice_static")
-fileprivate func bjs_ClosureSupportImports_jsCallTwice_static_extern(_ value: Int32, _ callback: Int32) -> Int32
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DictionarySupportImports_jsRoundTripDictionaryDoubleArray_static")
+fileprivate func bjs_DictionarySupportImports_jsRoundTripDictionaryDoubleArray_static_extern() -> Void
 #else
-fileprivate func bjs_ClosureSupportImports_jsCallTwice_static_extern(_ value: Int32, _ callback: Int32) -> Int32 {
+fileprivate func bjs_DictionarySupportImports_jsRoundTripDictionaryDoubleArray_static_extern() -> Void {
     fatalError("Only available on WebAssembly")
 }
 #endif
-@inline(never) fileprivate func bjs_ClosureSupportImports_jsCallTwice_static(_ value: Int32, _ callback: Int32) -> Int32 {
-    return bjs_ClosureSupportImports_jsCallTwice_static_extern(value, callback)
+@inline(never) fileprivate func bjs_DictionarySupportImports_jsRoundTripDictionaryDoubleArray_static() -> Void {
+    return bjs_DictionarySupportImports_jsRoundTripDictionaryDoubleArray_static_extern()
 }
 
-#if arch(wasm32)
-@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_ClosureSupportImports_jsCallBinary_static")
-fileprivate func bjs_ClosureSupportImports_jsCallBinary_static_extern(_ callback: Int32) -> Int32
-#else
-fileprivate func bjs_ClosureSupportImports_jsCallBinary_static_extern(_ callback: Int32) -> Int32 {
-    fatalError("Only available on WebAssembly")
+func _$DictionarySupportImports_jsRoundTripDictionaryInt(_ values: [String: Int]) throws(JSException) -> [String: Int] {
+    let _ = values.bridgeJSLowerParameter()
+    bjs_DictionarySupportImports_jsRoundTripDictionaryInt_static()
+    if let error = _swift_js_take_exception() {
+        throw error
+    }
+    return [String: Int].bridgeJSLiftReturn()
 }
-#endif
-@inline(never) fileprivate func bjs_ClosureSupportImports_jsCallBinary_static(_ callback: Int32) -> Int32 {
-    return bjs_ClosureSupportImports_jsCallBinary_static_extern(callback)
+
+func _$DictionarySupportImports_jsRoundTripDictionaryBool(_ values: [String: Bool]) throws(JSException) -> [String: Bool] {
+    let _ = values.bridgeJSLowerParameter()
+    bjs_DictionarySupportImports_jsRoundTripDictionaryBool_static()
+    if let error = _swift_js_take_exception() {
+        throw error
+    }
+    return [String: Bool].bridgeJSLiftReturn()
 }
 
-#if arch(wasm32)
-@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_ClosureSupportImports_jsCallTriple_static")
-fileprivate func bjs_ClosureSupportImports_jsCallTriple_static_extern(_ callback: Int32) -> Int32
-#else
-fileprivate func bjs_ClosureSupportImports_jsCallTriple_static_extern(_ callback: Int32) -> Int32 {
-    fatalError("Only available on WebAssembly")
+func _$DictionarySupportImports_jsRoundTripDictionaryDouble(_ values: [String: Double]) throws(JSException) -> [String: Double] {
+    let _ = values.bridgeJSLowerParameter()
+    bjs_DictionarySupportImports_jsRoundTripDictionaryDouble_static()
+    if let error = _swift_js_take_exception() {
+        throw error
+    }
+    return [String: Double].bridgeJSLiftReturn()
 }
-#endif
-@inline(never) fileprivate func bjs_ClosureSupportImports_jsCallTriple_static(_ callback: Int32) -> Int32 {
-    return bjs_ClosureSupportImports_jsCallTriple_static_extern(callback)
+
+func _$DictionarySupportImports_jsRoundTripDictionaryJSObject(_ values: [String: JSObject]) throws(JSException) -> [String: JSObject] {
+    let _ = values.bridgeJSLowerParameter()
+    bjs_DictionarySupportImports_jsRoundTripDictionaryJSObject_static()
+    if let error = _swift_js_take_exception() {
+        throw error
+    }
+    return [String: JSObject].bridgeJSLiftReturn()
 }
 
-#if arch(wasm32)
-@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_ClosureSupportImports_jsCallAfterRelease_static")
-fileprivate func bjs_ClosureSupportImports_jsCallAfterRelease_static_extern(_ callback: Int32) -> Int32
-#else
-fileprivate func bjs_ClosureSupportImports_jsCallAfterRelease_static_extern(_ callback: Int32) -> Int32 {
-    fatalError("Only available on WebAssembly")
+func _$DictionarySupportImports_jsRoundTripDictionaryJSValue(_ values: [String: JSValue]) throws(JSException) -> [String: JSValue] {
+    let _ = values.bridgeJSLowerParameter()
+    bjs_DictionarySupportImports_jsRoundTripDictionaryJSValue_static()
+    if let error = _swift_js_take_exception() {
+        throw error
+    }
+    return [String: JSValue].bridgeJSLiftReturn()
 }
-#endif
-@inline(never) fileprivate func bjs_ClosureSupportImports_jsCallAfterRelease_static(_ callback: Int32) -> Int32 {
-    return bjs_ClosureSupportImports_jsCallAfterRelease_static_extern(callback)
+
+func _$DictionarySupportImports_jsRoundTripDictionaryDoubleArray(_ values: [String: [Double]]) throws(JSException) -> [String: [Double]] {
+    let _ = values.bridgeJSLowerParameter()
+    bjs_DictionarySupportImports_jsRoundTripDictionaryDoubleArray_static()
+    if let error = _swift_js_take_exception() {
+        throw error
+    }
+    return [String: [Double]].bridgeJSLiftReturn()
 }
 
 #if arch(wasm32)
-@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_ClosureSupportImports_jsOptionalInvoke_static")
-fileprivate func bjs_ClosureSupportImports_jsOptionalInvoke_static_extern(_ callbackIsSome: Int32, _ callbackFuncRef: Int32) -> Int32
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_Foo_init")
+fileprivate func bjs_Foo_init_extern(_ valueBytes: Int32, _ valueLength: Int32) -> Int32
 #else
-fileprivate func bjs_ClosureSupportImports_jsOptionalInvoke_static_extern(_ callbackIsSome: Int32, _ callbackFuncRef: Int32) -> Int32 {
+fileprivate func bjs_Foo_init_extern(_ valueBytes: Int32, _ valueLength: Int32) -> Int32 {
     fatalError("Only available on WebAssembly")
 }
 #endif
-@inline(never) fileprivate func bjs_ClosureSupportImports_jsOptionalInvoke_static(_ callbackIsSome: Int32, _ callbackFuncRef: Int32) -> Int32 {
-    return bjs_ClosureSupportImports_jsOptionalInvoke_static_extern(callbackIsSome, callbackFuncRef)
+@inline(never) fileprivate func bjs_Foo_init(_ valueBytes: Int32, _ valueLength: Int32) -> Int32 {
+    return bjs_Foo_init_extern(valueBytes, valueLength)
 }
 
 #if arch(wasm32)
-@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_ClosureSupportImports_jsStoreClosure_static")
-fileprivate func bjs_ClosureSupportImports_jsStoreClosure_static_extern(_ callback: Int32) -> Void
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_Foo_value_get")
+fileprivate func bjs_Foo_value_get_extern(_ self: Int32) -> Int32
 #else
-fileprivate func bjs_ClosureSupportImports_jsStoreClosure_static_extern(_ callback: Int32) -> Void {
+fileprivate func bjs_Foo_value_get_extern(_ self: Int32) -> Int32 {
     fatalError("Only available on WebAssembly")
 }
 #endif
-@inline(never) fileprivate func bjs_ClosureSupportImports_jsStoreClosure_static(_ callback: Int32) -> Void {
-    return bjs_ClosureSupportImports_jsStoreClosure_static_extern(callback)
+@inline(never) fileprivate func bjs_Foo_value_get(_ self: Int32) -> Int32 {
+    return bjs_Foo_value_get_extern(self)
 }
 
-#if arch(wasm32)
-@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_ClosureSupportImports_jsCallStoredClosure_static")
-fileprivate func bjs_ClosureSupportImports_jsCallStoredClosure_static_extern() -> Void
-#else
-fileprivate func bjs_ClosureSupportImports_jsCallStoredClosure_static_extern() -> Void {
-    fatalError("Only available on WebAssembly")
+func _$Foo_init(_ value: String) throws(JSException) -> JSObject {
+    let ret0 = value.bridgeJSWithLoweredParameter { (valueBytes, valueLength) in
+        let ret = bjs_Foo_init(valueBytes, valueLength)
+        return ret
+    }
+    let ret = ret0
+    if let error = _swift_js_take_exception() {
+        throw error
+    }
+    return JSObject.bridgeJSLiftReturn(ret)
 }
-#endif
-@inline(never) fileprivate func bjs_ClosureSupportImports_jsCallStoredClosure_static() -> Void {
-    return bjs_ClosureSupportImports_jsCallStoredClosure_static_extern()
+
+func _$Foo_value_get(_ self: JSObject) throws(JSException) -> String {
+    let selfValue = self.bridgeJSLowerParameter()
+    let ret = bjs_Foo_value_get(selfValue)
+    if let error = _swift_js_take_exception() {
+        throw error
+    }
+    return String.bridgeJSLiftReturn(ret)
 }
 
 #if arch(wasm32)
-@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_ClosureSupportImports_jsHeapCount_static")
-fileprivate func bjs_ClosureSupportImports_jsHeapCount_static_extern() -> Int32
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_globalObject1_get")
+fileprivate func bjs_globalObject1_get_extern() -> Void
 #else
-fileprivate func bjs_ClosureSupportImports_jsHeapCount_static_extern() -> Int32 {
+fileprivate func bjs_globalObject1_get_extern() -> Void {
     fatalError("Only available on WebAssembly")
 }
 #endif
-@inline(never) fileprivate func bjs_ClosureSupportImports_jsHeapCount_static() -> Int32 {
-    return bjs_ClosureSupportImports_jsHeapCount_static_extern()
+@inline(never) fileprivate func bjs_globalObject1_get() -> Void {
+    return bjs_globalObject1_get_extern()
+}
+
+func _$globalObject1_get() throws(JSException) -> JSValue {
+    bjs_globalObject1_get()
+    if let error = _swift_js_take_exception() {
+        throw error
+    }
+    return JSValue.bridgeJSLiftReturn()
 }
 
 #if arch(wasm32)
-@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_ClosureSupportImports_runJsClosureSupportTests_static")
-fileprivate func bjs_ClosureSupportImports_runJsClosureSupportTests_static_extern() -> Void
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_jsRoundTripVoid")
+fileprivate func bjs_jsRoundTripVoid_extern() -> Void
 #else
-fileprivate func bjs_ClosureSupportImports_runJsClosureSupportTests_static_extern() -> Void {
+fileprivate func bjs_jsRoundTripVoid_extern() -> Void {
     fatalError("Only available on WebAssembly")
 }
 #endif
-@inline(never) fileprivate func bjs_ClosureSupportImports_runJsClosureSupportTests_static() -> Void {
-    return bjs_ClosureSupportImports_runJsClosureSupportTests_static_extern()
+@inline(never) fileprivate func bjs_jsRoundTripVoid() -> Void {
+    return bjs_jsRoundTripVoid_extern()
 }
 
-func _$ClosureSupportImports_jsApplyVoid(_ callback: JSTypedClosure<() -> Void>) throws(JSException) -> Void {
-    let callbackFuncRef = callback.bridgeJSLowerParameter()
-    bjs_ClosureSupportImports_jsApplyVoid_static(callbackFuncRef)
+func _$jsRoundTripVoid() throws(JSException) -> Void {
+    bjs_jsRoundTripVoid()
     if let error = _swift_js_take_exception() {
         throw error
     }
 }
 
-func _$ClosureSupportImports_jsApplyBool(_ callback: JSTypedClosure<() -> Bool>) throws(JSException) -> Bool {
-    let callbackFuncRef = callback.bridgeJSLowerParameter()
-    let ret = bjs_ClosureSupportImports_jsApplyBool_static(callbackFuncRef)
-    if let error = _swift_js_take_exception() {
-        throw error
-    }
-    return Bool.bridgeJSLiftReturn(ret)
+#if arch(wasm32)
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_jsRoundTripNumber")
+fileprivate func bjs_jsRoundTripNumber_extern(_ v: Float64) -> Float64
+#else
+fileprivate func bjs_jsRoundTripNumber_extern(_ v: Float64) -> Float64 {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func bjs_jsRoundTripNumber(_ v: Float64) -> Float64 {
+    return bjs_jsRoundTripNumber_extern(v)
 }
 
-func _$ClosureSupportImports_jsApplyInt(_ value: Int, _ transform: JSTypedClosure<(Int) -> Int>) throws(JSException) -> Int {
-    let valueValue = value.bridgeJSLowerParameter()
-    let transformFuncRef = transform.bridgeJSLowerParameter()
-    let ret = bjs_ClosureSupportImports_jsApplyInt_static(valueValue, transformFuncRef)
+func _$jsRoundTripNumber(_ v: Double) throws(JSException) -> Double {
+    let vValue = v.bridgeJSLowerParameter()
+    let ret = bjs_jsRoundTripNumber(vValue)
     if let error = _swift_js_take_exception() {
         throw error
     }
-    return Int.bridgeJSLiftReturn(ret)
+    return Double.bridgeJSLiftReturn(ret)
 }
 
-func _$ClosureSupportImports_jsApplyDouble(_ value: Double, _ transform: JSTypedClosure<(Double) -> Double>) throws(JSException) -> Double {
-    let valueValue = value.bridgeJSLowerParameter()
-    let transformFuncRef = transform.bridgeJSLowerParameter()
-    let ret = bjs_ClosureSupportImports_jsApplyDouble_static(valueValue, transformFuncRef)
+#if arch(wasm32)
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_jsRoundTripBool")
+fileprivate func bjs_jsRoundTripBool_extern(_ v: Int32) -> Int32
+#else
+fileprivate func bjs_jsRoundTripBool_extern(_ v: Int32) -> Int32 {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func bjs_jsRoundTripBool(_ v: Int32) -> Int32 {
+    return bjs_jsRoundTripBool_extern(v)
+}
+
+func _$jsRoundTripBool(_ v: Bool) throws(JSException) -> Bool {
+    let vValue = v.bridgeJSLowerParameter()
+    let ret = bjs_jsRoundTripBool(vValue)
     if let error = _swift_js_take_exception() {
         throw error
     }
-    return Double.bridgeJSLiftReturn(ret)
+    return Bool.bridgeJSLiftReturn(ret)
 }
 
-func _$ClosureSupportImports_jsApplyString(_ value: String, _ transform: JSTypedClosure<(String) -> String>) throws(JSException) -> String {
-    let ret0 = value.bridgeJSWithLoweredParameter { (valueBytes, valueLength) in
-        let transformFuncRef = transform.bridgeJSLowerParameter()
-        let ret = bjs_ClosureSupportImports_jsApplyString_static(valueBytes, valueLength, transformFuncRef)
+#if arch(wasm32)
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_jsRoundTripString")
+fileprivate func bjs_jsRoundTripString_extern(_ vBytes: Int32, _ vLength: Int32) -> Int32
+#else
+fileprivate func bjs_jsRoundTripString_extern(_ vBytes: Int32, _ vLength: Int32) -> Int32 {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func bjs_jsRoundTripString(_ vBytes: Int32, _ vLength: Int32) -> Int32 {
+    return bjs_jsRoundTripString_extern(vBytes, vLength)
+}
+
+func _$jsRoundTripString(_ v: String) throws(JSException) -> String {
+    let ret0 = v.bridgeJSWithLoweredParameter { (vBytes, vLength) in
+        let ret = bjs_jsRoundTripString(vBytes, vLength)
         return ret
     }
     let ret = ret0
@@ -12006,295 +16714,304 @@ func _$ClosureSupportImports_jsApplyString(_ value: String, _ transform: JSTyped
     return String.bridgeJSLiftReturn(ret)
 }
 
-func _$ClosureSupportImports_jsApplyJSObject(_ value: JSObject, _ transform: JSTypedClosure<(JSObject) -> JSObject>) throws(JSException) -> JSObject {
-    let valueValue = value.bridgeJSLowerParameter()
-    let transformFuncRef = transform.bridgeJSLowerParameter()
-    let ret = bjs_ClosureSupportImports_jsApplyJSObject_static(valueValue, transformFuncRef)
-    if let error = _swift_js_take_exception() {
-        throw error
-    }
-    return JSObject.bridgeJSLiftReturn(ret)
+#if arch(wasm32)
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_jsRoundTripJSValue")
+fileprivate func bjs_jsRoundTripJSValue_extern(_ vKind: Int32, _ vPayload1: Int32, _ vPayload2: Float64) -> Void
+#else
+fileprivate func bjs_jsRoundTripJSValue_extern(_ vKind: Int32, _ vPayload1: Int32, _ vPayload2: Float64) -> Void {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func bjs_jsRoundTripJSValue(_ vKind: Int32, _ vPayload1: Int32, _ vPayload2: Float64) -> Void {
+    return bjs_jsRoundTripJSValue_extern(vKind, vPayload1, vPayload2)
 }
 
-func _$ClosureSupportImports_jsMakeIntToInt(_ base: Int) throws(JSException) -> (Int) -> Int {
-    let baseValue = base.bridgeJSLowerParameter()
-    let ret = bjs_ClosureSupportImports_jsMakeIntToInt_static(baseValue)
+func _$jsRoundTripJSValue(_ v: JSValue) throws(JSException) -> JSValue {
+    let (vKind, vPayload1, vPayload2) = v.bridgeJSLowerParameter()
+    bjs_jsRoundTripJSValue(vKind, vPayload1, vPayload2)
     if let error = _swift_js_take_exception() {
         throw error
     }
-    return _BJS_Closure_20BridgeJSRuntimeTestsSi_Si.bridgeJSLift(ret)
+    return JSValue.bridgeJSLiftReturn()
 }
 
-func _$ClosureSupportImports_jsMakeDoubleToDouble(_ base: Double) throws(JSException) -> (Double) -> Double {
-    let baseValue = base.bridgeJSLowerParameter()
-    let ret = bjs_ClosureSupportImports_jsMakeDoubleToDouble_static(baseValue)
-    if let error = _swift_js_take_exception() {
-        throw error
-    }
-    return _BJS_Closure_20BridgeJSRuntimeTestsSd_Sd.bridgeJSLift(ret)
+#if arch(wasm32)
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_jsThrowOrVoid")
+fileprivate func bjs_jsThrowOrVoid_extern(_ shouldThrow: Int32) -> Void
+#else
+fileprivate func bjs_jsThrowOrVoid_extern(_ shouldThrow: Int32) -> Void {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func bjs_jsThrowOrVoid(_ shouldThrow: Int32) -> Void {
+    return bjs_jsThrowOrVoid_extern(shouldThrow)
 }
 
-func _$ClosureSupportImports_jsMakeStringToString(_ prefix: String) throws(JSException) -> (String) -> String {
-    let ret0 = prefix.bridgeJSWithLoweredParameter { (prefixBytes, prefixLength) in
-        let ret = bjs_ClosureSupportImports_jsMakeStringToString_static(prefixBytes, prefixLength)
-        return ret
-    }
-    let ret = ret0
+func _$jsThrowOrVoid(_ shouldThrow: Bool) throws(JSException) -> Void {
+    let shouldThrowValue = shouldThrow.bridgeJSLowerParameter()
+    bjs_jsThrowOrVoid(shouldThrowValue)
     if let error = _swift_js_take_exception() {
         throw error
     }
-    return _BJS_Closure_20BridgeJSRuntimeTestsSS_SS.bridgeJSLift(ret)
 }
 
-func _$ClosureSupportImports_jsCallTwice(_ value: Int, _ callback: JSTypedClosure<(Int) -> Void>) throws(JSException) -> Int {
-    let valueValue = value.bridgeJSLowerParameter()
-    let callbackFuncRef = callback.bridgeJSLowerParameter()
-    let ret = bjs_ClosureSupportImports_jsCallTwice_static(valueValue, callbackFuncRef)
-    if let error = _swift_js_take_exception() {
-        throw error
-    }
-    return Int.bridgeJSLiftReturn(ret)
+#if arch(wasm32)
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_jsThrowOrNumber")
+fileprivate func bjs_jsThrowOrNumber_extern(_ shouldThrow: Int32) -> Float64
+#else
+fileprivate func bjs_jsThrowOrNumber_extern(_ shouldThrow: Int32) -> Float64 {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func bjs_jsThrowOrNumber(_ shouldThrow: Int32) -> Float64 {
+    return bjs_jsThrowOrNumber_extern(shouldThrow)
 }
 
-func _$ClosureSupportImports_jsCallBinary(_ callback: JSTypedClosure<(Int, Int) -> Int>) throws(JSException) -> Int {
-    let callbackFuncRef = callback.bridgeJSLowerParameter()
-    let ret = bjs_ClosureSupportImports_jsCallBinary_static(callbackFuncRef)
+func _$jsThrowOrNumber(_ shouldThrow: Bool) throws(JSException) -> Double {
+    let shouldThrowValue = shouldThrow.bridgeJSLowerParameter()
+    let ret = bjs_jsThrowOrNumber(shouldThrowValue)
     if let error = _swift_js_take_exception() {
         throw error
     }
-    return Int.bridgeJSLiftReturn(ret)
+    return Double.bridgeJSLiftReturn(ret)
 }
 
-func _$ClosureSupportImports_jsCallTriple(_ callback: JSTypedClosure<(Int, Int, Int) -> Int>) throws(JSException) -> Int {
-    let callbackFuncRef = callback.bridgeJSLowerParameter()
-    let ret = bjs_ClosureSupportImports_jsCallTriple_static(callbackFuncRef)
+#if arch(wasm32)
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_jsThrowOrBool")
+fileprivate func bjs_jsThrowOrBool_extern(_ shouldThrow: Int32) -> Int32
+#else
+fileprivate func bjs_jsThrowOrBool_extern(_ shouldThrow: Int32) -> Int32 {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func bjs_jsThrowOrBool(_ shouldThrow: Int32) -> Int32 {
+    return bjs_jsThrowOrBool_extern(shouldThrow)
+}
+
+func _$jsThrowOrBool(_ shouldThrow: Bool) throws(JSException) -> Bool {
+    let shouldThrowValue = shouldThrow.bridgeJSLowerParameter()
+    let ret = bjs_jsThrowOrBool(shouldThrowValue)
     if let error = _swift_js_take_exception() {
         throw error
     }
-    return Int.bridgeJSLiftReturn(ret)
+    return Bool.bridgeJSLiftReturn(ret)
 }
 
-func _$ClosureSupportImports_jsCallAfterRelease(_ callback: JSTypedClosure<() -> Void>) throws(JSException) -> String {
-    let callbackFuncRef = callback.bridgeJSLowerParameter()
-    let ret = bjs_ClosureSupportImports_jsCallAfterRelease_static(callbackFuncRef)
+#if arch(wasm32)
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_jsThrowOrString")
+fileprivate func bjs_jsThrowOrString_extern(_ shouldThrow: Int32) -> Int32
+#else
+fileprivate func bjs_jsThrowOrString_extern(_ shouldThrow: Int32) -> Int32 {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func bjs_jsThrowOrString(_ shouldThrow: Int32) -> Int32 {
+    return bjs_jsThrowOrString_extern(shouldThrow)
+}
+
+func _$jsThrowOrString(_ shouldThrow: Bool) throws(JSException) -> String {
+    let shouldThrowValue = shouldThrow.bridgeJSLowerParameter()
+    let ret = bjs_jsThrowOrString(shouldThrowValue)
     if let error = _swift_js_take_exception() {
         throw error
     }
     return String.bridgeJSLiftReturn(ret)
 }
 
-func _$ClosureSupportImports_jsOptionalInvoke(_ callback: Optional<JSTypedClosure<() -> Bool>>) throws(JSException) -> Bool {
-    let (callbackIsSome, callbackFuncRef) = callback.bridgeJSLowerParameter()
-    let ret = bjs_ClosureSupportImports_jsOptionalInvoke_static(callbackIsSome, callbackFuncRef)
-    if let error = _swift_js_take_exception() {
-        throw error
-    }
-    return Bool.bridgeJSLiftReturn(ret)
+#if arch(wasm32)
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_jsRoundTripFeatureFlag")
+fileprivate func bjs_jsRoundTripFeatureFlag_extern(_ flagBytes: Int32, _ flagLength: Int32) -> Int32
+#else
+fileprivate func bjs_jsRoundTripFeatureFlag_extern(_ flagBytes: Int32, _ flagLength: Int32) -> Int32 {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func bjs_jsRoundTripFeatureFlag(_ flagBytes: Int32, _ flagLength: Int32) -> Int32 {
+    return bjs_jsRoundTripFeatureFlag_extern(flagBytes, flagLength)
 }
 
-func _$ClosureSupportImports_jsStoreClosure(_ callback: JSTypedClosure<() -> Void>) throws(JSException) -> Void {
-    let callbackFuncRef = callback.bridgeJSLowerParameter()
-    bjs_ClosureSupportImports_jsStoreClosure_static(callbackFuncRef)
+func _$jsRoundTripFeatureFlag(_ flag: FeatureFlag) throws(JSException) -> FeatureFlag {
+    let ret0 = flag.bridgeJSWithLoweredParameter { (flagBytes, flagLength) in
+        let ret = bjs_jsRoundTripFeatureFlag(flagBytes, flagLength)
+        return ret
+    }
+    let ret = ret0
     if let error = _swift_js_take_exception() {
         throw error
     }
+    return FeatureFlag.bridgeJSLiftReturn(ret)
 }
 
-func _$ClosureSupportImports_jsCallStoredClosure() throws(JSException) -> Void {
-    bjs_ClosureSupportImports_jsCallStoredClosure_static()
-    if let error = _swift_js_take_exception() {
-        throw error
-    }
+#if arch(wasm32)
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_runAsyncWorks")
+fileprivate func bjs_runAsyncWorks_extern(_ resolveRef: Int32, _ rejectRef: Int32) -> Void
+#else
+fileprivate func bjs_runAsyncWorks_extern(_ resolveRef: Int32, _ rejectRef: Int32) -> Void {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func bjs_runAsyncWorks(_ resolveRef: Int32, _ rejectRef: Int32) -> Void {
+    return bjs_runAsyncWorks_extern(resolveRef, rejectRef)
 }
 
-func _$ClosureSupportImports_jsHeapCount() throws(JSException) -> Int {
-    let ret = bjs_ClosureSupportImports_jsHeapCount_static()
-    if let error = _swift_js_take_exception() {
-        throw error
+func _$runAsyncWorks() async throws(JSException) -> Void {
+    try await _bjs_awaitPromise(makeResolveClosure: {
+            JSTypedClosure<() -> Void>($0)
+        }, makeRejectClosure: {
+            JSTypedClosure<(sending JSValue) -> Void>($0)
+        }) { resolveRef, rejectRef in
+        bjs_runAsyncWorks(resolveRef, rejectRef)
     }
-    return Int.bridgeJSLiftReturn(ret)
 }
 
-func _$ClosureSupportImports_runJsClosureSupportTests() throws(JSException) -> Void {
-    bjs_ClosureSupportImports_runJsClosureSupportTests_static()
-    if let error = _swift_js_take_exception() {
-        throw error
+#if arch(wasm32)
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_fetchWeatherData")
+fileprivate func bjs_fetchWeatherData_extern(_ resolveRef: Int32, _ rejectRef: Int32, _ cityBytes: Int32, _ cityLength: Int32) -> Void
+#else
+fileprivate func bjs_fetchWeatherData_extern(_ resolveRef: Int32, _ rejectRef: Int32, _ cityBytes: Int32, _ cityLength: Int32) -> Void {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func bjs_fetchWeatherData(_ resolveRef: Int32, _ rejectRef: Int32, _ cityBytes: Int32, _ cityLength: Int32) -> Void {
+    return bjs_fetchWeatherData_extern(resolveRef, rejectRef, cityBytes, cityLength)
+}
+
+func _$fetchWeatherData(_ city: String) async throws(JSException) -> WeatherData {
+    let resolved = try await _bjs_awaitPromise(makeResolveClosure: {
+            JSTypedClosure<(sending WeatherData) -> Void>($0)
+        }, makeRejectClosure: {
+            JSTypedClosure<(sending JSValue) -> Void>($0)
+        }) { resolveRef, rejectRef in
+        city.bridgeJSWithLoweredParameter { (cityBytes, cityLength) in
+            bjs_fetchWeatherData(resolveRef, rejectRef, cityBytes, cityLength)
+        }
     }
+    return resolved
 }
 
 #if arch(wasm32)
-@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DefaultArgumentImports_runJsDefaultArgumentTests_static")
-fileprivate func bjs_DefaultArgumentImports_runJsDefaultArgumentTests_static_extern() -> Void
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs__jsWeirdFunction")
+fileprivate func bjs__jsWeirdFunction_extern() -> Float64
 #else
-fileprivate func bjs_DefaultArgumentImports_runJsDefaultArgumentTests_static_extern() -> Void {
+fileprivate func bjs__jsWeirdFunction_extern() -> Float64 {
     fatalError("Only available on WebAssembly")
 }
 #endif
-@inline(never) fileprivate func bjs_DefaultArgumentImports_runJsDefaultArgumentTests_static() -> Void {
-    return bjs_DefaultArgumentImports_runJsDefaultArgumentTests_static_extern()
+@inline(never) fileprivate func bjs__jsWeirdFunction() -> Float64 {
+    return bjs__jsWeirdFunction_extern()
 }
 
-func _$DefaultArgumentImports_runJsDefaultArgumentTests() throws(JSException) -> Void {
-    bjs_DefaultArgumentImports_runJsDefaultArgumentTests_static()
+func _$_jsWeirdFunction() throws(JSException) -> Double {
+    let ret = bjs__jsWeirdFunction()
     if let error = _swift_js_take_exception() {
         throw error
     }
+    return Double.bridgeJSLiftReturn(ret)
 }
 
 #if arch(wasm32)
-@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DictionarySupportImports_jsRoundTripDictionaryInt_static")
-fileprivate func bjs_DictionarySupportImports_jsRoundTripDictionaryInt_static_extern() -> Void
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_parseInt")
+fileprivate func bjs_parseInt_extern(_ stringBytes: Int32, _ stringLength: Int32) -> Float64
 #else
-fileprivate func bjs_DictionarySupportImports_jsRoundTripDictionaryInt_static_extern() -> Void {
+fileprivate func bjs_parseInt_extern(_ stringBytes: Int32, _ stringLength: Int32) -> Float64 {
     fatalError("Only available on WebAssembly")
 }
 #endif
-@inline(never) fileprivate func bjs_DictionarySupportImports_jsRoundTripDictionaryInt_static() -> Void {
-    return bjs_DictionarySupportImports_jsRoundTripDictionaryInt_static_extern()
+@inline(never) fileprivate func bjs_parseInt(_ stringBytes: Int32, _ stringLength: Int32) -> Float64 {
+    return bjs_parseInt_extern(stringBytes, stringLength)
 }
 
-#if arch(wasm32)
-@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DictionarySupportImports_jsRoundTripDictionaryBool_static")
-fileprivate func bjs_DictionarySupportImports_jsRoundTripDictionaryBool_static_extern() -> Void
-#else
-fileprivate func bjs_DictionarySupportImports_jsRoundTripDictionaryBool_static_extern() -> Void {
-    fatalError("Only available on WebAssembly")
-}
-#endif
-@inline(never) fileprivate func bjs_DictionarySupportImports_jsRoundTripDictionaryBool_static() -> Void {
-    return bjs_DictionarySupportImports_jsRoundTripDictionaryBool_static_extern()
+func _$parseInt(_ string: String) throws(JSException) -> Double {
+    let ret0 = string.bridgeJSWithLoweredParameter { (stringBytes, stringLength) in
+        let ret = bjs_parseInt(stringBytes, stringLength)
+        return ret
+    }
+    let ret = ret0
+    if let error = _swift_js_take_exception() {
+        throw error
+    }
+    return Double.bridgeJSLiftReturn(ret)
 }
 
 #if arch(wasm32)
-@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DictionarySupportImports_jsRoundTripDictionaryDouble_static")
-fileprivate func bjs_DictionarySupportImports_jsRoundTripDictionaryDouble_static_extern() -> Void
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_JsGreeter_init")
+fileprivate func bjs_JsGreeter_init_extern(_ nameBytes: Int32, _ nameLength: Int32, _ prefixBytes: Int32, _ prefixLength: Int32) -> Int32
 #else
-fileprivate func bjs_DictionarySupportImports_jsRoundTripDictionaryDouble_static_extern() -> Void {
+fileprivate func bjs_JsGreeter_init_extern(_ nameBytes: Int32, _ nameLength: Int32, _ prefixBytes: Int32, _ prefixLength: Int32) -> Int32 {
     fatalError("Only available on WebAssembly")
 }
 #endif
-@inline(never) fileprivate func bjs_DictionarySupportImports_jsRoundTripDictionaryDouble_static() -> Void {
-    return bjs_DictionarySupportImports_jsRoundTripDictionaryDouble_static_extern()
+@inline(never) fileprivate func bjs_JsGreeter_init(_ nameBytes: Int32, _ nameLength: Int32, _ prefixBytes: Int32, _ prefixLength: Int32) -> Int32 {
+    return bjs_JsGreeter_init_extern(nameBytes, nameLength, prefixBytes, prefixLength)
 }
 
 #if arch(wasm32)
-@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DictionarySupportImports_jsRoundTripDictionaryJSObject_static")
-fileprivate func bjs_DictionarySupportImports_jsRoundTripDictionaryJSObject_static_extern() -> Void
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_JsGreeter_name_get")
+fileprivate func bjs_JsGreeter_name_get_extern(_ self: Int32) -> Int32
 #else
-fileprivate func bjs_DictionarySupportImports_jsRoundTripDictionaryJSObject_static_extern() -> Void {
+fileprivate func bjs_JsGreeter_name_get_extern(_ self: Int32) -> Int32 {
     fatalError("Only available on WebAssembly")
 }
 #endif
-@inline(never) fileprivate func bjs_DictionarySupportImports_jsRoundTripDictionaryJSObject_static() -> Void {
-    return bjs_DictionarySupportImports_jsRoundTripDictionaryJSObject_static_extern()
+@inline(never) fileprivate func bjs_JsGreeter_name_get(_ self: Int32) -> Int32 {
+    return bjs_JsGreeter_name_get_extern(self)
 }
 
 #if arch(wasm32)
-@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DictionarySupportImports_jsRoundTripDictionaryJSValue_static")
-fileprivate func bjs_DictionarySupportImports_jsRoundTripDictionaryJSValue_static_extern() -> Void
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_JsGreeter_prefix_get")
+fileprivate func bjs_JsGreeter_prefix_get_extern(_ self: Int32) -> Int32
 #else
-fileprivate func bjs_DictionarySupportImports_jsRoundTripDictionaryJSValue_static_extern() -> Void {
+fileprivate func bjs_JsGreeter_prefix_get_extern(_ self: Int32) -> Int32 {
     fatalError("Only available on WebAssembly")
 }
 #endif
-@inline(never) fileprivate func bjs_DictionarySupportImports_jsRoundTripDictionaryJSValue_static() -> Void {
-    return bjs_DictionarySupportImports_jsRoundTripDictionaryJSValue_static_extern()
+@inline(never) fileprivate func bjs_JsGreeter_prefix_get(_ self: Int32) -> Int32 {
+    return bjs_JsGreeter_prefix_get_extern(self)
 }
 
 #if arch(wasm32)
-@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DictionarySupportImports_jsRoundTripDictionaryDoubleArray_static")
-fileprivate func bjs_DictionarySupportImports_jsRoundTripDictionaryDoubleArray_static_extern() -> Void
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_JsGreeter_name_set")
+fileprivate func bjs_JsGreeter_name_set_extern(_ self: Int32, _ newValueBytes: Int32, _ newValueLength: Int32) -> Void
 #else
-fileprivate func bjs_DictionarySupportImports_jsRoundTripDictionaryDoubleArray_static_extern() -> Void {
+fileprivate func bjs_JsGreeter_name_set_extern(_ self: Int32, _ newValueBytes: Int32, _ newValueLength: Int32) -> Void {
     fatalError("Only available on WebAssembly")
 }
 #endif
-@inline(never) fileprivate func bjs_DictionarySupportImports_jsRoundTripDictionaryDoubleArray_static() -> Void {
-    return bjs_DictionarySupportImports_jsRoundTripDictionaryDoubleArray_static_extern()
-}
-
-func _$DictionarySupportImports_jsRoundTripDictionaryInt(_ values: [String: Int]) throws(JSException) -> [String: Int] {
-    let _ = values.bridgeJSLowerParameter()
-    bjs_DictionarySupportImports_jsRoundTripDictionaryInt_static()
-    if let error = _swift_js_take_exception() {
-        throw error
-    }
-    return [String: Int].bridgeJSLiftReturn()
-}
-
-func _$DictionarySupportImports_jsRoundTripDictionaryBool(_ values: [String: Bool]) throws(JSException) -> [String: Bool] {
-    let _ = values.bridgeJSLowerParameter()
-    bjs_DictionarySupportImports_jsRoundTripDictionaryBool_static()
-    if let error = _swift_js_take_exception() {
-        throw error
-    }
-    return [String: Bool].bridgeJSLiftReturn()
-}
-
-func _$DictionarySupportImports_jsRoundTripDictionaryDouble(_ values: [String: Double]) throws(JSException) -> [String: Double] {
-    let _ = values.bridgeJSLowerParameter()
-    bjs_DictionarySupportImports_jsRoundTripDictionaryDouble_static()
-    if let error = _swift_js_take_exception() {
-        throw error
-    }
-    return [String: Double].bridgeJSLiftReturn()
-}
-
-func _$DictionarySupportImports_jsRoundTripDictionaryJSObject(_ values: [String: JSObject]) throws(JSException) -> [String: JSObject] {
-    let _ = values.bridgeJSLowerParameter()
-    bjs_DictionarySupportImports_jsRoundTripDictionaryJSObject_static()
-    if let error = _swift_js_take_exception() {
-        throw error
-    }
-    return [String: JSObject].bridgeJSLiftReturn()
-}
-
-func _$DictionarySupportImports_jsRoundTripDictionaryJSValue(_ values: [String: JSValue]) throws(JSException) -> [String: JSValue] {
-    let _ = values.bridgeJSLowerParameter()
-    bjs_DictionarySupportImports_jsRoundTripDictionaryJSValue_static()
-    if let error = _swift_js_take_exception() {
-        throw error
-    }
-    return [String: JSValue].bridgeJSLiftReturn()
-}
-
-func _$DictionarySupportImports_jsRoundTripDictionaryDoubleArray(_ values: [String: [Double]]) throws(JSException) -> [String: [Double]] {
-    let _ = values.bridgeJSLowerParameter()
-    bjs_DictionarySupportImports_jsRoundTripDictionaryDoubleArray_static()
-    if let error = _swift_js_take_exception() {
-        throw error
-    }
-    return [String: [Double]].bridgeJSLiftReturn()
+@inline(never) fileprivate func bjs_JsGreeter_name_set(_ self: Int32, _ newValueBytes: Int32, _ newValueLength: Int32) -> Void {
+    return bjs_JsGreeter_name_set_extern(self, newValueBytes, newValueLength)
 }
 
 #if arch(wasm32)
-@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_Foo_init")
-fileprivate func bjs_Foo_init_extern(_ valueBytes: Int32, _ valueLength: Int32) -> Int32
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_JsGreeter_greet")
+fileprivate func bjs_JsGreeter_greet_extern(_ self: Int32) -> Int32
 #else
-fileprivate func bjs_Foo_init_extern(_ valueBytes: Int32, _ valueLength: Int32) -> Int32 {
+fileprivate func bjs_JsGreeter_greet_extern(_ self: Int32) -> Int32 {
     fatalError("Only available on WebAssembly")
 }
 #endif
-@inline(never) fileprivate func bjs_Foo_init(_ valueBytes: Int32, _ valueLength: Int32) -> Int32 {
-    return bjs_Foo_init_extern(valueBytes, valueLength)
+@inline(never) fileprivate func bjs_JsGreeter_greet(_ self: Int32) -> Int32 {
+    return bjs_JsGreeter_greet_extern(self)
 }
 
 #if arch(wasm32)
-@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_Foo_value_get")
-fileprivate func bjs_Foo_value_get_extern(_ self: Int32) -> Int32
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_JsGreeter_changeName")
+fileprivate func bjs_JsGreeter_changeName_extern(_ self: Int32, _ nameBytes: Int32, _ nameLength: Int32) -> Void
 #else
-fileprivate func bjs_Foo_value_get_extern(_ self: Int32) -> Int32 {
+fileprivate func bjs_JsGreeter_changeName_extern(_ self: Int32, _ nameBytes: Int32, _ nameLength: Int32) -> Void {
     fatalError("Only available on WebAssembly")
 }
 #endif
-@inline(never) fileprivate func bjs_Foo_value_get(_ self: Int32) -> Int32 {
-    return bjs_Foo_value_get_extern(self)
+@inline(never) fileprivate func bjs_JsGreeter_changeName(_ self: Int32, _ nameBytes: Int32, _ nameLength: Int32) -> Void {
+    return bjs_JsGreeter_changeName_extern(self, nameBytes, nameLength)
 }
 
-func _$Foo_init(_ value: String) throws(JSException) -> JSObject {
-    let ret0 = value.bridgeJSWithLoweredParameter { (valueBytes, valueLength) in
-        let ret = bjs_Foo_init(valueBytes, valueLength)
-        return ret
+func _$JsGreeter_init(_ name: String, _ prefix: String) throws(JSException) -> JSObject {
+    let ret0 = name.bridgeJSWithLoweredParameter { (nameBytes, nameLength) in
+        let ret1 = prefix.bridgeJSWithLoweredParameter { (prefixBytes, prefixLength) in
+            let ret = bjs_JsGreeter_init(nameBytes, nameLength, prefixBytes, prefixLength)
+            return ret
+        }
+        return ret1
     }
     let ret = ret0
     if let error = _swift_js_take_exception() {
@@ -12303,635 +17020,618 @@ func _$Foo_init(_ value: String) throws(JSException) -> JSObject {
     return JSObject.bridgeJSLiftReturn(ret)
 }
 
-func _$Foo_value_get(_ self: JSObject) throws(JSException) -> String {
+func _$JsGreeter_name_get(_ self: JSObject) throws(JSException) -> String {
     let selfValue = self.bridgeJSLowerParameter()
-    let ret = bjs_Foo_value_get(selfValue)
+    let ret = bjs_JsGreeter_name_get(selfValue)
     if let error = _swift_js_take_exception() {
         throw error
     }
     return String.bridgeJSLiftReturn(ret)
 }
 
-#if arch(wasm32)
-@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_globalObject1_get")
-fileprivate func bjs_globalObject1_get_extern() -> Void
-#else
-fileprivate func bjs_globalObject1_get_extern() -> Void {
-    fatalError("Only available on WebAssembly")
-}
-#endif
-@inline(never) fileprivate func bjs_globalObject1_get() -> Void {
-    return bjs_globalObject1_get_extern()
-}
-
-func _$globalObject1_get() throws(JSException) -> JSValue {
-    bjs_globalObject1_get()
+func _$JsGreeter_prefix_get(_ self: JSObject) throws(JSException) -> String {
+    let selfValue = self.bridgeJSLowerParameter()
+    let ret = bjs_JsGreeter_prefix_get(selfValue)
     if let error = _swift_js_take_exception() {
         throw error
     }
-    return JSValue.bridgeJSLiftReturn()
-}
-
-#if arch(wasm32)
-@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_jsRoundTripVoid")
-fileprivate func bjs_jsRoundTripVoid_extern() -> Void
-#else
-fileprivate func bjs_jsRoundTripVoid_extern() -> Void {
-    fatalError("Only available on WebAssembly")
-}
-#endif
-@inline(never) fileprivate func bjs_jsRoundTripVoid() -> Void {
-    return bjs_jsRoundTripVoid_extern()
+    return String.bridgeJSLiftReturn(ret)
 }
 
-func _$jsRoundTripVoid() throws(JSException) -> Void {
-    bjs_jsRoundTripVoid()
-    if let error = _swift_js_take_exception() {
-        throw error
+func _$JsGreeter_name_set(_ self: JSObject, _ newValue: String) throws(JSException) -> Void {
+    newValue.bridgeJSWithLoweredParameter { (newValueBytes, newValueLength) in
+        let selfValue = self.bridgeJSLowerParameter()
+        bjs_JsGreeter_name_set(selfValue, newValueBytes, newValueLength)
     }
-}
-
-#if arch(wasm32)
-@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_jsRoundTripNumber")
-fileprivate func bjs_jsRoundTripNumber_extern(_ v: Float64) -> Float64
-#else
-fileprivate func bjs_jsRoundTripNumber_extern(_ v: Float64) -> Float64 {
-    fatalError("Only available on WebAssembly")
-}
-#endif
-@inline(never) fileprivate func bjs_jsRoundTripNumber(_ v: Float64) -> Float64 {
-    return bjs_jsRoundTripNumber_extern(v)
-}
-
-func _$jsRoundTripNumber(_ v: Double) throws(JSException) -> Double {
-    let vValue = v.bridgeJSLowerParameter()
-    let ret = bjs_jsRoundTripNumber(vValue)
     if let error = _swift_js_take_exception() {
         throw error
     }
-    return Double.bridgeJSLiftReturn(ret)
-}
-
-#if arch(wasm32)
-@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_jsRoundTripBool")
-fileprivate func bjs_jsRoundTripBool_extern(_ v: Int32) -> Int32
-#else
-fileprivate func bjs_jsRoundTripBool_extern(_ v: Int32) -> Int32 {
-    fatalError("Only available on WebAssembly")
-}
-#endif
-@inline(never) fileprivate func bjs_jsRoundTripBool(_ v: Int32) -> Int32 {
-    return bjs_jsRoundTripBool_extern(v)
 }
 
-func _$jsRoundTripBool(_ v: Bool) throws(JSException) -> Bool {
-    let vValue = v.bridgeJSLowerParameter()
-    let ret = bjs_jsRoundTripBool(vValue)
+func _$JsGreeter_greet(_ self: JSObject) throws(JSException) -> String {
+    let selfValue = self.bridgeJSLowerParameter()
+    let ret = bjs_JsGreeter_greet(selfValue)
     if let error = _swift_js_take_exception() {
         throw error
     }
-    return Bool.bridgeJSLiftReturn(ret)
-}
-
-#if arch(wasm32)
-@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_jsRoundTripString")
-fileprivate func bjs_jsRoundTripString_extern(_ vBytes: Int32, _ vLength: Int32) -> Int32
-#else
-fileprivate func bjs_jsRoundTripString_extern(_ vBytes: Int32, _ vLength: Int32) -> Int32 {
-    fatalError("Only available on WebAssembly")
-}
-#endif
-@inline(never) fileprivate func bjs_jsRoundTripString(_ vBytes: Int32, _ vLength: Int32) -> Int32 {
-    return bjs_jsRoundTripString_extern(vBytes, vLength)
+    return String.bridgeJSLiftReturn(ret)
 }
 
-func _$jsRoundTripString(_ v: String) throws(JSException) -> String {
-    let ret0 = v.bridgeJSWithLoweredParameter { (vBytes, vLength) in
-        let ret = bjs_jsRoundTripString(vBytes, vLength)
-        return ret
+func _$JsGreeter_changeName(_ self: JSObject, _ name: String) throws(JSException) -> Void {
+    name.bridgeJSWithLoweredParameter { (nameBytes, nameLength) in
+        let selfValue = self.bridgeJSLowerParameter()
+        bjs_JsGreeter_changeName(selfValue, nameBytes, nameLength)
     }
-    let ret = ret0
     if let error = _swift_js_take_exception() {
         throw error
     }
-    return String.bridgeJSLiftReturn(ret)
 }
 
 #if arch(wasm32)
-@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_jsRoundTripJSValue")
-fileprivate func bjs_jsRoundTripJSValue_extern(_ vKind: Int32, _ vPayload1: Int32, _ vPayload2: Float64) -> Void
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_WeatherData_temperature_get")
+fileprivate func bjs_WeatherData_temperature_get_extern(_ self: Int32) -> Float64
 #else
-fileprivate func bjs_jsRoundTripJSValue_extern(_ vKind: Int32, _ vPayload1: Int32, _ vPayload2: Float64) -> Void {
+fileprivate func bjs_WeatherData_temperature_get_extern(_ self: Int32) -> Float64 {
     fatalError("Only available on WebAssembly")
 }
 #endif
-@inline(never) fileprivate func bjs_jsRoundTripJSValue(_ vKind: Int32, _ vPayload1: Int32, _ vPayload2: Float64) -> Void {
-    return bjs_jsRoundTripJSValue_extern(vKind, vPayload1, vPayload2)
-}
-
-func _$jsRoundTripJSValue(_ v: JSValue) throws(JSException) -> JSValue {
-    let (vKind, vPayload1, vPayload2) = v.bridgeJSLowerParameter()
-    bjs_jsRoundTripJSValue(vKind, vPayload1, vPayload2)
-    if let error = _swift_js_take_exception() {
-        throw error
-    }
-    return JSValue.bridgeJSLiftReturn()
+@inline(never) fileprivate func bjs_WeatherData_temperature_get(_ self: Int32) -> Float64 {
+    return bjs_WeatherData_temperature_get_extern(self)
 }
 
 #if arch(wasm32)
-@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_jsThrowOrVoid")
-fileprivate func bjs_jsThrowOrVoid_extern(_ shouldThrow: Int32) -> Void
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_WeatherData_description_get")
+fileprivate func bjs_WeatherData_description_get_extern(_ self: Int32) -> Int32
 #else
-fileprivate func bjs_jsThrowOrVoid_extern(_ shouldThrow: Int32) -> Void {
+fileprivate func bjs_WeatherData_description_get_extern(_ self: Int32) -> Int32 {
     fatalError("Only available on WebAssembly")
 }
 #endif
-@inline(never) fileprivate func bjs_jsThrowOrVoid(_ shouldThrow: Int32) -> Void {
-    return bjs_jsThrowOrVoid_extern(shouldThrow)
-}
-
-func _$jsThrowOrVoid(_ shouldThrow: Bool) throws(JSException) -> Void {
-    let shouldThrowValue = shouldThrow.bridgeJSLowerParameter()
-    bjs_jsThrowOrVoid(shouldThrowValue)
-    if let error = _swift_js_take_exception() {
-        throw error
-    }
+@inline(never) fileprivate func bjs_WeatherData_description_get(_ self: Int32) -> Int32 {
+    return bjs_WeatherData_description_get_extern(self)
 }
 
 #if arch(wasm32)
-@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_jsThrowOrNumber")
-fileprivate func bjs_jsThrowOrNumber_extern(_ shouldThrow: Int32) -> Float64
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_WeatherData_humidity_get")
+fileprivate func bjs_WeatherData_humidity_get_extern(_ self: Int32) -> Float64
 #else
-fileprivate func bjs_jsThrowOrNumber_extern(_ shouldThrow: Int32) -> Float64 {
+fileprivate func bjs_WeatherData_humidity_get_extern(_ self: Int32) -> Float64 {
     fatalError("Only available on WebAssembly")
 }
 #endif
-@inline(never) fileprivate func bjs_jsThrowOrNumber(_ shouldThrow: Int32) -> Float64 {
-    return bjs_jsThrowOrNumber_extern(shouldThrow)
-}
-
-func _$jsThrowOrNumber(_ shouldThrow: Bool) throws(JSException) -> Double {
-    let shouldThrowValue = shouldThrow.bridgeJSLowerParameter()
-    let ret = bjs_jsThrowOrNumber(shouldThrowValue)
-    if let error = _swift_js_take_exception() {
-        throw error
-    }
-    return Double.bridgeJSLiftReturn(ret)
+@inline(never) fileprivate func bjs_WeatherData_humidity_get(_ self: Int32) -> Float64 {
+    return bjs_WeatherData_humidity_get_extern(self)
 }
 
 #if arch(wasm32)
-@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_jsThrowOrBool")
-fileprivate func bjs_jsThrowOrBool_extern(_ shouldThrow: Int32) -> Int32
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_WeatherData_temperature_set")
+fileprivate func bjs_WeatherData_temperature_set_extern(_ self: Int32, _ newValue: Float64) -> Void
 #else
-fileprivate func bjs_jsThrowOrBool_extern(_ shouldThrow: Int32) -> Int32 {
+fileprivate func bjs_WeatherData_temperature_set_extern(_ self: Int32, _ newValue: Float64) -> Void {
     fatalError("Only available on WebAssembly")
 }
 #endif
-@inline(never) fileprivate func bjs_jsThrowOrBool(_ shouldThrow: Int32) -> Int32 {
-    return bjs_jsThrowOrBool_extern(shouldThrow)
+@inline(never) fileprivate func bjs_WeatherData_temperature_set(_ self: Int32, _ newValue: Float64) -> Void {
+    return bjs_WeatherData_temperature_set_extern(self, newValue)
 }
 
-func _$jsThrowOrBool(_ shouldThrow: Bool) throws(JSException) -> Bool {
-    let shouldThrowValue = shouldThrow.bridgeJSLowerParameter()
-    let ret = bjs_jsThrowOrBool(shouldThrowValue)
-    if let error = _swift_js_take_exception() {
-        throw error
-    }
-    return Bool.bridgeJSLiftReturn(ret)
+#if arch(wasm32)
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_WeatherData_description_set")
+fileprivate func bjs_WeatherData_description_set_extern(_ self: Int32, _ newValueBytes: Int32, _ newValueLength: Int32) -> Void
+#else
+fileprivate func bjs_WeatherData_description_set_extern(_ self: Int32, _ newValueBytes: Int32, _ newValueLength: Int32) -> Void {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func bjs_WeatherData_description_set(_ self: Int32, _ newValueBytes: Int32, _ newValueLength: Int32) -> Void {
+    return bjs_WeatherData_description_set_extern(self, newValueBytes, newValueLength)
 }
 
 #if arch(wasm32)
-@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_jsThrowOrString")
-fileprivate func bjs_jsThrowOrString_extern(_ shouldThrow: Int32) -> Int32
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_WeatherData_humidity_set")
+fileprivate func bjs_WeatherData_humidity_set_extern(_ self: Int32, _ newValue: Float64) -> Void
 #else
-fileprivate func bjs_jsThrowOrString_extern(_ shouldThrow: Int32) -> Int32 {
+fileprivate func bjs_WeatherData_humidity_set_extern(_ self: Int32, _ newValue: Float64) -> Void {
     fatalError("Only available on WebAssembly")
 }
 #endif
-@inline(never) fileprivate func bjs_jsThrowOrString(_ shouldThrow: Int32) -> Int32 {
-    return bjs_jsThrowOrString_extern(shouldThrow)
+@inline(never) fileprivate func bjs_WeatherData_humidity_set(_ self: Int32, _ newValue: Float64) -> Void {
+    return bjs_WeatherData_humidity_set_extern(self, newValue)
 }
 
-func _$jsThrowOrString(_ shouldThrow: Bool) throws(JSException) -> String {
-    let shouldThrowValue = shouldThrow.bridgeJSLowerParameter()
-    let ret = bjs_jsThrowOrString(shouldThrowValue)
+func _$WeatherData_temperature_get(_ self: JSObject) throws(JSException) -> Double {
+    let selfValue = self.bridgeJSLowerParameter()
+    let ret = bjs_WeatherData_temperature_get(selfValue)
     if let error = _swift_js_take_exception() {
         throw error
     }
-    return String.bridgeJSLiftReturn(ret)
+    return Double.bridgeJSLiftReturn(ret)
 }
 
-#if arch(wasm32)
-@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_jsRoundTripFeatureFlag")
-fileprivate func bjs_jsRoundTripFeatureFlag_extern(_ flagBytes: Int32, _ flagLength: Int32) -> Int32
-#else
-fileprivate func bjs_jsRoundTripFeatureFlag_extern(_ flagBytes: Int32, _ flagLength: Int32) -> Int32 {
-    fatalError("Only available on WebAssembly")
-}
-#endif
-@inline(never) fileprivate func bjs_jsRoundTripFeatureFlag(_ flagBytes: Int32, _ flagLength: Int32) -> Int32 {
-    return bjs_jsRoundTripFeatureFlag_extern(flagBytes, flagLength)
+func _$WeatherData_description_get(_ self: JSObject) throws(JSException) -> String {
+    let selfValue = self.bridgeJSLowerParameter()
+    let ret = bjs_WeatherData_description_get(selfValue)
+    if let error = _swift_js_take_exception() {
+        throw error
+    }
+    return String.bridgeJSLiftReturn(ret)
 }
 
-func _$jsRoundTripFeatureFlag(_ flag: FeatureFlag) throws(JSException) -> FeatureFlag {
-    let ret0 = flag.bridgeJSWithLoweredParameter { (flagBytes, flagLength) in
-        let ret = bjs_jsRoundTripFeatureFlag(flagBytes, flagLength)
-        return ret
-    }
-    let ret = ret0
+func _$WeatherData_humidity_get(_ self: JSObject) throws(JSException) -> Double {
+    let selfValue = self.bridgeJSLowerParameter()
+    let ret = bjs_WeatherData_humidity_get(selfValue)
     if let error = _swift_js_take_exception() {
         throw error
     }
-    return FeatureFlag.bridgeJSLiftReturn(ret)
+    return Double.bridgeJSLiftReturn(ret)
 }
 
-#if arch(wasm32)
-@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_runAsyncWorks")
-fileprivate func bjs_runAsyncWorks_extern(_ resolveRef: Int32, _ rejectRef: Int32) -> Void
-#else
-fileprivate func bjs_runAsyncWorks_extern(_ resolveRef: Int32, _ rejectRef: Int32) -> Void {
-    fatalError("Only available on WebAssembly")
+func _$WeatherData_temperature_set(_ self: JSObject, _ newValue: Double) throws(JSException) -> Void {
+    let newValueValue = newValue.bridgeJSLowerParameter()
+    let selfValue = self.bridgeJSLowerParameter()
+    bjs_WeatherData_temperature_set(selfValue, newValueValue)
+    if let error = _swift_js_take_exception() {
+        throw error
+    }
 }
-#endif
-@inline(never) fileprivate func bjs_runAsyncWorks(_ resolveRef: Int32, _ rejectRef: Int32) -> Void {
-    return bjs_runAsyncWorks_extern(resolveRef, rejectRef)
+
+func _$WeatherData_description_set(_ self: JSObject, _ newValue: String) throws(JSException) -> Void {
+    newValue.bridgeJSWithLoweredParameter { (newValueBytes, newValueLength) in
+        let selfValue = self.bridgeJSLowerParameter()
+        bjs_WeatherData_description_set(selfValue, newValueBytes, newValueLength)
+    }
+    if let error = _swift_js_take_exception() {
+        throw error
+    }
 }
 
-func _$runAsyncWorks() async throws(JSException) -> Void {
-    try await _bjs_awaitPromise(makeResolveClosure: {
-            JSTypedClosure<() -> Void>($0)
-        }, makeRejectClosure: {
-            JSTypedClosure<(sending JSValue) -> Void>($0)
-        }) { resolveRef, rejectRef in
-        bjs_runAsyncWorks(resolveRef, rejectRef)
+func _$WeatherData_humidity_set(_ self: JSObject, _ newValue: Double) throws(JSException) -> Void {
+    let newValueValue = newValue.bridgeJSLowerParameter()
+    let selfValue = self.bridgeJSLowerParameter()
+    bjs_WeatherData_humidity_set(selfValue, newValueValue)
+    if let error = _swift_js_take_exception() {
+        throw error
     }
 }
 
 #if arch(wasm32)
-@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_fetchWeatherData")
-fileprivate func bjs_fetchWeatherData_extern(_ resolveRef: Int32, _ rejectRef: Int32, _ cityBytes: Int32, _ cityLength: Int32) -> Void
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs__WeirdClass_init")
+fileprivate func bjs__WeirdClass_init_extern() -> Int32
 #else
-fileprivate func bjs_fetchWeatherData_extern(_ resolveRef: Int32, _ rejectRef: Int32, _ cityBytes: Int32, _ cityLength: Int32) -> Void {
+fileprivate func bjs__WeirdClass_init_extern() -> Int32 {
     fatalError("Only available on WebAssembly")
 }
 #endif
-@inline(never) fileprivate func bjs_fetchWeatherData(_ resolveRef: Int32, _ rejectRef: Int32, _ cityBytes: Int32, _ cityLength: Int32) -> Void {
-    return bjs_fetchWeatherData_extern(resolveRef, rejectRef, cityBytes, cityLength)
-}
-
-func _$fetchWeatherData(_ city: String) async throws(JSException) -> WeatherData {
-    let resolved = try await _bjs_awaitPromise(makeResolveClosure: {
-            JSTypedClosure<(sending WeatherData) -> Void>($0)
-        }, makeRejectClosure: {
-            JSTypedClosure<(sending JSValue) -> Void>($0)
-        }) { resolveRef, rejectRef in
-        city.bridgeJSWithLoweredParameter { (cityBytes, cityLength) in
-            bjs_fetchWeatherData(resolveRef, rejectRef, cityBytes, cityLength)
-        }
-    }
-    return resolved
+@inline(never) fileprivate func bjs__WeirdClass_init() -> Int32 {
+    return bjs__WeirdClass_init_extern()
 }
 
 #if arch(wasm32)
-@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs__jsWeirdFunction")
-fileprivate func bjs__jsWeirdFunction_extern() -> Float64
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs__WeirdClass_method_with_dashes")
+fileprivate func bjs__WeirdClass_method_with_dashes_extern(_ self: Int32) -> Int32
 #else
-fileprivate func bjs__jsWeirdFunction_extern() -> Float64 {
+fileprivate func bjs__WeirdClass_method_with_dashes_extern(_ self: Int32) -> Int32 {
     fatalError("Only available on WebAssembly")
 }
 #endif
-@inline(never) fileprivate func bjs__jsWeirdFunction() -> Float64 {
-    return bjs__jsWeirdFunction_extern()
+@inline(never) fileprivate func bjs__WeirdClass_method_with_dashes(_ self: Int32) -> Int32 {
+    return bjs__WeirdClass_method_with_dashes_extern(self)
 }
 
-func _$_jsWeirdFunction() throws(JSException) -> Double {
-    let ret = bjs__jsWeirdFunction()
+func _$_WeirdClass_init() throws(JSException) -> JSObject {
+    let ret = bjs__WeirdClass_init()
     if let error = _swift_js_take_exception() {
         throw error
     }
-    return Double.bridgeJSLiftReturn(ret)
-}
-
-#if arch(wasm32)
-@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_parseInt")
-fileprivate func bjs_parseInt_extern(_ stringBytes: Int32, _ stringLength: Int32) -> Float64
-#else
-fileprivate func bjs_parseInt_extern(_ stringBytes: Int32, _ stringLength: Int32) -> Float64 {
-    fatalError("Only available on WebAssembly")
-}
-#endif
-@inline(never) fileprivate func bjs_parseInt(_ stringBytes: Int32, _ stringLength: Int32) -> Float64 {
-    return bjs_parseInt_extern(stringBytes, stringLength)
+    return JSObject.bridgeJSLiftReturn(ret)
 }
 
-func _$parseInt(_ string: String) throws(JSException) -> Double {
-    let ret0 = string.bridgeJSWithLoweredParameter { (stringBytes, stringLength) in
-        let ret = bjs_parseInt(stringBytes, stringLength)
-        return ret
-    }
-    let ret = ret0
+func _$_WeirdClass_method_with_dashes(_ self: JSObject) throws(JSException) -> String {
+    let selfValue = self.bridgeJSLowerParameter()
+    let ret = bjs__WeirdClass_method_with_dashes(selfValue)
     if let error = _swift_js_take_exception() {
         throw error
     }
-    return Double.bridgeJSLiftReturn(ret)
+    return String.bridgeJSLiftReturn(ret)
 }
 
 #if arch(wasm32)
-@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_JsGreeter_init")
-fileprivate func bjs_JsGreeter_init_extern(_ nameBytes: Int32, _ nameLength: Int32, _ prefixBytes: Int32, _ prefixLength: Int32) -> Int32
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_StaticBox_init")
+fileprivate func bjs_StaticBox_init_extern(_ value: Float64) -> Int32
 #else
-fileprivate func bjs_JsGreeter_init_extern(_ nameBytes: Int32, _ nameLength: Int32, _ prefixBytes: Int32, _ prefixLength: Int32) -> Int32 {
+fileprivate func bjs_StaticBox_init_extern(_ value: Float64) -> Int32 {
     fatalError("Only available on WebAssembly")
 }
 #endif
-@inline(never) fileprivate func bjs_JsGreeter_init(_ nameBytes: Int32, _ nameLength: Int32, _ prefixBytes: Int32, _ prefixLength: Int32) -> Int32 {
-    return bjs_JsGreeter_init_extern(nameBytes, nameLength, prefixBytes, prefixLength)
+@inline(never) fileprivate func bjs_StaticBox_init(_ value: Float64) -> Int32 {
+    return bjs_StaticBox_init_extern(value)
 }
 
 #if arch(wasm32)
-@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_JsGreeter_name_get")
-fileprivate func bjs_JsGreeter_name_get_extern(_ self: Int32) -> Int32
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_StaticBox_create_static")
+fileprivate func bjs_StaticBox_create_static_extern(_ value: Float64) -> Int32
 #else
-fileprivate func bjs_JsGreeter_name_get_extern(_ self: Int32) -> Int32 {
+fileprivate func bjs_StaticBox_create_static_extern(_ value: Float64) -> Int32 {
     fatalError("Only available on WebAssembly")
 }
 #endif
-@inline(never) fileprivate func bjs_JsGreeter_name_get(_ self: Int32) -> Int32 {
-    return bjs_JsGreeter_name_get_extern(self)
+@inline(never) fileprivate func bjs_StaticBox_create_static(_ value: Float64) -> Int32 {
+    return bjs_StaticBox_create_static_extern(value)
 }
 
-#if arch(wasm32)
-@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_JsGreeter_prefix_get")
-fileprivate func bjs_JsGreeter_prefix_get_extern(_ self: Int32) -> Int32
+#if arch(wasm32)
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_StaticBox_value_static")
+fileprivate func bjs_StaticBox_value_static_extern() -> Float64
 #else
-fileprivate func bjs_JsGreeter_prefix_get_extern(_ self: Int32) -> Int32 {
+fileprivate func bjs_StaticBox_value_static_extern() -> Float64 {
     fatalError("Only available on WebAssembly")
 }
 #endif
-@inline(never) fileprivate func bjs_JsGreeter_prefix_get(_ self: Int32) -> Int32 {
-    return bjs_JsGreeter_prefix_get_extern(self)
+@inline(never) fileprivate func bjs_StaticBox_value_static() -> Float64 {
+    return bjs_StaticBox_value_static_extern()
 }
 
 #if arch(wasm32)
-@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_JsGreeter_name_set")
-fileprivate func bjs_JsGreeter_name_set_extern(_ self: Int32, _ newValueBytes: Int32, _ newValueLength: Int32) -> Void
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_StaticBox_makeDefault_static")
+fileprivate func bjs_StaticBox_makeDefault_static_extern() -> Int32
 #else
-fileprivate func bjs_JsGreeter_name_set_extern(_ self: Int32, _ newValueBytes: Int32, _ newValueLength: Int32) -> Void {
+fileprivate func bjs_StaticBox_makeDefault_static_extern() -> Int32 {
     fatalError("Only available on WebAssembly")
 }
 #endif
-@inline(never) fileprivate func bjs_JsGreeter_name_set(_ self: Int32, _ newValueBytes: Int32, _ newValueLength: Int32) -> Void {
-    return bjs_JsGreeter_name_set_extern(self, newValueBytes, newValueLength)
+@inline(never) fileprivate func bjs_StaticBox_makeDefault_static() -> Int32 {
+    return bjs_StaticBox_makeDefault_static_extern()
 }
 
 #if arch(wasm32)
-@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_JsGreeter_greet")
-fileprivate func bjs_JsGreeter_greet_extern(_ self: Int32) -> Int32
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_StaticBox_with_dashes_static")
+fileprivate func bjs_StaticBox_with_dashes_static_extern() -> Int32
 #else
-fileprivate func bjs_JsGreeter_greet_extern(_ self: Int32) -> Int32 {
+fileprivate func bjs_StaticBox_with_dashes_static_extern() -> Int32 {
     fatalError("Only available on WebAssembly")
 }
 #endif
-@inline(never) fileprivate func bjs_JsGreeter_greet(_ self: Int32) -> Int32 {
-    return bjs_JsGreeter_greet_extern(self)
+@inline(never) fileprivate func bjs_StaticBox_with_dashes_static() -> Int32 {
+    return bjs_StaticBox_with_dashes_static_extern()
 }
 
 #if arch(wasm32)
-@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_JsGreeter_changeName")
-fileprivate func bjs_JsGreeter_changeName_extern(_ self: Int32, _ nameBytes: Int32, _ nameLength: Int32) -> Void
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_StaticBox_value")
+fileprivate func bjs_StaticBox_value_extern(_ self: Int32) -> Float64
 #else
-fileprivate func bjs_JsGreeter_changeName_extern(_ self: Int32, _ nameBytes: Int32, _ nameLength: Int32) -> Void {
+fileprivate func bjs_StaticBox_value_extern(_ self: Int32) -> Float64 {
     fatalError("Only available on WebAssembly")
 }
 #endif
-@inline(never) fileprivate func bjs_JsGreeter_changeName(_ self: Int32, _ nameBytes: Int32, _ nameLength: Int32) -> Void {
-    return bjs_JsGreeter_changeName_extern(self, nameBytes, nameLength)
+@inline(never) fileprivate func bjs_StaticBox_value(_ self: Int32) -> Float64 {
+    return bjs_StaticBox_value_extern(self)
 }
 
-func _$JsGreeter_init(_ name: String, _ prefix: String) throws(JSException) -> JSObject {
-    let ret0 = name.bridgeJSWithLoweredParameter { (nameBytes, nameLength) in
-        let ret1 = prefix.bridgeJSWithLoweredParameter { (prefixBytes, prefixLength) in
-            let ret = bjs_JsGreeter_init(nameBytes, nameLength, prefixBytes, prefixLength)
-            return ret
-        }
-        return ret1
-    }
-    let ret = ret0
+func _$StaticBox_init(_ value: Double) throws(JSException) -> JSObject {
+    let valueValue = value.bridgeJSLowerParameter()
+    let ret = bjs_StaticBox_init(valueValue)
     if let error = _swift_js_take_exception() {
         throw error
     }
     return JSObject.bridgeJSLiftReturn(ret)
 }
 
-func _$JsGreeter_name_get(_ self: JSObject) throws(JSException) -> String {
-    let selfValue = self.bridgeJSLowerParameter()
-    let ret = bjs_JsGreeter_name_get(selfValue)
+func _$StaticBox_create(_ value: Double) throws(JSException) -> StaticBox {
+    let valueValue = value.bridgeJSLowerParameter()
+    let ret = bjs_StaticBox_create_static(valueValue)
     if let error = _swift_js_take_exception() {
         throw error
     }
-    return String.bridgeJSLiftReturn(ret)
+    return StaticBox.bridgeJSLiftReturn(ret)
 }
 
-func _$JsGreeter_prefix_get(_ self: JSObject) throws(JSException) -> String {
-    let selfValue = self.bridgeJSLowerParameter()
-    let ret = bjs_JsGreeter_prefix_get(selfValue)
+func _$StaticBox_value() throws(JSException) -> Double {
+    let ret = bjs_StaticBox_value_static()
     if let error = _swift_js_take_exception() {
         throw error
     }
-    return String.bridgeJSLiftReturn(ret)
+    return Double.bridgeJSLiftReturn(ret)
 }
 
-func _$JsGreeter_name_set(_ self: JSObject, _ newValue: String) throws(JSException) -> Void {
-    let selfValue = self.bridgeJSLowerParameter()
-    newValue.bridgeJSWithLoweredParameter { (newValueBytes, newValueLength) in
-        bjs_JsGreeter_name_set(selfValue, newValueBytes, newValueLength)
-    }
+func _$StaticBox_makeDefault() throws(JSException) -> StaticBox {
+    let ret = bjs_StaticBox_makeDefault_static()
     if let error = _swift_js_take_exception() {
         throw error
     }
+    return StaticBox.bridgeJSLiftReturn(ret)
 }
 
-func _$JsGreeter_greet(_ self: JSObject) throws(JSException) -> String {
-    let selfValue = self.bridgeJSLowerParameter()
-    let ret = bjs_JsGreeter_greet(selfValue)
+func _$StaticBox_with_dashes() throws(JSException) -> StaticBox {
+    let ret = bjs_StaticBox_with_dashes_static()
     if let error = _swift_js_take_exception() {
         throw error
     }
-    return String.bridgeJSLiftReturn(ret)
+    return StaticBox.bridgeJSLiftReturn(ret)
 }
 
-func _$JsGreeter_changeName(_ self: JSObject, _ name: String) throws(JSException) -> Void {
+func _$StaticBox_value(_ self: JSObject) throws(JSException) -> Double {
     let selfValue = self.bridgeJSLowerParameter()
-    name.bridgeJSWithLoweredParameter { (nameBytes, nameLength) in
-        bjs_JsGreeter_changeName(selfValue, nameBytes, nameLength)
-    }
+    let ret = bjs_StaticBox_value(selfValue)
     if let error = _swift_js_take_exception() {
         throw error
     }
+    return Double.bridgeJSLiftReturn(ret)
 }
 
 #if arch(wasm32)
-@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_WeatherData_temperature_get")
-fileprivate func bjs_WeatherData_temperature_get_extern(_ self: Int32) -> Float64
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_Animal_init")
+fileprivate func bjs_Animal_init_extern(_ nameBytes: Int32, _ nameLength: Int32, _ age: Float64, _ isCat: Int32) -> Int32
 #else
-fileprivate func bjs_WeatherData_temperature_get_extern(_ self: Int32) -> Float64 {
+fileprivate func bjs_Animal_init_extern(_ nameBytes: Int32, _ nameLength: Int32, _ age: Float64, _ isCat: Int32) -> Int32 {
     fatalError("Only available on WebAssembly")
 }
 #endif
-@inline(never) fileprivate func bjs_WeatherData_temperature_get(_ self: Int32) -> Float64 {
-    return bjs_WeatherData_temperature_get_extern(self)
+@inline(never) fileprivate func bjs_Animal_init(_ nameBytes: Int32, _ nameLength: Int32, _ age: Float64, _ isCat: Int32) -> Int32 {
+    return bjs_Animal_init_extern(nameBytes, nameLength, age, isCat)
 }
 
 #if arch(wasm32)
-@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_WeatherData_description_get")
-fileprivate func bjs_WeatherData_description_get_extern(_ self: Int32) -> Int32
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_Animal_name_get")
+fileprivate func bjs_Animal_name_get_extern(_ self: Int32) -> Int32
 #else
-fileprivate func bjs_WeatherData_description_get_extern(_ self: Int32) -> Int32 {
+fileprivate func bjs_Animal_name_get_extern(_ self: Int32) -> Int32 {
     fatalError("Only available on WebAssembly")
 }
 #endif
-@inline(never) fileprivate func bjs_WeatherData_description_get(_ self: Int32) -> Int32 {
-    return bjs_WeatherData_description_get_extern(self)
+@inline(never) fileprivate func bjs_Animal_name_get(_ self: Int32) -> Int32 {
+    return bjs_Animal_name_get_extern(self)
 }
 
 #if arch(wasm32)
-@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_WeatherData_humidity_get")
-fileprivate func bjs_WeatherData_humidity_get_extern(_ self: Int32) -> Float64
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_Animal_age_get")
+fileprivate func bjs_Animal_age_get_extern(_ self: Int32) -> Float64
 #else
-fileprivate func bjs_WeatherData_humidity_get_extern(_ self: Int32) -> Float64 {
+fileprivate func bjs_Animal_age_get_extern(_ self: Int32) -> Float64 {
     fatalError("Only available on WebAssembly")
 }
 #endif
-@inline(never) fileprivate func bjs_WeatherData_humidity_get(_ self: Int32) -> Float64 {
-    return bjs_WeatherData_humidity_get_extern(self)
+@inline(never) fileprivate func bjs_Animal_age_get(_ self: Int32) -> Float64 {
+    return bjs_Animal_age_get_extern(self)
 }
 
 #if arch(wasm32)
-@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_WeatherData_temperature_set")
-fileprivate func bjs_WeatherData_temperature_set_extern(_ self: Int32, _ newValue: Float64) -> Void
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_Animal_isCat_get")
+fileprivate func bjs_Animal_isCat_get_extern(_ self: Int32) -> Int32
 #else
-fileprivate func bjs_WeatherData_temperature_set_extern(_ self: Int32, _ newValue: Float64) -> Void {
+fileprivate func bjs_Animal_isCat_get_extern(_ self: Int32) -> Int32 {
     fatalError("Only available on WebAssembly")
 }
 #endif
-@inline(never) fileprivate func bjs_WeatherData_temperature_set(_ self: Int32, _ newValue: Float64) -> Void {
-    return bjs_WeatherData_temperature_set_extern(self, newValue)
+@inline(never) fileprivate func bjs_Animal_isCat_get(_ self: Int32) -> Int32 {
+    return bjs_Animal_isCat_get_extern(self)
 }
 
 #if arch(wasm32)
-@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_WeatherData_description_set")
-fileprivate func bjs_WeatherData_description_set_extern(_ self: Int32, _ newValueBytes: Int32, _ newValueLength: Int32) -> Void
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_Animal_name_set")
+fileprivate func bjs_Animal_name_set_extern(_ self: Int32, _ newValueBytes: Int32, _ newValueLength: Int32) -> Void
 #else
-fileprivate func bjs_WeatherData_description_set_extern(_ self: Int32, _ newValueBytes: Int32, _ newValueLength: Int32) -> Void {
+fileprivate func bjs_Animal_name_set_extern(_ self: Int32, _ newValueBytes: Int32, _ newValueLength: Int32) -> Void {
     fatalError("Only available on WebAssembly")
 }
 #endif
-@inline(never) fileprivate func bjs_WeatherData_description_set(_ self: Int32, _ newValueBytes: Int32, _ newValueLength: Int32) -> Void {
-    return bjs_WeatherData_description_set_extern(self, newValueBytes, newValueLength)
+@inline(never) fileprivate func bjs_Animal_name_set(_ self: Int32, _ newValueBytes: Int32, _ newValueLength: Int32) -> Void {
+    return bjs_Animal_name_set_extern(self, newValueBytes, newValueLength)
 }
 
 #if arch(wasm32)
-@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_WeatherData_humidity_set")
-fileprivate func bjs_WeatherData_humidity_set_extern(_ self: Int32, _ newValue: Float64) -> Void
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_Animal_age_set")
+fileprivate func bjs_Animal_age_set_extern(_ self: Int32, _ newValue: Float64) -> Void
 #else
-fileprivate func bjs_WeatherData_humidity_set_extern(_ self: Int32, _ newValue: Float64) -> Void {
+fileprivate func bjs_Animal_age_set_extern(_ self: Int32, _ newValue: Float64) -> Void {
     fatalError("Only available on WebAssembly")
 }
 #endif
-@inline(never) fileprivate func bjs_WeatherData_humidity_set(_ self: Int32, _ newValue: Float64) -> Void {
-    return bjs_WeatherData_humidity_set_extern(self, newValue)
+@inline(never) fileprivate func bjs_Animal_age_set(_ self: Int32, _ newValue: Float64) -> Void {
+    return bjs_Animal_age_set_extern(self, newValue)
 }
 
-func _$WeatherData_temperature_get(_ self: JSObject) throws(JSException) -> Double {
-    let selfValue = self.bridgeJSLowerParameter()
-    let ret = bjs_WeatherData_temperature_get(selfValue)
+#if arch(wasm32)
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_Animal_isCat_set")
+fileprivate func bjs_Animal_isCat_set_extern(_ self: Int32, _ newValue: Int32) -> Void
+#else
+fileprivate func bjs_Animal_isCat_set_extern(_ self: Int32, _ newValue: Int32) -> Void {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func bjs_Animal_isCat_set(_ self: Int32, _ newValue: Int32) -> Void {
+    return bjs_Animal_isCat_set_extern(self, newValue)
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_Animal_bark")
+fileprivate func bjs_Animal_bark_extern(_ self: Int32) -> Int32
+#else
+fileprivate func bjs_Animal_bark_extern(_ self: Int32) -> Int32 {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func bjs_Animal_bark(_ self: Int32) -> Int32 {
+    return bjs_Animal_bark_extern(self)
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_Animal_getIsCat")
+fileprivate func bjs_Animal_getIsCat_extern(_ self: Int32) -> Int32
+#else
+fileprivate func bjs_Animal_getIsCat_extern(_ self: Int32) -> Int32 {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func bjs_Animal_getIsCat(_ self: Int32) -> Int32 {
+    return bjs_Animal_getIsCat_extern(self)
+}
+
+func _$Animal_init(_ name: String, _ age: Double, _ isCat: Bool) throws(JSException) -> JSObject {
+    let ret0 = name.bridgeJSWithLoweredParameter { (nameBytes, nameLength) in
+        let isCatValue = isCat.bridgeJSLowerParameter()
+        let ageValue = age.bridgeJSLowerParameter()
+        let ret = bjs_Animal_init(nameBytes, nameLength, ageValue, isCatValue)
+        return ret
+    }
+    let ret = ret0
     if let error = _swift_js_take_exception() {
         throw error
     }
-    return Double.bridgeJSLiftReturn(ret)
+    return JSObject.bridgeJSLiftReturn(ret)
 }
 
-func _$WeatherData_description_get(_ self: JSObject) throws(JSException) -> String {
+func _$Animal_name_get(_ self: JSObject) throws(JSException) -> String {
     let selfValue = self.bridgeJSLowerParameter()
-    let ret = bjs_WeatherData_description_get(selfValue)
+    let ret = bjs_Animal_name_get(selfValue)
     if let error = _swift_js_take_exception() {
         throw error
     }
     return String.bridgeJSLiftReturn(ret)
 }
 
-func _$WeatherData_humidity_get(_ self: JSObject) throws(JSException) -> Double {
+func _$Animal_age_get(_ self: JSObject) throws(JSException) -> Double {
     let selfValue = self.bridgeJSLowerParameter()
-    let ret = bjs_WeatherData_humidity_get(selfValue)
+    let ret = bjs_Animal_age_get(selfValue)
     if let error = _swift_js_take_exception() {
         throw error
     }
     return Double.bridgeJSLiftReturn(ret)
 }
 
-func _$WeatherData_temperature_set(_ self: JSObject, _ newValue: Double) throws(JSException) -> Void {
+func _$Animal_isCat_get(_ self: JSObject) throws(JSException) -> Bool {
+    let selfValue = self.bridgeJSLowerParameter()
+    let ret = bjs_Animal_isCat_get(selfValue)
+    if let error = _swift_js_take_exception() {
+        throw error
+    }
+    return Bool.bridgeJSLiftReturn(ret)
+}
+
+func _$Animal_name_set(_ self: JSObject, _ newValue: String) throws(JSException) -> Void {
+    newValue.bridgeJSWithLoweredParameter { (newValueBytes, newValueLength) in
+        let selfValue = self.bridgeJSLowerParameter()
+        bjs_Animal_name_set(selfValue, newValueBytes, newValueLength)
+    }
+    if let error = _swift_js_take_exception() {
+        throw error
+    }
+}
+
+func _$Animal_age_set(_ self: JSObject, _ newValue: Double) throws(JSException) -> Void {
+    let newValueValue = newValue.bridgeJSLowerParameter()
     let selfValue = self.bridgeJSLowerParameter()
+    bjs_Animal_age_set(selfValue, newValueValue)
+    if let error = _swift_js_take_exception() {
+        throw error
+    }
+}
+
+func _$Animal_isCat_set(_ self: JSObject, _ newValue: Bool) throws(JSException) -> Void {
     let newValueValue = newValue.bridgeJSLowerParameter()
-    bjs_WeatherData_temperature_set(selfValue, newValueValue)
+    let selfValue = self.bridgeJSLowerParameter()
+    bjs_Animal_isCat_set(selfValue, newValueValue)
     if let error = _swift_js_take_exception() {
         throw error
     }
 }
 
-func _$WeatherData_description_set(_ self: JSObject, _ newValue: String) throws(JSException) -> Void {
+func _$Animal_bark(_ self: JSObject) throws(JSException) -> String {
     let selfValue = self.bridgeJSLowerParameter()
-    newValue.bridgeJSWithLoweredParameter { (newValueBytes, newValueLength) in
-        bjs_WeatherData_description_set(selfValue, newValueBytes, newValueLength)
+    let ret = bjs_Animal_bark(selfValue)
+    if let error = _swift_js_take_exception() {
+        throw error
     }
+    return String.bridgeJSLiftReturn(ret)
+}
+
+func _$Animal_getIsCat(_ self: JSObject) throws(JSException) -> Bool {
+    let selfValue = self.bridgeJSLowerParameter()
+    let ret = bjs_Animal_getIsCat(selfValue)
     if let error = _swift_js_take_exception() {
         throw error
     }
+    return Bool.bridgeJSLiftReturn(ret)
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_jsRoundTripLightColor")
+fileprivate func bjs_jsRoundTripLightColor_extern(_ value: Int32) -> Int32
+#else
+fileprivate func bjs_jsRoundTripLightColor_extern(_ value: Int32) -> Int32 {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func bjs_jsRoundTripLightColor(_ value: Int32) -> Int32 {
+    return bjs_jsRoundTripLightColor_extern(value)
 }
 
-func _$WeatherData_humidity_set(_ self: JSObject, _ newValue: Double) throws(JSException) -> Void {
-    let selfValue = self.bridgeJSLowerParameter()
-    let newValueValue = newValue.bridgeJSLowerParameter()
-    bjs_WeatherData_humidity_set(selfValue, newValueValue)
+func _$jsRoundTripLightColor(_ value: LightColor) throws(JSException) -> LightColor {
+    let valueValue = value.bridgeJSLowerParameter()
+    let ret = bjs_jsRoundTripLightColor(valueValue)
     if let error = _swift_js_take_exception() {
         throw error
     }
+    return LightColor.bridgeJSLiftReturn(ret)
 }
 
 #if arch(wasm32)
-@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs__WeirdClass_init")
-fileprivate func bjs__WeirdClass_init_extern() -> Int32
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_jsRoundTripImportedPayloadSignal")
+fileprivate func bjs_jsRoundTripImportedPayloadSignal_extern(_ value: Int32) -> Int32
 #else
-fileprivate func bjs__WeirdClass_init_extern() -> Int32 {
+fileprivate func bjs_jsRoundTripImportedPayloadSignal_extern(_ value: Int32) -> Int32 {
     fatalError("Only available on WebAssembly")
 }
 #endif
-@inline(never) fileprivate func bjs__WeirdClass_init() -> Int32 {
-    return bjs__WeirdClass_init_extern()
+@inline(never) fileprivate func bjs_jsRoundTripImportedPayloadSignal(_ value: Int32) -> Int32 {
+    return bjs_jsRoundTripImportedPayloadSignal_extern(value)
+}
+
+func _$jsRoundTripImportedPayloadSignal(_ value: ImportedPayloadSignal) throws(JSException) -> ImportedPayloadSignal {
+    let valueCaseId = value.bridgeJSLowerParameter()
+    let ret = bjs_jsRoundTripImportedPayloadSignal(valueCaseId)
+    if let error = _swift_js_take_exception() {
+        throw error
+    }
+    return ImportedPayloadSignal.bridgeJSLiftReturn(ret)
 }
 
 #if arch(wasm32)
-@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs__WeirdClass_method_with_dashes")
-fileprivate func bjs__WeirdClass_method_with_dashes_extern(_ self: Int32) -> Int32
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_jsRoundTripOptionalImportedPayloadSignal")
+fileprivate func bjs_jsRoundTripOptionalImportedPayloadSignal_extern(_ valueIsSome: Int32, _ valueCaseId: Int32) -> Int32
 #else
-fileprivate func bjs__WeirdClass_method_with_dashes_extern(_ self: Int32) -> Int32 {
+fileprivate func bjs_jsRoundTripOptionalImportedPayloadSignal_extern(_ valueIsSome: Int32, _ valueCaseId: Int32) -> Int32 {
     fatalError("Only available on WebAssembly")
 }
 #endif
-@inline(never) fileprivate func bjs__WeirdClass_method_with_dashes(_ self: Int32) -> Int32 {
-    return bjs__WeirdClass_method_with_dashes_extern(self)
+@inline(never) fileprivate func bjs_jsRoundTripOptionalImportedPayloadSignal(_ valueIsSome: Int32, _ valueCaseId: Int32) -> Int32 {
+    return bjs_jsRoundTripOptionalImportedPayloadSignal_extern(valueIsSome, valueCaseId)
 }
 
-func _$_WeirdClass_init() throws(JSException) -> JSObject {
-    let ret = bjs__WeirdClass_init()
+func _$jsRoundTripOptionalImportedPayloadSignal(_ value: Optional<ImportedPayloadSignal>) throws(JSException) -> Optional<ImportedPayloadSignal> {
+    let (valueIsSome, valueCaseId) = value.bridgeJSLowerParameter()
+    let ret = bjs_jsRoundTripOptionalImportedPayloadSignal(valueIsSome, valueCaseId)
     if let error = _swift_js_take_exception() {
         throw error
     }
-    return JSObject.bridgeJSLiftReturn(ret)
+    return Optional<ImportedPayloadSignal>.bridgeJSLiftReturn(ret)
 }
 
-func _$_WeirdClass_method_with_dashes(_ self: JSObject) throws(JSException) -> String {
-    let selfValue = self.bridgeJSLowerParameter()
-    let ret = bjs__WeirdClass_method_with_dashes(selfValue)
+#if arch(wasm32)
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_jsJoinOptionalArrayThenArray")
+fileprivate func bjs_jsJoinOptionalArrayThenArray_extern() -> Int32
+#else
+fileprivate func bjs_jsJoinOptionalArrayThenArray_extern() -> Int32 {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func bjs_jsJoinOptionalArrayThenArray() -> Int32 {
+    return bjs_jsJoinOptionalArrayThenArray_extern()
+}
+
+func _$jsJoinOptionalArrayThenArray(_ a: Optional<[Int]>, _ b: [Int]) throws(JSException) -> String {
+    let _ = b.bridgeJSLowerParameter()
+    let _ = a.bridgeJSLowerParameter()
+    let ret = bjs_jsJoinOptionalArrayThenArray()
     if let error = _swift_js_take_exception() {
         throw error
     }
@@ -12939,344 +17639,457 @@ func _$_WeirdClass_method_with_dashes(_ self: JSObject) throws(JSException) -> S
 }
 
 #if arch(wasm32)
-@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_StaticBox_init")
-fileprivate func bjs_StaticBox_init_extern(_ value: Float64) -> Int32
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_jsJoinOptionalStructThenArray")
+fileprivate func bjs_jsJoinOptionalStructThenArray_extern() -> Int32
 #else
-fileprivate func bjs_StaticBox_init_extern(_ value: Float64) -> Int32 {
+fileprivate func bjs_jsJoinOptionalStructThenArray_extern() -> Int32 {
     fatalError("Only available on WebAssembly")
 }
 #endif
-@inline(never) fileprivate func bjs_StaticBox_init(_ value: Float64) -> Int32 {
-    return bjs_StaticBox_init_extern(value)
+@inline(never) fileprivate func bjs_jsJoinOptionalStructThenArray() -> Int32 {
+    return bjs_jsJoinOptionalStructThenArray_extern()
+}
+
+func _$jsJoinOptionalStructThenArray(_ a: Optional<Point>, _ b: [Int]) throws(JSException) -> String {
+    let _ = b.bridgeJSLowerParameter()
+    let _ = a.bridgeJSLowerParameter()
+    let ret = bjs_jsJoinOptionalStructThenArray()
+    if let error = _swift_js_take_exception() {
+        throw error
+    }
+    return String.bridgeJSLiftReturn(ret)
 }
 
 #if arch(wasm32)
-@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_StaticBox_create_static")
-fileprivate func bjs_StaticBox_create_static_extern(_ value: Float64) -> Int32
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_jsJoinEnumThenArray")
+fileprivate func bjs_jsJoinEnumThenArray_extern(_ a: Int32) -> Int32
 #else
-fileprivate func bjs_StaticBox_create_static_extern(_ value: Float64) -> Int32 {
+fileprivate func bjs_jsJoinEnumThenArray_extern(_ a: Int32) -> Int32 {
     fatalError("Only available on WebAssembly")
 }
 #endif
-@inline(never) fileprivate func bjs_StaticBox_create_static(_ value: Float64) -> Int32 {
-    return bjs_StaticBox_create_static_extern(value)
+@inline(never) fileprivate func bjs_jsJoinEnumThenArray(_ a: Int32) -> Int32 {
+    return bjs_jsJoinEnumThenArray_extern(a)
+}
+
+func _$jsJoinEnumThenArray(_ a: ImportedPayloadSignal, _ b: [Int]) throws(JSException) -> String {
+    let _ = b.bridgeJSLowerParameter()
+    let aCaseId = a.bridgeJSLowerParameter()
+    let ret = bjs_jsJoinEnumThenArray(aCaseId)
+    if let error = _swift_js_take_exception() {
+        throw error
+    }
+    return String.bridgeJSLiftReturn(ret)
 }
 
 #if arch(wasm32)
-@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_StaticBox_value_static")
-fileprivate func bjs_StaticBox_value_static_extern() -> Float64
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_jsJoinStringThenStackParams")
+fileprivate func bjs_jsJoinStringThenStackParams_extern(_ sBytes: Int32, _ sLength: Int32) -> Int32
 #else
-fileprivate func bjs_StaticBox_value_static_extern() -> Float64 {
+fileprivate func bjs_jsJoinStringThenStackParams_extern(_ sBytes: Int32, _ sLength: Int32) -> Int32 {
     fatalError("Only available on WebAssembly")
 }
 #endif
-@inline(never) fileprivate func bjs_StaticBox_value_static() -> Float64 {
-    return bjs_StaticBox_value_static_extern()
+@inline(never) fileprivate func bjs_jsJoinStringThenStackParams(_ sBytes: Int32, _ sLength: Int32) -> Int32 {
+    return bjs_jsJoinStringThenStackParams_extern(sBytes, sLength)
+}
+
+func _$jsJoinStringThenStackParams(_ s: String, _ a: Optional<[Int]>, _ b: [Int]) throws(JSException) -> String {
+    let ret0 = s.bridgeJSWithLoweredParameter { (sBytes, sLength) in
+        let _ = b.bridgeJSLowerParameter()
+        let _ = a.bridgeJSLowerParameter()
+        let ret = bjs_jsJoinStringThenStackParams(sBytes, sLength)
+        return ret
+    }
+    let ret = ret0
+    if let error = _swift_js_take_exception() {
+        throw error
+    }
+    return String.bridgeJSLiftReturn(ret)
 }
 
 #if arch(wasm32)
-@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_StaticBox_makeDefault_static")
-fileprivate func bjs_StaticBox_makeDefault_static_extern() -> Int32
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_jsGenericRoundTrip")
+fileprivate func bjs_jsGenericRoundTrip_extern(_ _generic0TypeId: Int32) -> Void
 #else
-fileprivate func bjs_StaticBox_makeDefault_static_extern() -> Int32 {
+fileprivate func bjs_jsGenericRoundTrip_extern(_ _generic0TypeId: Int32) -> Void {
     fatalError("Only available on WebAssembly")
 }
 #endif
-@inline(never) fileprivate func bjs_StaticBox_makeDefault_static() -> Int32 {
-    return bjs_StaticBox_makeDefault_static_extern()
+@inline(never) fileprivate func bjs_jsGenericRoundTrip(_ _generic0TypeId: Int32) -> Void {
+    return bjs_jsGenericRoundTrip_extern(_generic0TypeId)
+}
+
+func _$jsGenericRoundTrip<T: BridgedSwiftGenericBridgeable>(_ value: T) throws(JSException) -> T {
+    value.bridgeJSStackPush()
+    bjs_jsGenericRoundTrip(T.bridgeJSTypeID)
+    if let error = _swift_js_take_exception() {
+        throw error
+    }
+    return T.bridgeJSStackPop()
 }
 
 #if arch(wasm32)
-@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_StaticBox_with_dashes_static")
-fileprivate func bjs_StaticBox_with_dashes_static_extern() -> Int32
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_jsGenericRoundTripClass")
+fileprivate func bjs_jsGenericRoundTripClass_extern(_ _generic0TypeId: Int32) -> Void
 #else
-fileprivate func bjs_StaticBox_with_dashes_static_extern() -> Int32 {
+fileprivate func bjs_jsGenericRoundTripClass_extern(_ _generic0TypeId: Int32) -> Void {
     fatalError("Only available on WebAssembly")
 }
 #endif
-@inline(never) fileprivate func bjs_StaticBox_with_dashes_static() -> Int32 {
-    return bjs_StaticBox_with_dashes_static_extern()
+@inline(never) fileprivate func bjs_jsGenericRoundTripClass(_ _generic0TypeId: Int32) -> Void {
+    return bjs_jsGenericRoundTripClass_extern(_generic0TypeId)
+}
+
+func _$jsGenericRoundTripClass<T: BridgedSwiftGenericBridgeable>(_ value: T) throws(JSException) -> T {
+    value.bridgeJSStackPush()
+    bjs_jsGenericRoundTripClass(T.bridgeJSTypeID)
+    if let error = _swift_js_take_exception() {
+        throw error
+    }
+    return T.bridgeJSStackPop()
 }
 
 #if arch(wasm32)
-@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_StaticBox_value")
-fileprivate func bjs_StaticBox_value_extern(_ self: Int32) -> Float64
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_jsGenericParsePoint")
+fileprivate func bjs_jsGenericParsePoint_extern(_ jsonBytes: Int32, _ jsonLength: Int32, _ _generic0TypeId: Int32) -> Void
 #else
-fileprivate func bjs_StaticBox_value_extern(_ self: Int32) -> Float64 {
+fileprivate func bjs_jsGenericParsePoint_extern(_ jsonBytes: Int32, _ jsonLength: Int32, _ _generic0TypeId: Int32) -> Void {
     fatalError("Only available on WebAssembly")
 }
 #endif
-@inline(never) fileprivate func bjs_StaticBox_value(_ self: Int32) -> Float64 {
-    return bjs_StaticBox_value_extern(self)
+@inline(never) fileprivate func bjs_jsGenericParsePoint(_ jsonBytes: Int32, _ jsonLength: Int32, _ _generic0TypeId: Int32) -> Void {
+    return bjs_jsGenericParsePoint_extern(jsonBytes, jsonLength, _generic0TypeId)
 }
 
-func _$StaticBox_init(_ value: Double) throws(JSException) -> JSObject {
-    let valueValue = value.bridgeJSLowerParameter()
-    let ret = bjs_StaticBox_init(valueValue)
-    if let error = _swift_js_take_exception() {
-        throw error
+func _$jsGenericParsePoint<T: BridgedSwiftGenericBridgeable>(_ json: String) throws(JSException) -> T {
+    json.bridgeJSWithLoweredParameter { (jsonBytes, jsonLength) in
+        bjs_jsGenericParsePoint(jsonBytes, jsonLength, T.bridgeJSTypeID)
     }
-    return JSObject.bridgeJSLiftReturn(ret)
-}
-
-func _$StaticBox_create(_ value: Double) throws(JSException) -> StaticBox {
-    let valueValue = value.bridgeJSLowerParameter()
-    let ret = bjs_StaticBox_create_static(valueValue)
     if let error = _swift_js_take_exception() {
         throw error
     }
-    return StaticBox.bridgeJSLiftReturn(ret)
+    return T.bridgeJSStackPop()
 }
 
-func _$StaticBox_value() throws(JSException) -> Double {
-    let ret = bjs_StaticBox_value_static()
-    if let error = _swift_js_take_exception() {
-        throw error
-    }
-    return Double.bridgeJSLiftReturn(ret)
+#if arch(wasm32)
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_jsImportPickFirst")
+fileprivate func bjs_jsImportPickFirst_extern(_ _generic0TypeId: Int32) -> Void
+#else
+fileprivate func bjs_jsImportPickFirst_extern(_ _generic0TypeId: Int32) -> Void {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func bjs_jsImportPickFirst(_ _generic0TypeId: Int32) -> Void {
+    return bjs_jsImportPickFirst_extern(_generic0TypeId)
 }
 
-func _$StaticBox_makeDefault() throws(JSException) -> StaticBox {
-    let ret = bjs_StaticBox_makeDefault_static()
+func _$jsImportPickFirst<T: BridgedSwiftGenericBridgeable>(_ a: T, _ b: T) throws(JSException) -> T {
+    b.bridgeJSStackPush()
+    a.bridgeJSStackPush()
+    bjs_jsImportPickFirst(T.bridgeJSTypeID)
     if let error = _swift_js_take_exception() {
         throw error
     }
-    return StaticBox.bridgeJSLiftReturn(ret)
+    return T.bridgeJSStackPop()
 }
 
-func _$StaticBox_with_dashes() throws(JSException) -> StaticBox {
-    let ret = bjs_StaticBox_with_dashes_static()
-    if let error = _swift_js_take_exception() {
-        throw error
-    }
-    return StaticBox.bridgeJSLiftReturn(ret)
+#if arch(wasm32)
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_jsImportMakeInt")
+fileprivate func bjs_jsImportMakeInt_extern(_ _generic0TypeId: Int32) -> Void
+#else
+fileprivate func bjs_jsImportMakeInt_extern(_ _generic0TypeId: Int32) -> Void {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func bjs_jsImportMakeInt(_ _generic0TypeId: Int32) -> Void {
+    return bjs_jsImportMakeInt_extern(_generic0TypeId)
 }
 
-func _$StaticBox_value(_ self: JSObject) throws(JSException) -> Double {
-    let selfValue = self.bridgeJSLowerParameter()
-    let ret = bjs_StaticBox_value(selfValue)
+func _$jsImportMakeInt<T: BridgedSwiftGenericBridgeable>() throws(JSException) -> T {
+    bjs_jsImportMakeInt(T.bridgeJSTypeID)
     if let error = _swift_js_take_exception() {
         throw error
     }
-    return Double.bridgeJSLiftReturn(ret)
+    return T.bridgeJSStackPop()
 }
 
 #if arch(wasm32)
-@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_Animal_init")
-fileprivate func bjs_Animal_init_extern(_ nameBytes: Int32, _ nameLength: Int32, _ age: Float64, _ isCat: Int32) -> Int32
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_jsImportCombineSecond")
+fileprivate func bjs_jsImportCombineSecond_extern(_ _generic0TypeId: Int32, _ _generic1TypeId: Int32) -> Void
 #else
-fileprivate func bjs_Animal_init_extern(_ nameBytes: Int32, _ nameLength: Int32, _ age: Float64, _ isCat: Int32) -> Int32 {
+fileprivate func bjs_jsImportCombineSecond_extern(_ _generic0TypeId: Int32, _ _generic1TypeId: Int32) -> Void {
     fatalError("Only available on WebAssembly")
 }
 #endif
-@inline(never) fileprivate func bjs_Animal_init(_ nameBytes: Int32, _ nameLength: Int32, _ age: Float64, _ isCat: Int32) -> Int32 {
-    return bjs_Animal_init_extern(nameBytes, nameLength, age, isCat)
+@inline(never) fileprivate func bjs_jsImportCombineSecond(_ _generic0TypeId: Int32, _ _generic1TypeId: Int32) -> Void {
+    return bjs_jsImportCombineSecond_extern(_generic0TypeId, _generic1TypeId)
+}
+
+func _$jsImportCombineSecond<T: BridgedSwiftGenericBridgeable, U: BridgedSwiftGenericBridgeable>(_ a: T, _ b: U) throws(JSException) -> U {
+    b.bridgeJSStackPush()
+    a.bridgeJSStackPush()
+    bjs_jsImportCombineSecond(T.bridgeJSTypeID, U.bridgeJSTypeID)
+    if let error = _swift_js_take_exception() {
+        throw error
+    }
+    return U.bridgeJSStackPop()
 }
 
 #if arch(wasm32)
-@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_Animal_name_get")
-fileprivate func bjs_Animal_name_get_extern(_ self: Int32) -> Int32
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_jsGenericArrayRoundTrip")
+fileprivate func bjs_jsGenericArrayRoundTrip_extern(_ _generic0TypeId: Int32) -> Void
 #else
-fileprivate func bjs_Animal_name_get_extern(_ self: Int32) -> Int32 {
+fileprivate func bjs_jsGenericArrayRoundTrip_extern(_ _generic0TypeId: Int32) -> Void {
     fatalError("Only available on WebAssembly")
 }
 #endif
-@inline(never) fileprivate func bjs_Animal_name_get(_ self: Int32) -> Int32 {
-    return bjs_Animal_name_get_extern(self)
+@inline(never) fileprivate func bjs_jsGenericArrayRoundTrip(_ _generic0TypeId: Int32) -> Void {
+    return bjs_jsGenericArrayRoundTrip_extern(_generic0TypeId)
+}
+
+func _$jsGenericArrayRoundTrip<T: BridgedSwiftGenericBridgeable>(_ values: [T]) throws(JSException) -> [T] {
+    let _ = values.bridgeJSLowerParameter()
+    bjs_jsGenericArrayRoundTrip(T.bridgeJSTypeID)
+    if let error = _swift_js_take_exception() {
+        throw error
+    }
+    return [T].bridgeJSLiftReturn()
 }
 
 #if arch(wasm32)
-@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_Animal_age_get")
-fileprivate func bjs_Animal_age_get_extern(_ self: Int32) -> Float64
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_jsGenericOptionalRoundTrip")
+fileprivate func bjs_jsGenericOptionalRoundTrip_extern(_ _generic0TypeId: Int32) -> Void
 #else
-fileprivate func bjs_Animal_age_get_extern(_ self: Int32) -> Float64 {
+fileprivate func bjs_jsGenericOptionalRoundTrip_extern(_ _generic0TypeId: Int32) -> Void {
     fatalError("Only available on WebAssembly")
 }
 #endif
-@inline(never) fileprivate func bjs_Animal_age_get(_ self: Int32) -> Float64 {
-    return bjs_Animal_age_get_extern(self)
+@inline(never) fileprivate func bjs_jsGenericOptionalRoundTrip(_ _generic0TypeId: Int32) -> Void {
+    return bjs_jsGenericOptionalRoundTrip_extern(_generic0TypeId)
+}
+
+func _$jsGenericOptionalRoundTrip<T: BridgedSwiftGenericBridgeable>(_ value: Optional<T>) throws(JSException) -> Optional<T> {
+    value.bridgeJSStackPush()
+    bjs_jsGenericOptionalRoundTrip(T.bridgeJSTypeID)
+    if let error = _swift_js_take_exception() {
+        throw error
+    }
+    return Optional<T>.bridgeJSStackPop()
 }
 
 #if arch(wasm32)
-@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_Animal_isCat_get")
-fileprivate func bjs_Animal_isCat_get_extern(_ self: Int32) -> Int32
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_jsGenericDictRoundTrip")
+fileprivate func bjs_jsGenericDictRoundTrip_extern(_ _generic0TypeId: Int32) -> Void
 #else
-fileprivate func bjs_Animal_isCat_get_extern(_ self: Int32) -> Int32 {
+fileprivate func bjs_jsGenericDictRoundTrip_extern(_ _generic0TypeId: Int32) -> Void {
     fatalError("Only available on WebAssembly")
 }
 #endif
-@inline(never) fileprivate func bjs_Animal_isCat_get(_ self: Int32) -> Int32 {
-    return bjs_Animal_isCat_get_extern(self)
+@inline(never) fileprivate func bjs_jsGenericDictRoundTrip(_ _generic0TypeId: Int32) -> Void {
+    return bjs_jsGenericDictRoundTrip_extern(_generic0TypeId)
+}
+
+func _$jsGenericDictRoundTrip<T: BridgedSwiftGenericBridgeable>(_ values: [String: T]) throws(JSException) -> [String: T] {
+    let _ = values.bridgeJSLowerParameter()
+    bjs_jsGenericDictRoundTrip(T.bridgeJSTypeID)
+    if let error = _swift_js_take_exception() {
+        throw error
+    }
+    return [String: T].bridgeJSLiftReturn()
 }
 
 #if arch(wasm32)
-@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_Animal_name_set")
-fileprivate func bjs_Animal_name_set_extern(_ self: Int32, _ newValueBytes: Int32, _ newValueLength: Int32) -> Void
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_jsGenericAfterOptionalArray")
+fileprivate func bjs_jsGenericAfterOptionalArray_extern(_ _generic0TypeId: Int32) -> Int32
 #else
-fileprivate func bjs_Animal_name_set_extern(_ self: Int32, _ newValueBytes: Int32, _ newValueLength: Int32) -> Void {
+fileprivate func bjs_jsGenericAfterOptionalArray_extern(_ _generic0TypeId: Int32) -> Int32 {
     fatalError("Only available on WebAssembly")
 }
 #endif
-@inline(never) fileprivate func bjs_Animal_name_set(_ self: Int32, _ newValueBytes: Int32, _ newValueLength: Int32) -> Void {
-    return bjs_Animal_name_set_extern(self, newValueBytes, newValueLength)
+@inline(never) fileprivate func bjs_jsGenericAfterOptionalArray(_ _generic0TypeId: Int32) -> Int32 {
+    return bjs_jsGenericAfterOptionalArray_extern(_generic0TypeId)
+}
+
+func _$jsGenericAfterOptionalArray<T: BridgedSwiftGenericBridgeable>(_ values: Optional<[Int]>, _ value: T) throws(JSException) -> String {
+    value.bridgeJSStackPush()
+    let _ = values.bridgeJSLowerParameter()
+    let ret = bjs_jsGenericAfterOptionalArray(T.bridgeJSTypeID)
+    if let error = _swift_js_take_exception() {
+        throw error
+    }
+    return String.bridgeJSLiftReturn(ret)
 }
 
 #if arch(wasm32)
-@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_Animal_age_set")
-fileprivate func bjs_Animal_age_set_extern(_ self: Int32, _ newValue: Float64) -> Void
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_jsGenericThrowOrRoundTrip")
+fileprivate func bjs_jsGenericThrowOrRoundTrip_extern(_ shouldThrow: Int32, _ _generic0TypeId: Int32) -> Void
 #else
-fileprivate func bjs_Animal_age_set_extern(_ self: Int32, _ newValue: Float64) -> Void {
+fileprivate func bjs_jsGenericThrowOrRoundTrip_extern(_ shouldThrow: Int32, _ _generic0TypeId: Int32) -> Void {
     fatalError("Only available on WebAssembly")
 }
 #endif
-@inline(never) fileprivate func bjs_Animal_age_set(_ self: Int32, _ newValue: Float64) -> Void {
-    return bjs_Animal_age_set_extern(self, newValue)
+@inline(never) fileprivate func bjs_jsGenericThrowOrRoundTrip(_ shouldThrow: Int32, _ _generic0TypeId: Int32) -> Void {
+    return bjs_jsGenericThrowOrRoundTrip_extern(shouldThrow, _generic0TypeId)
+}
+
+func _$jsGenericThrowOrRoundTrip<T: BridgedSwiftGenericBridgeable>(_ shouldThrow: Bool, _ value: T) throws(JSException) -> T {
+    value.bridgeJSStackPush()
+    let shouldThrowValue = shouldThrow.bridgeJSLowerParameter()
+    bjs_jsGenericThrowOrRoundTrip(shouldThrowValue, T.bridgeJSTypeID)
+    if let error = _swift_js_take_exception() {
+        throw error
+    }
+    return T.bridgeJSStackPop()
 }
 
 #if arch(wasm32)
-@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_Animal_isCat_set")
-fileprivate func bjs_Animal_isCat_set_extern(_ self: Int32, _ newValue: Int32) -> Void
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_ImportGenericConsumer_init")
+fileprivate func bjs_ImportGenericConsumer_init_extern() -> Int32
 #else
-fileprivate func bjs_Animal_isCat_set_extern(_ self: Int32, _ newValue: Int32) -> Void {
+fileprivate func bjs_ImportGenericConsumer_init_extern() -> Int32 {
     fatalError("Only available on WebAssembly")
 }
 #endif
-@inline(never) fileprivate func bjs_Animal_isCat_set(_ self: Int32, _ newValue: Int32) -> Void {
-    return bjs_Animal_isCat_set_extern(self, newValue)
+@inline(never) fileprivate func bjs_ImportGenericConsumer_init() -> Int32 {
+    return bjs_ImportGenericConsumer_init_extern()
 }
 
 #if arch(wasm32)
-@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_Animal_bark")
-fileprivate func bjs_Animal_bark_extern(_ self: Int32) -> Int32
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_ImportGenericConsumer_box_static")
+fileprivate func bjs_ImportGenericConsumer_box_static_extern(_ _generic0TypeId: Int32) -> Void
 #else
-fileprivate func bjs_Animal_bark_extern(_ self: Int32) -> Int32 {
+fileprivate func bjs_ImportGenericConsumer_box_static_extern(_ _generic0TypeId: Int32) -> Void {
     fatalError("Only available on WebAssembly")
 }
 #endif
-@inline(never) fileprivate func bjs_Animal_bark(_ self: Int32) -> Int32 {
-    return bjs_Animal_bark_extern(self)
+@inline(never) fileprivate func bjs_ImportGenericConsumer_box_static(_ _generic0TypeId: Int32) -> Void {
+    return bjs_ImportGenericConsumer_box_static_extern(_generic0TypeId)
 }
 
 #if arch(wasm32)
-@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_Animal_getIsCat")
-fileprivate func bjs_Animal_getIsCat_extern(_ self: Int32) -> Int32
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_ImportGenericConsumer_identity")
+fileprivate func bjs_ImportGenericConsumer_identity_extern(_ self: Int32, _ _generic0TypeId: Int32) -> Void
 #else
-fileprivate func bjs_Animal_getIsCat_extern(_ self: Int32) -> Int32 {
+fileprivate func bjs_ImportGenericConsumer_identity_extern(_ self: Int32, _ _generic0TypeId: Int32) -> Void {
     fatalError("Only available on WebAssembly")
 }
 #endif
-@inline(never) fileprivate func bjs_Animal_getIsCat(_ self: Int32) -> Int32 {
-    return bjs_Animal_getIsCat_extern(self)
+@inline(never) fileprivate func bjs_ImportGenericConsumer_identity(_ self: Int32, _ _generic0TypeId: Int32) -> Void {
+    return bjs_ImportGenericConsumer_identity_extern(self, _generic0TypeId)
 }
 
-func _$Animal_init(_ name: String, _ age: Double, _ isCat: Bool) throws(JSException) -> JSObject {
-    let ret0 = name.bridgeJSWithLoweredParameter { (nameBytes, nameLength) in
-        let ageValue = age.bridgeJSLowerParameter()
-        let isCatValue = isCat.bridgeJSLowerParameter()
-        let ret = bjs_Animal_init(nameBytes, nameLength, ageValue, isCatValue)
-        return ret
-    }
-    let ret = ret0
+func _$ImportGenericConsumer_init() throws(JSException) -> JSObject {
+    let ret = bjs_ImportGenericConsumer_init()
     if let error = _swift_js_take_exception() {
         throw error
     }
     return JSObject.bridgeJSLiftReturn(ret)
 }
 
-func _$Animal_name_get(_ self: JSObject) throws(JSException) -> String {
-    let selfValue = self.bridgeJSLowerParameter()
-    let ret = bjs_Animal_name_get(selfValue)
+func _$ImportGenericConsumer_box<T: BridgedSwiftGenericBridgeable>(_ value: T) throws(JSException) -> T {
+    value.bridgeJSStackPush()
+    bjs_ImportGenericConsumer_box_static(T.bridgeJSTypeID)
     if let error = _swift_js_take_exception() {
         throw error
     }
-    return String.bridgeJSLiftReturn(ret)
+    return T.bridgeJSStackPop()
 }
 
-func _$Animal_age_get(_ self: JSObject) throws(JSException) -> Double {
+func _$ImportGenericConsumer_identity<T: BridgedSwiftGenericBridgeable>(_ self: JSObject, _ value: T) throws(JSException) -> T {
+    value.bridgeJSStackPush()
     let selfValue = self.bridgeJSLowerParameter()
-    let ret = bjs_Animal_age_get(selfValue)
+    bjs_ImportGenericConsumer_identity(selfValue, T.bridgeJSTypeID)
     if let error = _swift_js_take_exception() {
         throw error
     }
-    return Double.bridgeJSLiftReturn(ret)
+    return T.bridgeJSStackPop()
 }
 
-func _$Animal_isCat_get(_ self: JSObject) throws(JSException) -> Bool {
-    let selfValue = self.bridgeJSLowerParameter()
-    let ret = bjs_Animal_isCat_get(selfValue)
-    if let error = _swift_js_take_exception() {
-        throw error
-    }
-    return Bool.bridgeJSLiftReturn(ret)
+#if arch(wasm32)
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_ImportGenericBoxed_init")
+fileprivate func bjs_ImportGenericBoxed_init_extern(_ _generic0TypeId: Int32) -> Int32
+#else
+fileprivate func bjs_ImportGenericBoxed_init_extern(_ _generic0TypeId: Int32) -> Int32 {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func bjs_ImportGenericBoxed_init(_ _generic0TypeId: Int32) -> Int32 {
+    return bjs_ImportGenericBoxed_init_extern(_generic0TypeId)
 }
 
-func _$Animal_name_set(_ self: JSObject, _ newValue: String) throws(JSException) -> Void {
-    let selfValue = self.bridgeJSLowerParameter()
-    newValue.bridgeJSWithLoweredParameter { (newValueBytes, newValueLength) in
-        bjs_Animal_name_set(selfValue, newValueBytes, newValueLength)
-    }
-    if let error = _swift_js_take_exception() {
-        throw error
-    }
+#if arch(wasm32)
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_ImportGenericBoxed_unwrap")
+fileprivate func bjs_ImportGenericBoxed_unwrap_extern(_ self: Int32, _ _generic0TypeId: Int32) -> Void
+#else
+fileprivate func bjs_ImportGenericBoxed_unwrap_extern(_ self: Int32, _ _generic0TypeId: Int32) -> Void {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func bjs_ImportGenericBoxed_unwrap(_ self: Int32, _ _generic0TypeId: Int32) -> Void {
+    return bjs_ImportGenericBoxed_unwrap_extern(self, _generic0TypeId)
 }
 
-func _$Animal_age_set(_ self: JSObject, _ newValue: Double) throws(JSException) -> Void {
-    let selfValue = self.bridgeJSLowerParameter()
-    let newValueValue = newValue.bridgeJSLowerParameter()
-    bjs_Animal_age_set(selfValue, newValueValue)
+func _$ImportGenericBoxed_init<T: BridgedSwiftGenericBridgeable>(_ value: T) throws(JSException) -> JSObject {
+    value.bridgeJSStackPush()
+    let ret = bjs_ImportGenericBoxed_init(T.bridgeJSTypeID)
     if let error = _swift_js_take_exception() {
         throw error
     }
+    return JSObject.bridgeJSLiftReturn(ret)
 }
 
-func _$Animal_isCat_set(_ self: JSObject, _ newValue: Bool) throws(JSException) -> Void {
+func _$ImportGenericBoxed_unwrap<T: BridgedSwiftGenericBridgeable>(_ self: JSObject) throws(JSException) -> T {
     let selfValue = self.bridgeJSLowerParameter()
-    let newValueValue = newValue.bridgeJSLowerParameter()
-    bjs_Animal_isCat_set(selfValue, newValueValue)
+    bjs_ImportGenericBoxed_unwrap(selfValue, T.bridgeJSTypeID)
     if let error = _swift_js_take_exception() {
         throw error
     }
+    return T.bridgeJSStackPop()
 }
 
-func _$Animal_bark(_ self: JSObject) throws(JSException) -> String {
-    let selfValue = self.bridgeJSLowerParameter()
-    let ret = bjs_Animal_bark(selfValue)
-    if let error = _swift_js_take_exception() {
-        throw error
-    }
-    return String.bridgeJSLiftReturn(ret)
+#if arch(wasm32)
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_jsTranslatePoint")
+fileprivate func bjs_jsTranslatePoint_extern(_ dx: Int32, _ dy: Int32) -> Void
+#else
+fileprivate func bjs_jsTranslatePoint_extern(_ dx: Int32, _ dy: Int32) -> Void {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func bjs_jsTranslatePoint(_ dx: Int32, _ dy: Int32) -> Void {
+    return bjs_jsTranslatePoint_extern(dx, dy)
 }
 
-func _$Animal_getIsCat(_ self: JSObject) throws(JSException) -> Bool {
-    let selfValue = self.bridgeJSLowerParameter()
-    let ret = bjs_Animal_getIsCat(selfValue)
+func _$jsTranslatePoint(_ point: Point, _ dx: Int, _ dy: Int) throws(JSException) -> Point {
+    let dyValue = dy.bridgeJSLowerParameter()
+    let dxValue = dx.bridgeJSLowerParameter()
+    let _ = point.bridgeJSLowerParameter()
+    bjs_jsTranslatePoint(dxValue, dyValue)
     if let error = _swift_js_take_exception() {
         throw error
     }
-    return Bool.bridgeJSLiftReturn(ret)
+    return Point.bridgeJSLiftReturn()
 }
 
 #if arch(wasm32)
-@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_jsTranslatePoint")
-fileprivate func bjs_jsTranslatePoint_extern(_ point: Int32, _ dx: Int32, _ dy: Int32) -> Int32
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_jsRoundTripOptionalPoint")
+fileprivate func bjs_jsRoundTripOptionalPoint_extern() -> Void
 #else
-fileprivate func bjs_jsTranslatePoint_extern(_ point: Int32, _ dx: Int32, _ dy: Int32) -> Int32 {
+fileprivate func bjs_jsRoundTripOptionalPoint_extern() -> Void {
     fatalError("Only available on WebAssembly")
 }
 #endif
-@inline(never) fileprivate func bjs_jsTranslatePoint(_ point: Int32, _ dx: Int32, _ dy: Int32) -> Int32 {
-    return bjs_jsTranslatePoint_extern(point, dx, dy)
+@inline(never) fileprivate func bjs_jsRoundTripOptionalPoint() -> Void {
+    return bjs_jsRoundTripOptionalPoint_extern()
 }
 
-func _$jsTranslatePoint(_ point: Point, _ dx: Int, _ dy: Int) throws(JSException) -> Point {
-    let pointObjectId = point.bridgeJSLowerParameter()
-    let dxValue = dx.bridgeJSLowerParameter()
-    let dyValue = dy.bridgeJSLowerParameter()
-    let ret = bjs_jsTranslatePoint(pointObjectId, dxValue, dyValue)
+func _$jsRoundTripOptionalPoint(_ point: Optional<Point>) throws(JSException) -> Optional<Point> {
+    let _ = point.bridgeJSLowerParameter()
+    bjs_jsRoundTripOptionalPoint()
     if let error = _swift_js_take_exception() {
         throw error
     }
-    return Point.bridgeJSLiftReturn(ret)
+    return Optional<Point>.bridgeJSLiftReturn()
 }
 
 #if arch(wasm32)
@@ -13633,8 +18446,8 @@ func _$JSClassWithArrayMembers_labels_get(_ self: JSObject) throws(JSException)
 }
 
 func _$JSClassWithArrayMembers_numbers_set(_ self: JSObject, _ newValue: [Int]) throws(JSException) -> Void {
-    let selfValue = self.bridgeJSLowerParameter()
     let _ = newValue.bridgeJSLowerParameter()
+    let selfValue = self.bridgeJSLowerParameter()
     bjs_JSClassWithArrayMembers_numbers_set(selfValue)
     if let error = _swift_js_take_exception() {
         throw error
@@ -13642,8 +18455,8 @@ func _$JSClassWithArrayMembers_numbers_set(_ self: JSObject, _ newValue: [Int])
 }
 
 func _$JSClassWithArrayMembers_labels_set(_ self: JSObject, _ newValue: [String]) throws(JSException) -> Void {
-    let selfValue = self.bridgeJSLowerParameter()
     let _ = newValue.bridgeJSLowerParameter()
+    let selfValue = self.bridgeJSLowerParameter()
     bjs_JSClassWithArrayMembers_labels_set(selfValue)
     if let error = _swift_js_take_exception() {
         throw error
@@ -13651,8 +18464,8 @@ func _$JSClassWithArrayMembers_labels_set(_ self: JSObject, _ newValue: [String]
 }
 
 func _$JSClassWithArrayMembers_concatNumbers(_ self: JSObject, _ values: [Int]) throws(JSException) -> [Int] {
-    let selfValue = self.bridgeJSLowerParameter()
     let _ = values.bridgeJSLowerParameter()
+    let selfValue = self.bridgeJSLowerParameter()
     bjs_JSClassWithArrayMembers_concatNumbers(selfValue)
     if let error = _swift_js_take_exception() {
         throw error
@@ -13661,8 +18474,8 @@ func _$JSClassWithArrayMembers_concatNumbers(_ self: JSObject, _ values: [Int])
 }
 
 func _$JSClassWithArrayMembers_concatLabels(_ self: JSObject, _ values: [String]) throws(JSException) -> [String] {
-    let selfValue = self.bridgeJSLowerParameter()
     let _ = values.bridgeJSLowerParameter()
+    let selfValue = self.bridgeJSLowerParameter()
     bjs_JSClassWithArrayMembers_concatLabels(selfValue)
     if let error = _swift_js_take_exception() {
         throw error
@@ -13671,8 +18484,8 @@ func _$JSClassWithArrayMembers_concatLabels(_ self: JSObject, _ values: [String]
 }
 
 func _$JSClassWithArrayMembers_firstLabel(_ self: JSObject, _ values: [String]) throws(JSException) -> String {
-    let selfValue = self.bridgeJSLowerParameter()
     let _ = values.bridgeJSLowerParameter()
+    let selfValue = self.bridgeJSLowerParameter()
     let ret = bjs_JSClassWithArrayMembers_firstLabel(selfValue)
     if let error = _swift_js_take_exception() {
         throw error
@@ -13702,6 +18515,305 @@ func _$JSClassSupportImports_makeJSClassWithArrayMembers(_ numbers: [Int], _ lab
     return JSClassWithArrayMembers.bridgeJSLiftReturn(ret)
 }
 
+#if arch(wasm32)
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_defaultExport_get")
+fileprivate func bjs_defaultExport_get_extern() -> Int32
+#else
+fileprivate func bjs_defaultExport_get_extern() -> Int32 {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func bjs_defaultExport_get() -> Int32 {
+    return bjs_defaultExport_get_extern()
+}
+
+func _$defaultExport_get() throws(JSException) -> JSObject {
+    let ret = bjs_defaultExport_get()
+    if let error = _swift_js_take_exception() {
+        throw error
+    }
+    return JSObject.bridgeJSLiftReturn(ret)
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_nodeBasename")
+fileprivate func bjs_nodeBasename_extern(_ pathBytes: Int32, _ pathLength: Int32) -> Int32
+#else
+fileprivate func bjs_nodeBasename_extern(_ pathBytes: Int32, _ pathLength: Int32) -> Int32 {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func bjs_nodeBasename(_ pathBytes: Int32, _ pathLength: Int32) -> Int32 {
+    return bjs_nodeBasename_extern(pathBytes, pathLength)
+}
+
+func _$nodeBasename(_ path: String) throws(JSException) -> String {
+    let ret0 = path.bridgeJSWithLoweredParameter { (pathBytes, pathLength) in
+        let ret = bjs_nodeBasename(pathBytes, pathLength)
+        return ret
+    }
+    let ret = ret0
+    if let error = _swift_js_take_exception() {
+        throw error
+    }
+    return String.bridgeJSLiftReturn(ret)
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_nodeJoin")
+fileprivate func bjs_nodeJoin_extern(_ lhsBytes: Int32, _ lhsLength: Int32, _ rhsBytes: Int32, _ rhsLength: Int32) -> Int32
+#else
+fileprivate func bjs_nodeJoin_extern(_ lhsBytes: Int32, _ lhsLength: Int32, _ rhsBytes: Int32, _ rhsLength: Int32) -> Int32 {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func bjs_nodeJoin(_ lhsBytes: Int32, _ lhsLength: Int32, _ rhsBytes: Int32, _ rhsLength: Int32) -> Int32 {
+    return bjs_nodeJoin_extern(lhsBytes, lhsLength, rhsBytes, rhsLength)
+}
+
+func _$nodeJoin(_ lhs: String, _ rhs: String) throws(JSException) -> String {
+    let ret0 = lhs.bridgeJSWithLoweredParameter { (lhsBytes, lhsLength) in
+        let ret1 = rhs.bridgeJSWithLoweredParameter { (rhsBytes, rhsLength) in
+            let ret = bjs_nodeJoin(lhsBytes, lhsLength, rhsBytes, rhsLength)
+            return ret
+        }
+        return ret1
+    }
+    let ret = ret0
+    if let error = _swift_js_take_exception() {
+        throw error
+    }
+    return String.bridgeJSLiftReturn(ret)
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_WasiFile_init")
+fileprivate func bjs_WasiFile_init_extern(_ data: Int32) -> Int32
+#else
+fileprivate func bjs_WasiFile_init_extern(_ data: Int32) -> Int32 {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func bjs_WasiFile_init(_ data: Int32) -> Int32 {
+    return bjs_WasiFile_init_extern(data)
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_WasiFile_size_get")
+fileprivate func bjs_WasiFile_size_get_extern(_ self: Int32) -> Int64
+#else
+fileprivate func bjs_WasiFile_size_get_extern(_ self: Int32) -> Int64 {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func bjs_WasiFile_size_get(_ self: Int32) -> Int64 {
+    return bjs_WasiFile_size_get_extern(self)
+}
+
+func _$WasiFile_init(_ data: JSObject) throws(JSException) -> JSObject {
+    let dataValue = data.bridgeJSLowerParameter()
+    let ret = bjs_WasiFile_init(dataValue)
+    if let error = _swift_js_take_exception() {
+        throw error
+    }
+    return JSObject.bridgeJSLiftReturn(ret)
+}
+
+func _$WasiFile_size_get(_ self: JSObject) throws(JSException) -> Int64 {
+    let selfValue = self.bridgeJSLowerParameter()
+    let ret = bjs_WasiFile_size_get(selfValue)
+    if let error = _swift_js_take_exception() {
+        throw error
+    }
+    return Int64.bridgeJSLiftReturn(ret)
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_moduleVersion_get")
+fileprivate func bjs_moduleVersion_get_extern() -> Int32
+#else
+fileprivate func bjs_moduleVersion_get_extern() -> Int32 {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func bjs_moduleVersion_get() -> Int32 {
+    return bjs_moduleVersion_get_extern()
+}
+
+func _$moduleVersion_get() throws(JSException) -> String {
+    let ret = bjs_moduleVersion_get()
+    if let error = _swift_js_take_exception() {
+        throw error
+    }
+    return String.bridgeJSLiftReturn(ret)
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_moduleAdd")
+fileprivate func bjs_moduleAdd_extern(_ lhs: Int32, _ rhs: Int32) -> Int32
+#else
+fileprivate func bjs_moduleAdd_extern(_ lhs: Int32, _ rhs: Int32) -> Int32 {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func bjs_moduleAdd(_ lhs: Int32, _ rhs: Int32) -> Int32 {
+    return bjs_moduleAdd_extern(lhs, rhs)
+}
+
+func _$moduleAdd(_ lhs: Int, _ rhs: Int) throws(JSException) -> Int {
+    let rhsValue = rhs.bridgeJSLowerParameter()
+    let lhsValue = lhs.bridgeJSLowerParameter()
+    let ret = bjs_moduleAdd(lhsValue, rhsValue)
+    if let error = _swift_js_take_exception() {
+        throw error
+    }
+    return Int.bridgeJSLiftReturn(ret)
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_moduleRenamed")
+fileprivate func bjs_moduleRenamed_extern() -> Int32
+#else
+fileprivate func bjs_moduleRenamed_extern() -> Int32 {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func bjs_moduleRenamed() -> Int32 {
+    return bjs_moduleRenamed_extern()
+}
+
+func _$moduleRenamed() throws(JSException) -> String {
+    let ret = bjs_moduleRenamed()
+    if let error = _swift_js_take_exception() {
+        throw error
+    }
+    return String.bridgeJSLiftReturn(ret)
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_moduleThrow")
+fileprivate func bjs_moduleThrow_extern() -> Void
+#else
+fileprivate func bjs_moduleThrow_extern() -> Void {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func bjs_moduleThrow() -> Void {
+    return bjs_moduleThrow_extern()
+}
+
+func _$moduleThrow() throws(JSException) -> Void {
+    bjs_moduleThrow()
+    if let error = _swift_js_take_exception() {
+        throw error
+    }
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_ModuleCounter_init")
+fileprivate func bjs_ModuleCounter_init_extern(_ value: Int32) -> Int32
+#else
+fileprivate func bjs_ModuleCounter_init_extern(_ value: Int32) -> Int32 {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func bjs_ModuleCounter_init(_ value: Int32) -> Int32 {
+    return bjs_ModuleCounter_init_extern(value)
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_ModuleCounter_create_static")
+fileprivate func bjs_ModuleCounter_create_static_extern(_ value: Int32) -> Int32
+#else
+fileprivate func bjs_ModuleCounter_create_static_extern(_ value: Int32) -> Int32 {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func bjs_ModuleCounter_create_static(_ value: Int32) -> Int32 {
+    return bjs_ModuleCounter_create_static_extern(value)
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_ModuleCounter_value_get")
+fileprivate func bjs_ModuleCounter_value_get_extern(_ self: Int32) -> Int32
+#else
+fileprivate func bjs_ModuleCounter_value_get_extern(_ self: Int32) -> Int32 {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func bjs_ModuleCounter_value_get(_ self: Int32) -> Int32 {
+    return bjs_ModuleCounter_value_get_extern(self)
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_ModuleCounter_value_set")
+fileprivate func bjs_ModuleCounter_value_set_extern(_ self: Int32, _ newValue: Int32) -> Void
+#else
+fileprivate func bjs_ModuleCounter_value_set_extern(_ self: Int32, _ newValue: Int32) -> Void {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func bjs_ModuleCounter_value_set(_ self: Int32, _ newValue: Int32) -> Void {
+    return bjs_ModuleCounter_value_set_extern(self, newValue)
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_ModuleCounter_increment")
+fileprivate func bjs_ModuleCounter_increment_extern(_ self: Int32) -> Int32
+#else
+fileprivate func bjs_ModuleCounter_increment_extern(_ self: Int32) -> Int32 {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func bjs_ModuleCounter_increment(_ self: Int32) -> Int32 {
+    return bjs_ModuleCounter_increment_extern(self)
+}
+
+func _$ModuleCounter_init(_ value: Int) throws(JSException) -> JSObject {
+    let valueValue = value.bridgeJSLowerParameter()
+    let ret = bjs_ModuleCounter_init(valueValue)
+    if let error = _swift_js_take_exception() {
+        throw error
+    }
+    return JSObject.bridgeJSLiftReturn(ret)
+}
+
+func _$ModuleCounter_create(_ value: Int) throws(JSException) -> ModuleCounter {
+    let valueValue = value.bridgeJSLowerParameter()
+    let ret = bjs_ModuleCounter_create_static(valueValue)
+    if let error = _swift_js_take_exception() {
+        throw error
+    }
+    return ModuleCounter.bridgeJSLiftReturn(ret)
+}
+
+func _$ModuleCounter_value_get(_ self: JSObject) throws(JSException) -> Int {
+    let selfValue = self.bridgeJSLowerParameter()
+    let ret = bjs_ModuleCounter_value_get(selfValue)
+    if let error = _swift_js_take_exception() {
+        throw error
+    }
+    return Int.bridgeJSLiftReturn(ret)
+}
+
+func _$ModuleCounter_value_set(_ self: JSObject, _ newValue: Int) throws(JSException) -> Void {
+    let newValueValue = newValue.bridgeJSLowerParameter()
+    let selfValue = self.bridgeJSLowerParameter()
+    bjs_ModuleCounter_value_set(selfValue, newValueValue)
+    if let error = _swift_js_take_exception() {
+        throw error
+    }
+}
+
+func _$ModuleCounter_increment(_ self: JSObject) throws(JSException) -> Int {
+    let selfValue = self.bridgeJSLowerParameter()
+    let ret = bjs_ModuleCounter_increment(selfValue)
+    if let error = _swift_js_take_exception() {
+        throw error
+    }
+    return Int.bridgeJSLiftReturn(ret)
+}
+
 #if arch(wasm32)
 @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_JSTypedArrayImports_jsCreateUint8Array_static")
 fileprivate func bjs_JSTypedArrayImports_jsCreateUint8Array_static_extern() -> Int32
@@ -14030,50 +19142,62 @@ fileprivate func bjs_OptionalSupportImports_jsRoundTripOptionalStringUndefined_s
 
 #if arch(wasm32)
 @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_OptionalSupportImports_jsRoundTripOptionalJSValueArrayNull_static")
-fileprivate func bjs_OptionalSupportImports_jsRoundTripOptionalJSValueArrayNull_static_extern(_ v: Int32) -> Void
+fileprivate func bjs_OptionalSupportImports_jsRoundTripOptionalJSValueArrayNull_static_extern() -> Void
 #else
-fileprivate func bjs_OptionalSupportImports_jsRoundTripOptionalJSValueArrayNull_static_extern(_ v: Int32) -> Void {
+fileprivate func bjs_OptionalSupportImports_jsRoundTripOptionalJSValueArrayNull_static_extern() -> Void {
     fatalError("Only available on WebAssembly")
 }
 #endif
-@inline(never) fileprivate func bjs_OptionalSupportImports_jsRoundTripOptionalJSValueArrayNull_static(_ v: Int32) -> Void {
-    return bjs_OptionalSupportImports_jsRoundTripOptionalJSValueArrayNull_static_extern(v)
+@inline(never) fileprivate func bjs_OptionalSupportImports_jsRoundTripOptionalJSValueArrayNull_static() -> Void {
+    return bjs_OptionalSupportImports_jsRoundTripOptionalJSValueArrayNull_static_extern()
 }
 
 #if arch(wasm32)
 @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_OptionalSupportImports_jsRoundTripOptionalJSValueArrayUndefined_static")
-fileprivate func bjs_OptionalSupportImports_jsRoundTripOptionalJSValueArrayUndefined_static_extern(_ v: Int32) -> Void
+fileprivate func bjs_OptionalSupportImports_jsRoundTripOptionalJSValueArrayUndefined_static_extern() -> Void
 #else
-fileprivate func bjs_OptionalSupportImports_jsRoundTripOptionalJSValueArrayUndefined_static_extern(_ v: Int32) -> Void {
+fileprivate func bjs_OptionalSupportImports_jsRoundTripOptionalJSValueArrayUndefined_static_extern() -> Void {
     fatalError("Only available on WebAssembly")
 }
 #endif
-@inline(never) fileprivate func bjs_OptionalSupportImports_jsRoundTripOptionalJSValueArrayUndefined_static(_ v: Int32) -> Void {
-    return bjs_OptionalSupportImports_jsRoundTripOptionalJSValueArrayUndefined_static_extern(v)
+@inline(never) fileprivate func bjs_OptionalSupportImports_jsRoundTripOptionalJSValueArrayUndefined_static() -> Void {
+    return bjs_OptionalSupportImports_jsRoundTripOptionalJSValueArrayUndefined_static_extern()
 }
 
 #if arch(wasm32)
 @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_OptionalSupportImports_jsRoundTripOptionalStringToStringDictionaryNull_static")
-fileprivate func bjs_OptionalSupportImports_jsRoundTripOptionalStringToStringDictionaryNull_static_extern(_ v: Int32) -> Void
+fileprivate func bjs_OptionalSupportImports_jsRoundTripOptionalStringToStringDictionaryNull_static_extern() -> Void
 #else
-fileprivate func bjs_OptionalSupportImports_jsRoundTripOptionalStringToStringDictionaryNull_static_extern(_ v: Int32) -> Void {
+fileprivate func bjs_OptionalSupportImports_jsRoundTripOptionalStringToStringDictionaryNull_static_extern() -> Void {
     fatalError("Only available on WebAssembly")
 }
 #endif
-@inline(never) fileprivate func bjs_OptionalSupportImports_jsRoundTripOptionalStringToStringDictionaryNull_static(_ v: Int32) -> Void {
-    return bjs_OptionalSupportImports_jsRoundTripOptionalStringToStringDictionaryNull_static_extern(v)
+@inline(never) fileprivate func bjs_OptionalSupportImports_jsRoundTripOptionalStringToStringDictionaryNull_static() -> Void {
+    return bjs_OptionalSupportImports_jsRoundTripOptionalStringToStringDictionaryNull_static_extern()
 }
 
 #if arch(wasm32)
 @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_OptionalSupportImports_jsRoundTripOptionalStringToStringDictionaryUndefined_static")
-fileprivate func bjs_OptionalSupportImports_jsRoundTripOptionalStringToStringDictionaryUndefined_static_extern(_ v: Int32) -> Void
+fileprivate func bjs_OptionalSupportImports_jsRoundTripOptionalStringToStringDictionaryUndefined_static_extern() -> Void
+#else
+fileprivate func bjs_OptionalSupportImports_jsRoundTripOptionalStringToStringDictionaryUndefined_static_extern() -> Void {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func bjs_OptionalSupportImports_jsRoundTripOptionalStringToStringDictionaryUndefined_static() -> Void {
+    return bjs_OptionalSupportImports_jsRoundTripOptionalStringToStringDictionaryUndefined_static_extern()
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_OptionalSupportImports_jsRoundTripOptionalJSObjectNull_static")
+fileprivate func bjs_OptionalSupportImports_jsRoundTripOptionalJSObjectNull_static_extern(_ valueIsSome: Int32, _ valueValue: Int32) -> Void
 #else
-fileprivate func bjs_OptionalSupportImports_jsRoundTripOptionalStringToStringDictionaryUndefined_static_extern(_ v: Int32) -> Void {
+fileprivate func bjs_OptionalSupportImports_jsRoundTripOptionalJSObjectNull_static_extern(_ valueIsSome: Int32, _ valueValue: Int32) -> Void {
     fatalError("Only available on WebAssembly")
 }
 #endif
-@inline(never) fileprivate func bjs_OptionalSupportImports_jsRoundTripOptionalStringToStringDictionaryUndefined_static(_ v: Int32) -> Void {
-    return bjs_OptionalSupportImports_jsRoundTripOptionalStringToStringDictionaryUndefined_static_extern(v)
+@inline(never) fileprivate func bjs_OptionalSupportImports_jsRoundTripOptionalJSObjectNull_static(_ valueIsSome: Int32, _ valueValue: Int32) -> Void {
+    return bjs_OptionalSupportImports_jsRoundTripOptionalJSObjectNull_static_extern(valueIsSome, valueValue)
 }
 
 #if arch(wasm32)
@@ -14127,8 +19251,8 @@ func _$OptionalSupportImports_jsRoundTripOptionalStringUndefined(_ name: JSUndef
 }
 
 func _$OptionalSupportImports_jsRoundTripOptionalJSValueArrayNull(_ v: Optional<[JSValue]>) throws(JSException) -> Optional<[JSValue]> {
-    let vIsSome = v.bridgeJSLowerParameter()
-    bjs_OptionalSupportImports_jsRoundTripOptionalJSValueArrayNull_static(vIsSome)
+    let _ = v.bridgeJSLowerParameter()
+    bjs_OptionalSupportImports_jsRoundTripOptionalJSValueArrayNull_static()
     if let error = _swift_js_take_exception() {
         throw error
     }
@@ -14136,8 +19260,8 @@ func _$OptionalSupportImports_jsRoundTripOptionalJSValueArrayNull(_ v: Optional<
 }
 
 func _$OptionalSupportImports_jsRoundTripOptionalJSValueArrayUndefined(_ v: JSUndefinedOr<[JSValue]>) throws(JSException) -> JSUndefinedOr<[JSValue]> {
-    let vIsSome = v.bridgeJSLowerParameter()
-    bjs_OptionalSupportImports_jsRoundTripOptionalJSValueArrayUndefined_static(vIsSome)
+    let _ = v.bridgeJSLowerParameter()
+    bjs_OptionalSupportImports_jsRoundTripOptionalJSValueArrayUndefined_static()
     if let error = _swift_js_take_exception() {
         throw error
     }
@@ -14145,8 +19269,8 @@ func _$OptionalSupportImports_jsRoundTripOptionalJSValueArrayUndefined(_ v: JSUn
 }
 
 func _$OptionalSupportImports_jsRoundTripOptionalStringToStringDictionaryNull(_ v: Optional<[String: String]>) throws(JSException) -> Optional<[String: String]> {
-    let vIsSome = v.bridgeJSLowerParameter()
-    bjs_OptionalSupportImports_jsRoundTripOptionalStringToStringDictionaryNull_static(vIsSome)
+    let _ = v.bridgeJSLowerParameter()
+    bjs_OptionalSupportImports_jsRoundTripOptionalStringToStringDictionaryNull_static()
     if let error = _swift_js_take_exception() {
         throw error
     }
@@ -14154,14 +19278,23 @@ func _$OptionalSupportImports_jsRoundTripOptionalStringToStringDictionaryNull(_
 }
 
 func _$OptionalSupportImports_jsRoundTripOptionalStringToStringDictionaryUndefined(_ v: JSUndefinedOr<[String: String]>) throws(JSException) -> JSUndefinedOr<[String: String]> {
-    let vIsSome = v.bridgeJSLowerParameter()
-    bjs_OptionalSupportImports_jsRoundTripOptionalStringToStringDictionaryUndefined_static(vIsSome)
+    let _ = v.bridgeJSLowerParameter()
+    bjs_OptionalSupportImports_jsRoundTripOptionalStringToStringDictionaryUndefined_static()
     if let error = _swift_js_take_exception() {
         throw error
     }
     return JSUndefinedOr<[String: String]>.bridgeJSLiftReturn()
 }
 
+func _$OptionalSupportImports_jsRoundTripOptionalJSObjectNull(_ value: Optional<JSObject>) throws(JSException) -> Optional<JSObject> {
+    let (valueIsSome, valueValue) = value.bridgeJSLowerParameter()
+    bjs_OptionalSupportImports_jsRoundTripOptionalJSObjectNull_static(valueIsSome, valueValue)
+    if let error = _swift_js_take_exception() {
+        throw error
+    }
+    return Optional<JSObject>.bridgeJSLiftReturn()
+}
+
 func _$OptionalSupportImports_runJsOptionalSupportTests() throws(JSException) -> Void {
     bjs_OptionalSupportImports_runJsOptionalSupportTests_static()
     if let error = _swift_js_take_exception() {
@@ -14289,4 +19422,91 @@ func _$SwiftClassSupportImports_jsConsumeOptionalLeakCheck(_ value: Optional<Lea
     if let error = _swift_js_take_exception() {
         throw error
     }
-}
\ No newline at end of file
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "bjs", name: "bjs_BridgeJSRuntimeTests_register_type_handles")
+fileprivate func _bjs_BridgeJSRuntimeTests_register_type_handles_extern(_ base: UnsafePointer<Int32>?, _ count: Int32)
+
+@_expose(wasm, "bjs_BridgeJSRuntimeTests_register_type_handles")
+public func _bjs_BridgeJSRuntimeTests_register_type_handles() {
+    let typeIds: [Int32] = [
+        JSCoordinate.bridgeJSTypeID,
+        NestedStructGroupA.Metadata.bridgeJSTypeID,
+        NestedStructGroupB.Metadata.bridgeJSTypeID,
+        NestedTypeHost.Label.bridgeJSTypeID,
+        Library.Shelf.bridgeJSTypeID,
+        Library.Shelf.Divider.bridgeJSTypeID,
+        GenericRTPoint.bridgeJSTypeID,
+        GenericRTNamespace.Metadata.bridgeJSTypeID,
+        Point.bridgeJSTypeID,
+        PointerFields.bridgeJSTypeID,
+        DataPoint.bridgeJSTypeID,
+        PublicPoint.bridgeJSTypeID,
+        Address.bridgeJSTypeID,
+        Contact.bridgeJSTypeID,
+        Config.bridgeJSTypeID,
+        SessionData.bridgeJSTypeID,
+        ValidationReport.bridgeJSTypeID,
+        AdvancedConfig.bridgeJSTypeID,
+        MeasurementConfig.bridgeJSTypeID,
+        MathOperations.bridgeJSTypeID,
+        CopyableCart.bridgeJSTypeID,
+        CopyableCartItem.bridgeJSTypeID,
+        CopyableNestedCart.bridgeJSTypeID,
+        ConfigStruct.bridgeJSTypeID,
+        Vector2D.bridgeJSTypeID,
+        JSObjectContainer.bridgeJSTypeID,
+        FooContainer.bridgeJSTypeID,
+        ArrayMembers.bridgeJSTypeID,
+        PolygonReference.bridgeJSTypeID,
+        TagReference.bridgeJSTypeID,
+        TagHolderReference.bridgeJSTypeID,
+        PriorityReference.bridgeJSTypeID,
+        ImportGenericBox.bridgeJSTypeID,
+        Severity.bridgeJSTypeID,
+        Shape.bridgeJSTypeID,
+        InnerTag.bridgeJSTypeID,
+        AsyncImportedPayloadResult.bridgeJSTypeID,
+        Workspace.Kind.bridgeJSTypeID,
+        Direction.bridgeJSTypeID,
+        Status.bridgeJSTypeID,
+        Theme.bridgeJSTypeID,
+        HttpStatus.bridgeJSTypeID,
+        FileSize.bridgeJSTypeID,
+        SessionId.bridgeJSTypeID,
+        Precision.bridgeJSTypeID,
+        Ratio.bridgeJSTypeID,
+        TSDirection.bridgeJSTypeID,
+        TSTheme.bridgeJSTypeID,
+        AsyncPayloadResult.bridgeJSTypeID,
+        Networking.API.Method.bridgeJSTypeID,
+        Configuration.LogLevel.bridgeJSTypeID,
+        Configuration.Port.bridgeJSTypeID,
+        Internal.SupportedMethod.bridgeJSTypeID,
+        APIResult.bridgeJSTypeID,
+        ComplexResult.bridgeJSTypeID,
+        Utilities.Result.bridgeJSTypeID,
+        API.NetworkingResult.bridgeJSTypeID,
+        AllTypesResult.bridgeJSTypeID,
+        TypedPayloadResult.bridgeJSTypeID,
+        StaticCalculator.bridgeJSTypeID,
+        StaticPropertyEnum.bridgeJSTypeID,
+        NestedTypeHost.Variant.bridgeJSTypeID,
+        Message.bridgeJSTypeID,
+        Library.Genre.bridgeJSTypeID,
+        Message.Update.bridgeJSTypeID,
+        LightColor.bridgeJSTypeID,
+        ImportedPayloadSignal.bridgeJSTypeID,
+        GenericRTColor.bridgeJSTypeID,
+        GenericRTMode.bridgeJSTypeID,
+        GenericRTLevel.bridgeJSTypeID,
+        GenericRTOutcome.bridgeJSTypeID,
+        OptionalAllTypesResult.bridgeJSTypeID,
+        APIOptionalResult.bridgeJSTypeID,
+    ]
+    typeIds.withUnsafeBufferPointer { buffer in
+        _bjs_BridgeJSRuntimeTests_register_type_handles_extern(buffer.baseAddress, Int32(buffer.count))
+    }
+}
+#endif
\ No newline at end of file
diff --git a/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.json b/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.json
index 94142f470..c1a3e26cc 100644
--- a/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.json
+++ b/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.json
@@ -1,127 +1,240 @@
 {
   "exported" : {
+    "aliases" : [
+      {
+        "swiftCallName" : "Polygon",
+        "underlying" : {
+          "swiftHeapObject" : {
+            "_0" : "PolygonReference"
+          }
+        }
+      },
+      {
+        "swiftCallName" : "Tag",
+        "underlying" : {
+          "swiftHeapObject" : {
+            "_0" : "TagReference"
+          }
+        }
+      },
+      {
+        "swiftCallName" : "TagHolder",
+        "underlying" : {
+          "swiftHeapObject" : {
+            "_0" : "TagHolderReference"
+          }
+        }
+      },
+      {
+        "swiftCallName" : "Coordinate",
+        "underlying" : {
+          "swiftStruct" : {
+            "_0" : "JSCoordinate"
+          }
+        }
+      },
+      {
+        "swiftCallName" : "Priority",
+        "underlying" : {
+          "swiftHeapObject" : {
+            "_0" : "PriorityReference"
+          }
+        }
+      },
+      {
+        "swiftCallName" : "Alert",
+        "underlying" : {
+          "caseEnum" : {
+            "_0" : "Severity"
+          }
+        }
+      },
+      {
+        "swiftCallName" : "UserId",
+        "underlying" : {
+          "integer" : {
+            "_0" : {
+              "isSigned" : true,
+              "width" : "word"
+            }
+          }
+        }
+      },
+      {
+        "swiftCallName" : "Tagged",
+        "underlying" : {
+          "string" : {
+
+          }
+        }
+      },
+      {
+        "swiftCallName" : "Canvas",
+        "underlying" : {
+          "jsObject" : {
+            "_0" : "Surface"
+          }
+        }
+      },
+      {
+        "swiftCallName" : "AliasedTag",
+        "underlying" : {
+          "associatedValueEnum" : {
+            "_0" : "InnerTag"
+          }
+        }
+      },
+      {
+        "swiftCallName" : "Boxed",
+        "underlying" : {
+          "jsValue" : {
+
+          }
+        }
+      }
+    ],
     "classes" : [
       {
+        "constructor" : {
+          "abiName" : "bjs_PolygonReference_init",
+          "effects" : {
+            "isAsync" : false,
+            "isStatic" : false,
+            "isThrows" : false
+          },
+          "parameters" : [
+            {
+              "label" : "verticesData",
+              "name" : "verticesData",
+              "type" : {
+                "array" : {
+                  "_0" : {
+                    "double" : {
+
+                    }
+                  }
+                }
+              }
+            },
+            {
+              "label" : "label",
+              "name" : "label",
+              "type" : {
+                "string" : {
+
+                }
+              }
+            }
+          ]
+        },
+        "isFinal" : true,
         "methods" : [
           {
-            "abiName" : "bjs_ClosureSupportExports_static_makeIntToInt",
+            "abiName" : "bjs_PolygonReference_vertexCount",
             "effects" : {
               "isAsync" : false,
-              "isStatic" : true,
+              "isStatic" : false,
               "isThrows" : false
             },
-            "name" : "makeIntToInt",
+            "name" : "vertexCount",
             "parameters" : [
-              {
-                "label" : "_",
-                "name" : "base",
-                "type" : {
-                  "integer" : {
-                    "_0" : {
-                      "isSigned" : true,
-                      "width" : "word"
-                    }
-                  }
+
+            ],
+            "returnType" : {
+              "integer" : {
+                "_0" : {
+                  "isSigned" : true,
+                  "width" : "word"
                 }
               }
+            }
+          },
+          {
+            "abiName" : "bjs_PolygonReference_summary",
+            "effects" : {
+              "isAsync" : false,
+              "isStatic" : false,
+              "isThrows" : false
+            },
+            "name" : "summary",
+            "parameters" : [
+
             ],
             "returnType" : {
-              "closure" : {
-                "_0" : {
-                  "isAsync" : false,
-                  "isThrows" : false,
-                  "mangleName" : "20BridgeJSRuntimeTestsSi_Si",
-                  "moduleName" : "BridgeJSRuntimeTests",
-                  "parameters" : [
-                    {
-                      "integer" : {
-                        "_0" : {
-                          "isSigned" : true,
-                          "width" : "word"
-                        }
-                      }
-                    }
-                  ],
-                  "returnType" : {
-                    "integer" : {
-                      "_0" : {
-                        "isSigned" : true,
-                        "width" : "word"
-                      }
-                    }
-                  },
-                  "sendingParameters" : false
-                },
-                "useJSTypedClosure" : false
+              "string" : {
+
               }
+            }
+          },
+          {
+            "abiName" : "bjs_PolygonReference_snapshot",
+            "effects" : {
+              "isAsync" : false,
+              "isStatic" : false,
+              "isThrows" : false
             },
-            "staticContext" : {
-              "className" : {
-                "_0" : "ClosureSupportExports"
+            "name" : "snapshot",
+            "parameters" : [
+
+            ],
+            "returnType" : {
+              "alias" : {
+                "name" : "Polygon",
+                "underlying" : {
+                  "swiftHeapObject" : {
+                    "_0" : "PolygonReference"
+                  }
+                }
               }
             }
           },
           {
-            "abiName" : "bjs_ClosureSupportExports_static_makeDoubleToDouble",
+            "abiName" : "bjs_PolygonReference_merge",
             "effects" : {
               "isAsync" : false,
-              "isStatic" : true,
+              "isStatic" : false,
               "isThrows" : false
             },
-            "name" : "makeDoubleToDouble",
+            "name" : "merge",
             "parameters" : [
               {
                 "label" : "_",
-                "name" : "base",
+                "name" : "other",
                 "type" : {
-                  "double" : {
-
+                  "alias" : {
+                    "name" : "Polygon",
+                    "underlying" : {
+                      "swiftHeapObject" : {
+                        "_0" : "PolygonReference"
+                      }
+                    }
                   }
                 }
               }
             ],
             "returnType" : {
-              "closure" : {
-                "_0" : {
-                  "isAsync" : false,
-                  "isThrows" : false,
-                  "mangleName" : "20BridgeJSRuntimeTestsSd_Sd",
-                  "moduleName" : "BridgeJSRuntimeTests",
-                  "parameters" : [
-                    {
-                      "double" : {
-
-                      }
-                    }
-                  ],
-                  "returnType" : {
-                    "double" : {
-
-                    }
-                  },
-                  "sendingParameters" : false
-                },
-                "useJSTypedClosure" : false
-              }
-            },
-            "staticContext" : {
-              "className" : {
-                "_0" : "ClosureSupportExports"
+              "alias" : {
+                "name" : "Polygon",
+                "underlying" : {
+                  "swiftHeapObject" : {
+                    "_0" : "PolygonReference"
+                  }
+                }
               }
             }
           },
           {
-            "abiName" : "bjs_ClosureSupportExports_static_makeStringToString",
+            "abiName" : "bjs_PolygonReference_static_origin",
             "effects" : {
               "isAsync" : false,
               "isStatic" : true,
               "isThrows" : false
             },
-            "name" : "makeStringToString",
+            "name" : "origin",
             "parameters" : [
               {
-                "label" : "_",
-                "name" : "prefix",
+                "label" : "label",
+                "name" : "label",
                 "type" : {
                   "string" : {
 
@@ -130,50 +243,290 @@
               }
             ],
             "returnType" : {
-              "closure" : {
-                "_0" : {
-                  "isAsync" : false,
-                  "isThrows" : false,
-                  "mangleName" : "20BridgeJSRuntimeTestsSS_SS",
-                  "moduleName" : "BridgeJSRuntimeTests",
-                  "parameters" : [
-                    {
-                      "string" : {
-
-                      }
-                    }
-                  ],
-                  "returnType" : {
-                    "string" : {
-
-                    }
-                  },
-                  "sendingParameters" : false
-                },
-                "useJSTypedClosure" : false
+              "alias" : {
+                "name" : "Polygon",
+                "underlying" : {
+                  "swiftHeapObject" : {
+                    "_0" : "PolygonReference"
+                  }
+                }
               }
             },
             "staticContext" : {
               "className" : {
-                "_0" : "ClosureSupportExports"
+                "_0" : "PolygonReference"
               }
             }
-          },
+          }
+        ],
+        "name" : "PolygonReference",
+        "properties" : [
+
+        ],
+        "swiftCallName" : "PolygonReference"
+      },
+      {
+        "isFinal" : true,
+        "methods" : [
           {
-            "abiName" : "bjs_ClosureSupportExports_static_makeJSIntToInt",
+            "abiName" : "bjs_TagReference_describe",
             "effects" : {
               "isAsync" : false,
-              "isStatic" : true,
+              "isStatic" : false,
               "isThrows" : false
             },
-            "name" : "makeJSIntToInt",
+            "name" : "describe",
             "parameters" : [
-              {
-                "label" : "_",
-                "name" : "base",
-                "type" : {
-                  "integer" : {
-                    "_0" : {
+
+            ],
+            "returnType" : {
+              "string" : {
+
+              }
+            }
+          }
+        ],
+        "name" : "TagReference",
+        "properties" : [
+
+        ],
+        "swiftCallName" : "TagReference"
+      },
+      {
+        "constructor" : {
+          "abiName" : "bjs_TagHolderReference_init",
+          "effects" : {
+            "isAsync" : false,
+            "isStatic" : false,
+            "isThrows" : false
+          },
+          "parameters" : [
+            {
+              "label" : "tag",
+              "name" : "tag",
+              "type" : {
+                "alias" : {
+                  "name" : "Tag",
+                  "underlying" : {
+                    "swiftHeapObject" : {
+                      "_0" : "TagReference"
+                    }
+                  }
+                }
+              }
+            },
+            {
+              "label" : "version",
+              "name" : "version",
+              "type" : {
+                "integer" : {
+                  "_0" : {
+                    "isSigned" : true,
+                    "width" : "word"
+                  }
+                }
+              }
+            }
+          ]
+        },
+        "isFinal" : true,
+        "methods" : [
+          {
+            "abiName" : "bjs_TagHolderReference_describe",
+            "effects" : {
+              "isAsync" : false,
+              "isStatic" : false,
+              "isThrows" : false
+            },
+            "name" : "describe",
+            "parameters" : [
+
+            ],
+            "returnType" : {
+              "string" : {
+
+              }
+            }
+          }
+        ],
+        "name" : "TagHolderReference",
+        "properties" : [
+          {
+            "isReadonly" : false,
+            "isStatic" : false,
+            "name" : "tag",
+            "type" : {
+              "alias" : {
+                "name" : "Tag",
+                "underlying" : {
+                  "swiftHeapObject" : {
+                    "_0" : "TagReference"
+                  }
+                }
+              }
+            }
+          },
+          {
+            "isReadonly" : false,
+            "isStatic" : false,
+            "name" : "version",
+            "type" : {
+              "integer" : {
+                "_0" : {
+                  "isSigned" : true,
+                  "width" : "word"
+                }
+              }
+            }
+          }
+        ],
+        "swiftCallName" : "TagHolderReference"
+      },
+      {
+        "isFinal" : true,
+        "methods" : [
+          {
+            "abiName" : "bjs_PriorityReference_describe",
+            "effects" : {
+              "isAsync" : false,
+              "isStatic" : false,
+              "isThrows" : false
+            },
+            "name" : "describe",
+            "parameters" : [
+
+            ],
+            "returnType" : {
+              "string" : {
+
+              }
+            }
+          },
+          {
+            "abiName" : "bjs_PriorityReference_weight",
+            "effects" : {
+              "isAsync" : false,
+              "isStatic" : false,
+              "isThrows" : false
+            },
+            "name" : "weight",
+            "parameters" : [
+
+            ],
+            "returnType" : {
+              "integer" : {
+                "_0" : {
+                  "isSigned" : true,
+                  "width" : "word"
+                }
+              }
+            }
+          },
+          {
+            "abiName" : "bjs_PriorityReference_static_low",
+            "effects" : {
+              "isAsync" : false,
+              "isStatic" : true,
+              "isThrows" : false
+            },
+            "name" : "low",
+            "parameters" : [
+
+            ],
+            "returnType" : {
+              "alias" : {
+                "name" : "Priority",
+                "underlying" : {
+                  "swiftHeapObject" : {
+                    "_0" : "PriorityReference"
+                  }
+                }
+              }
+            },
+            "staticContext" : {
+              "className" : {
+                "_0" : "PriorityReference"
+              }
+            }
+          },
+          {
+            "abiName" : "bjs_PriorityReference_static_medium",
+            "effects" : {
+              "isAsync" : false,
+              "isStatic" : true,
+              "isThrows" : false
+            },
+            "name" : "medium",
+            "parameters" : [
+
+            ],
+            "returnType" : {
+              "alias" : {
+                "name" : "Priority",
+                "underlying" : {
+                  "swiftHeapObject" : {
+                    "_0" : "PriorityReference"
+                  }
+                }
+              }
+            },
+            "staticContext" : {
+              "className" : {
+                "_0" : "PriorityReference"
+              }
+            }
+          },
+          {
+            "abiName" : "bjs_PriorityReference_static_high",
+            "effects" : {
+              "isAsync" : false,
+              "isStatic" : true,
+              "isThrows" : false
+            },
+            "name" : "high",
+            "parameters" : [
+
+            ],
+            "returnType" : {
+              "alias" : {
+                "name" : "Priority",
+                "underlying" : {
+                  "swiftHeapObject" : {
+                    "_0" : "PriorityReference"
+                  }
+                }
+              }
+            },
+            "staticContext" : {
+              "className" : {
+                "_0" : "PriorityReference"
+              }
+            }
+          }
+        ],
+        "name" : "PriorityReference",
+        "properties" : [
+
+        ],
+        "swiftCallName" : "PriorityReference"
+      },
+      {
+        "methods" : [
+          {
+            "abiName" : "bjs_ClosureSupportExports_static_makeIntToInt",
+            "effects" : {
+              "isAsync" : false,
+              "isStatic" : true,
+              "isThrows" : false
+            },
+            "name" : "makeIntToInt",
+            "parameters" : [
+              {
+                "label" : "_",
+                "name" : "base",
+                "type" : {
+                  "integer" : {
+                    "_0" : {
                       "isSigned" : true,
                       "width" : "word"
                     }
@@ -208,7 +561,7 @@
                   },
                   "sendingParameters" : false
                 },
-                "useJSTypedClosure" : true
+                "useJSTypedClosure" : false
               }
             },
             "staticContext" : {
@@ -218,13 +571,13 @@
             }
           },
           {
-            "abiName" : "bjs_ClosureSupportExports_static_makeJSDoubleToDouble",
+            "abiName" : "bjs_ClosureSupportExports_static_makeDoubleToDouble",
             "effects" : {
               "isAsync" : false,
               "isStatic" : true,
               "isThrows" : false
             },
-            "name" : "makeJSDoubleToDouble",
+            "name" : "makeDoubleToDouble",
             "parameters" : [
               {
                 "label" : "_",
@@ -257,7 +610,7 @@
                   },
                   "sendingParameters" : false
                 },
-                "useJSTypedClosure" : true
+                "useJSTypedClosure" : false
               }
             },
             "staticContext" : {
@@ -267,13 +620,13 @@
             }
           },
           {
-            "abiName" : "bjs_ClosureSupportExports_static_makeJSStringToString",
+            "abiName" : "bjs_ClosureSupportExports_static_makeStringToString",
             "effects" : {
               "isAsync" : false,
               "isStatic" : true,
               "isThrows" : false
             },
-            "name" : "makeJSStringToString",
+            "name" : "makeStringToString",
             "parameters" : [
               {
                 "label" : "_",
@@ -306,7 +659,7 @@
                   },
                   "sendingParameters" : false
                 },
-                "useJSTypedClosure" : true
+                "useJSTypedClosure" : false
               }
             },
             "staticContext" : {
@@ -314,36 +667,237 @@
                 "_0" : "ClosureSupportExports"
               }
             }
-          }
-        ],
-        "name" : "ClosureSupportExports",
-        "properties" : [
-
-        ],
-        "swiftCallName" : "ClosureSupportExports"
-      },
-      {
-        "constructor" : {
-          "abiName" : "bjs_DefaultArgumentConstructorDefaults_init",
-          "effects" : {
-            "isAsync" : false,
-            "isStatic" : false,
-            "isThrows" : false
           },
-          "parameters" : [
-            {
-              "defaultValue" : {
-                "string" : {
-                  "_0" : "Default"
-                }
-              },
-              "label" : "name",
-              "name" : "name",
-              "type" : {
-                "string" : {
-
-                }
-              }
+          {
+            "abiName" : "bjs_ClosureSupportExports_static_makeJSIntToInt",
+            "effects" : {
+              "isAsync" : false,
+              "isStatic" : true,
+              "isThrows" : false
+            },
+            "name" : "makeJSIntToInt",
+            "parameters" : [
+              {
+                "label" : "_",
+                "name" : "base",
+                "type" : {
+                  "integer" : {
+                    "_0" : {
+                      "isSigned" : true,
+                      "width" : "word"
+                    }
+                  }
+                }
+              }
+            ],
+            "returnType" : {
+              "closure" : {
+                "_0" : {
+                  "isAsync" : false,
+                  "isThrows" : false,
+                  "mangleName" : "20BridgeJSRuntimeTestsSi_Si",
+                  "moduleName" : "BridgeJSRuntimeTests",
+                  "parameters" : [
+                    {
+                      "integer" : {
+                        "_0" : {
+                          "isSigned" : true,
+                          "width" : "word"
+                        }
+                      }
+                    }
+                  ],
+                  "returnType" : {
+                    "integer" : {
+                      "_0" : {
+                        "isSigned" : true,
+                        "width" : "word"
+                      }
+                    }
+                  },
+                  "sendingParameters" : false
+                },
+                "useJSTypedClosure" : true
+              }
+            },
+            "staticContext" : {
+              "className" : {
+                "_0" : "ClosureSupportExports"
+              }
+            }
+          },
+          {
+            "abiName" : "bjs_ClosureSupportExports_static_makeJSDoubleToDouble",
+            "effects" : {
+              "isAsync" : false,
+              "isStatic" : true,
+              "isThrows" : false
+            },
+            "name" : "makeJSDoubleToDouble",
+            "parameters" : [
+              {
+                "label" : "_",
+                "name" : "base",
+                "type" : {
+                  "double" : {
+
+                  }
+                }
+              }
+            ],
+            "returnType" : {
+              "closure" : {
+                "_0" : {
+                  "isAsync" : false,
+                  "isThrows" : false,
+                  "mangleName" : "20BridgeJSRuntimeTestsSd_Sd",
+                  "moduleName" : "BridgeJSRuntimeTests",
+                  "parameters" : [
+                    {
+                      "double" : {
+
+                      }
+                    }
+                  ],
+                  "returnType" : {
+                    "double" : {
+
+                    }
+                  },
+                  "sendingParameters" : false
+                },
+                "useJSTypedClosure" : true
+              }
+            },
+            "staticContext" : {
+              "className" : {
+                "_0" : "ClosureSupportExports"
+              }
+            }
+          },
+          {
+            "abiName" : "bjs_ClosureSupportExports_static_makeJSStringToString",
+            "effects" : {
+              "isAsync" : false,
+              "isStatic" : true,
+              "isThrows" : false
+            },
+            "name" : "makeJSStringToString",
+            "parameters" : [
+              {
+                "label" : "_",
+                "name" : "prefix",
+                "type" : {
+                  "string" : {
+
+                  }
+                }
+              }
+            ],
+            "returnType" : {
+              "closure" : {
+                "_0" : {
+                  "isAsync" : false,
+                  "isThrows" : false,
+                  "mangleName" : "20BridgeJSRuntimeTestsSS_SS",
+                  "moduleName" : "BridgeJSRuntimeTests",
+                  "parameters" : [
+                    {
+                      "string" : {
+
+                      }
+                    }
+                  ],
+                  "returnType" : {
+                    "string" : {
+
+                    }
+                  },
+                  "sendingParameters" : false
+                },
+                "useJSTypedClosure" : true
+              }
+            },
+            "staticContext" : {
+              "className" : {
+                "_0" : "ClosureSupportExports"
+              }
+            }
+          }
+        ],
+        "name" : "ClosureSupportExports",
+        "properties" : [
+
+        ],
+        "swiftCallName" : "ClosureSupportExports"
+      },
+      {
+        "constructor" : {
+          "abiName" : "bjs_Workspace_init",
+          "effects" : {
+            "isAsync" : false,
+            "isStatic" : false,
+            "isThrows" : false
+          },
+          "parameters" : [
+            {
+              "label" : "name",
+              "name" : "name",
+              "type" : {
+                "string" : {
+
+                }
+              }
+            }
+          ]
+        },
+        "methods" : [
+          {
+            "abiName" : "bjs_Workspace_describe",
+            "effects" : {
+              "isAsync" : false,
+              "isStatic" : false,
+              "isThrows" : false
+            },
+            "name" : "describe",
+            "parameters" : [
+
+            ],
+            "returnType" : {
+              "string" : {
+
+              }
+            }
+          }
+        ],
+        "name" : "Workspace",
+        "properties" : [
+
+        ],
+        "swiftCallName" : "Workspace"
+      },
+      {
+        "constructor" : {
+          "abiName" : "bjs_DefaultArgumentConstructorDefaults_init",
+          "effects" : {
+            "isAsync" : false,
+            "isStatic" : false,
+            "isThrows" : false
+          },
+          "parameters" : [
+            {
+              "defaultValue" : {
+                "string" : {
+                  "_0" : "Default"
+                }
+              },
+              "label" : "name",
+              "name" : "name",
+              "type" : {
+                "string" : {
+
+                }
+              }
             },
             {
               "defaultValue" : {
@@ -908,6 +1462,46 @@
                 }
               }
             }
+          },
+          {
+            "abiName" : "bjs_Calculator_asyncMakePoint",
+            "effects" : {
+              "isAsync" : true,
+              "isStatic" : false,
+              "isThrows" : false
+            },
+            "name" : "asyncMakePoint",
+            "parameters" : [
+              {
+                "label" : "x",
+                "name" : "x",
+                "type" : {
+                  "integer" : {
+                    "_0" : {
+                      "isSigned" : true,
+                      "width" : "word"
+                    }
+                  }
+                }
+              },
+              {
+                "label" : "y",
+                "name" : "y",
+                "type" : {
+                  "integer" : {
+                    "_0" : {
+                      "isSigned" : true,
+                      "width" : "word"
+                    }
+                  }
+                }
+              }
+            ],
+            "returnType" : {
+              "swiftStruct" : {
+                "_0" : "PublicPoint"
+              }
+            }
           }
         ],
         "name" : "Calculator",
@@ -4152,8 +4746,106 @@
 
               }
             }
-          }
-        ],
+          },
+          {
+            "abiName" : "bjs_TextProcessor_observeVector",
+            "documentation" : "Swift→JS callback with a struct parameter (ExportSwift stack ABI).",
+            "effects" : {
+              "isAsync" : false,
+              "isStatic" : false,
+              "isThrows" : false
+            },
+            "name" : "observeVector",
+            "parameters" : [
+              {
+                "label" : "_",
+                "name" : "callback",
+                "type" : {
+                  "closure" : {
+                    "_0" : {
+                      "isAsync" : false,
+                      "isThrows" : false,
+                      "mangleName" : "20BridgeJSRuntimeTests8Vector2DV_y",
+                      "moduleName" : "BridgeJSRuntimeTests",
+                      "parameters" : [
+                        {
+                          "swiftStruct" : {
+                            "_0" : "Vector2D"
+                          }
+                        }
+                      ],
+                      "returnType" : {
+                        "void" : {
+
+                        }
+                      },
+                      "sendingParameters" : false
+                    },
+                    "useJSTypedClosure" : false
+                  }
+                }
+              }
+            ],
+            "returnType" : {
+              "void" : {
+
+              }
+            }
+          },
+          {
+            "abiName" : "bjs_TextProcessor_mapVector",
+            "effects" : {
+              "isAsync" : false,
+              "isStatic" : false,
+              "isThrows" : false
+            },
+            "name" : "mapVector",
+            "parameters" : [
+              {
+                "label" : "_",
+                "name" : "vector",
+                "type" : {
+                  "swiftStruct" : {
+                    "_0" : "Vector2D"
+                  }
+                }
+              },
+              {
+                "label" : "_",
+                "name" : "callback",
+                "type" : {
+                  "closure" : {
+                    "_0" : {
+                      "isAsync" : false,
+                      "isThrows" : false,
+                      "mangleName" : "20BridgeJSRuntimeTests8Vector2DV_8Vector2DV",
+                      "moduleName" : "BridgeJSRuntimeTests",
+                      "parameters" : [
+                        {
+                          "swiftStruct" : {
+                            "_0" : "Vector2D"
+                          }
+                        }
+                      ],
+                      "returnType" : {
+                        "swiftStruct" : {
+                          "_0" : "Vector2D"
+                        }
+                      },
+                      "sendingParameters" : false
+                    },
+                    "useJSTypedClosure" : false
+                  }
+                }
+              }
+            ],
+            "returnType" : {
+              "swiftStruct" : {
+                "_0" : "Vector2D"
+              }
+            }
+          }
+        ],
         "name" : "TextProcessor",
         "properties" : [
 
@@ -4162,84 +4854,148 @@
       },
       {
         "constructor" : {
-          "abiName" : "bjs_OptionalHolder_init",
+          "abiName" : "bjs_NestedTypeHost_init",
           "effects" : {
             "isAsync" : false,
             "isStatic" : false,
             "isThrows" : false
           },
           "parameters" : [
-            {
-              "label" : "nullableGreeter",
-              "name" : "nullableGreeter",
-              "type" : {
-                "nullable" : {
-                  "_0" : {
-                    "swiftHeapObject" : {
-                      "_0" : "Greeter"
-                    }
-                  },
-                  "_1" : "null"
-                }
-              }
+
+          ]
+        },
+        "methods" : [
+          {
+            "abiName" : "bjs_NestedTypeHost_describe",
+            "effects" : {
+              "isAsync" : false,
+              "isStatic" : false,
+              "isThrows" : false
             },
+            "name" : "describe",
+            "parameters" : [
+
+            ],
+            "returnType" : {
+              "string" : {
+
+              }
+            }
+          }
+        ],
+        "name" : "NestedTypeHost",
+        "properties" : [
+
+        ],
+        "swiftCallName" : "NestedTypeHost"
+      },
+      {
+        "constructor" : {
+          "abiName" : "bjs_Library_init",
+          "effects" : {
+            "isAsync" : false,
+            "isStatic" : false,
+            "isThrows" : false
+          },
+          "parameters" : [
             {
-              "label" : "undefinedNumber",
-              "name" : "undefinedNumber",
+              "label" : "name",
+              "name" : "name",
               "type" : {
-                "nullable" : {
-                  "_0" : {
-                    "double" : {
+                "string" : {
 
-                    }
-                  },
-                  "_1" : "undefined"
                 }
               }
             }
           ]
         },
         "methods" : [
+          {
+            "abiName" : "bjs_Library_describe",
+            "effects" : {
+              "isAsync" : false,
+              "isStatic" : false,
+              "isThrows" : false
+            },
+            "name" : "describe",
+            "parameters" : [
 
-        ],
-        "name" : "OptionalHolder",
-        "properties" : [
+            ],
+            "returnType" : {
+              "string" : {
+
+              }
+            }
+          },
           {
-            "isReadonly" : false,
-            "isStatic" : false,
-            "name" : "nullableGreeter",
-            "type" : {
-              "nullable" : {
-                "_0" : {
-                  "swiftHeapObject" : {
-                    "_0" : "Greeter"
+            "abiName" : "bjs_Library_rename",
+            "effects" : {
+              "isAsync" : false,
+              "isStatic" : false,
+              "isThrows" : false
+            },
+            "name" : "rename",
+            "parameters" : [
+              {
+                "label" : "_",
+                "name" : "title",
+                "type" : {
+                  "string" : {
+
                   }
-                },
-                "_1" : "null"
+                }
+              }
+            ],
+            "returnType" : {
+              "string" : {
+
               }
             }
           },
+          {
+            "abiName" : "bjs_Library_shelf",
+            "effects" : {
+              "isAsync" : false,
+              "isStatic" : false,
+              "isThrows" : false
+            },
+            "name" : "shelf",
+            "parameters" : [
+              {
+                "label" : "label",
+                "name" : "label",
+                "type" : {
+                  "string" : {
+
+                  }
+                }
+              }
+            ],
+            "returnType" : {
+              "swiftStruct" : {
+                "_0" : "Library.Shelf"
+              }
+            }
+          }
+        ],
+        "name" : "Library",
+        "properties" : [
           {
             "isReadonly" : false,
             "isStatic" : false,
-            "name" : "undefinedNumber",
+            "name" : "name",
             "type" : {
-              "nullable" : {
-                "_0" : {
-                  "double" : {
+              "string" : {
 
-                  }
-                },
-                "_1" : "undefined"
               }
             }
           }
         ],
-        "swiftCallName" : "OptionalHolder"
+        "swiftCallName" : "Library"
       },
       {
         "constructor" : {
-          "abiName" : "bjs_OptionalPropertyHolder_init",
+          "abiName" : "bjs_ImportGenericBox_init",
           "effects" : {
             "isAsync" : false,
             "isStatic" : false,
@@ -4247,25 +5003,265 @@
           },
           "parameters" : [
             {
-              "label" : "optionalName",
-              "name" : "optionalName",
+              "label" : "value",
+              "name" : "value",
               "type" : {
-                "nullable" : {
+                "integer" : {
                   "_0" : {
-                    "string" : {
-
-                    }
-                  },
-                  "_1" : "null"
+                    "isSigned" : true,
+                    "width" : "word"
+                  }
                 }
               }
             }
           ]
         },
+        "isFinal" : true,
         "methods" : [
+          {
+            "abiName" : "bjs_ImportGenericBox_get",
+            "effects" : {
+              "isAsync" : false,
+              "isStatic" : false,
+              "isThrows" : false
+            },
+            "name" : "get",
+            "parameters" : [
 
+            ],
+            "returnType" : {
+              "integer" : {
+                "_0" : {
+                  "isSigned" : true,
+                  "width" : "word"
+                }
+              }
+            }
+          }
         ],
-        "name" : "OptionalPropertyHolder",
+        "name" : "ImportGenericBox",
+        "properties" : [
+          {
+            "isReadonly" : false,
+            "isStatic" : false,
+            "name" : "value",
+            "type" : {
+              "integer" : {
+                "_0" : {
+                  "isSigned" : true,
+                  "width" : "word"
+                }
+              }
+            }
+          }
+        ],
+        "swiftCallName" : "ImportGenericBox"
+      },
+      {
+        "constructor" : {
+          "abiName" : "bjs_JSNameRenamedClass_init",
+          "effects" : {
+            "isAsync" : false,
+            "isStatic" : false,
+            "isThrows" : false
+          },
+          "parameters" : [
+            {
+              "label" : "value",
+              "name" : "value",
+              "type" : {
+                "integer" : {
+                  "_0" : {
+                    "isSigned" : true,
+                    "width" : "word"
+                  }
+                }
+              }
+            }
+          ]
+        },
+        "methods" : [
+          {
+            "abiName" : "bjs_JSNameRenamedClass_doubled",
+            "effects" : {
+              "isAsync" : false,
+              "isStatic" : false,
+              "isThrows" : false
+            },
+            "jsName" : "doubled",
+            "name" : "timesTwo",
+            "parameters" : [
+
+            ],
+            "returnType" : {
+              "integer" : {
+                "_0" : {
+                  "isSigned" : true,
+                  "width" : "word"
+                }
+              }
+            }
+          },
+          {
+            "abiName" : "bjs_JSNameRenamedClass_static_makeWithValue",
+            "effects" : {
+              "isAsync" : false,
+              "isStatic" : true,
+              "isThrows" : false
+            },
+            "jsName" : "makeWithValue",
+            "name" : "create",
+            "parameters" : [
+              {
+                "label" : "value",
+                "name" : "value",
+                "type" : {
+                  "integer" : {
+                    "_0" : {
+                      "isSigned" : true,
+                      "width" : "word"
+                    }
+                  }
+                }
+              }
+            ],
+            "returnType" : {
+              "swiftHeapObject" : {
+                "_0" : "JSNameRenamedClass"
+              }
+            },
+            "staticContext" : {
+              "className" : {
+                "_0" : "JSNameRenamedClass"
+              }
+            }
+          }
+        ],
+        "name" : "JSNameRenamedClass",
+        "properties" : [
+          {
+            "isReadonly" : false,
+            "isStatic" : false,
+            "jsName" : "current",
+            "name" : "value",
+            "type" : {
+              "integer" : {
+                "_0" : {
+                  "isSigned" : true,
+                  "width" : "word"
+                }
+              }
+            }
+          }
+        ],
+        "swiftCallName" : "JSNameRenamedClass"
+      },
+      {
+        "constructor" : {
+          "abiName" : "bjs_OptionalHolder_init",
+          "effects" : {
+            "isAsync" : false,
+            "isStatic" : false,
+            "isThrows" : false
+          },
+          "parameters" : [
+            {
+              "label" : "nullableGreeter",
+              "name" : "nullableGreeter",
+              "type" : {
+                "nullable" : {
+                  "_0" : {
+                    "swiftHeapObject" : {
+                      "_0" : "Greeter"
+                    }
+                  },
+                  "_1" : "null"
+                }
+              }
+            },
+            {
+              "label" : "undefinedNumber",
+              "name" : "undefinedNumber",
+              "type" : {
+                "nullable" : {
+                  "_0" : {
+                    "double" : {
+
+                    }
+                  },
+                  "_1" : "undefined"
+                }
+              }
+            }
+          ]
+        },
+        "methods" : [
+
+        ],
+        "name" : "OptionalHolder",
+        "properties" : [
+          {
+            "isReadonly" : false,
+            "isStatic" : false,
+            "name" : "nullableGreeter",
+            "type" : {
+              "nullable" : {
+                "_0" : {
+                  "swiftHeapObject" : {
+                    "_0" : "Greeter"
+                  }
+                },
+                "_1" : "null"
+              }
+            }
+          },
+          {
+            "isReadonly" : false,
+            "isStatic" : false,
+            "name" : "undefinedNumber",
+            "type" : {
+              "nullable" : {
+                "_0" : {
+                  "double" : {
+
+                  }
+                },
+                "_1" : "undefined"
+              }
+            }
+          }
+        ],
+        "swiftCallName" : "OptionalHolder"
+      },
+      {
+        "constructor" : {
+          "abiName" : "bjs_OptionalPropertyHolder_init",
+          "effects" : {
+            "isAsync" : false,
+            "isStatic" : false,
+            "isThrows" : false
+          },
+          "parameters" : [
+            {
+              "label" : "optionalName",
+              "name" : "optionalName",
+              "type" : {
+                "nullable" : {
+                  "_0" : {
+                    "string" : {
+
+                    }
+                  },
+                  "_1" : "null"
+                }
+              }
+            }
+          ]
+        },
+        "methods" : [
+
+        ],
+        "name" : "OptionalPropertyHolder",
         "properties" : [
           {
             "isReadonly" : false,
@@ -4411,41 +5407,145 @@
     "enums" : [
       {
         "cases" : [
+          {
+            "associatedValues" : [
+
+            ],
+            "name" : "notice"
+          },
+          {
+            "associatedValues" : [
 
+            ],
+            "name" : "warning"
+          },
+          {
+            "associatedValues" : [
+
+            ],
+            "name" : "error"
+          }
         ],
         "emitStyle" : "const",
-        "name" : "ArraySupportExports",
+        "name" : "Severity",
         "staticMethods" : [
+
+        ],
+        "staticProperties" : [
+
+        ],
+        "swiftCallName" : "Severity",
+        "tsFullPath" : "Severity"
+      },
+      {
+        "cases" : [
           {
-            "abiName" : "bjs_ArraySupportExports_static_roundTripIntArray",
-            "effects" : {
-              "isAsync" : false,
-              "isStatic" : true,
-              "isThrows" : false
-            },
-            "name" : "roundTripIntArray",
-            "namespace" : [
-              "ArraySupportExports"
-            ],
-            "parameters" : [
+            "associatedValues" : [
               {
-                "label" : "_",
-                "name" : "v",
                 "type" : {
-                  "array" : {
-                    "_0" : {
-                      "integer" : {
-                        "_0" : {
-                          "isSigned" : true,
-                          "width" : "word"
-                        }
+                  "alias" : {
+                    "name" : "Polygon",
+                    "underlying" : {
+                      "swiftHeapObject" : {
+                        "_0" : "PolygonReference"
                       }
                     }
                   }
                 }
               }
             ],
-            "returnType" : {
+            "name" : "polygon"
+          },
+          {
+            "associatedValues" : [
+
+            ],
+            "name" : "empty"
+          }
+        ],
+        "emitStyle" : "const",
+        "name" : "Shape",
+        "staticMethods" : [
+
+        ],
+        "staticProperties" : [
+
+        ],
+        "swiftCallName" : "Shape",
+        "tsFullPath" : "Shape"
+      },
+      {
+        "cases" : [
+          {
+            "associatedValues" : [
+              {
+                "type" : {
+                  "integer" : {
+                    "_0" : {
+                      "isSigned" : true,
+                      "width" : "word"
+                    }
+                  }
+                }
+              }
+            ],
+            "name" : "payload"
+          },
+          {
+            "associatedValues" : [
+
+            ],
+            "name" : "empty"
+          }
+        ],
+        "emitStyle" : "const",
+        "name" : "InnerTag",
+        "staticMethods" : [
+
+        ],
+        "staticProperties" : [
+
+        ],
+        "swiftCallName" : "InnerTag",
+        "tsFullPath" : "InnerTag"
+      },
+      {
+        "cases" : [
+
+        ],
+        "emitStyle" : "const",
+        "name" : "ArraySupportExports",
+        "staticMethods" : [
+          {
+            "abiName" : "bjs_ArraySupportExports_static_roundTripIntArray",
+            "effects" : {
+              "isAsync" : false,
+              "isStatic" : true,
+              "isThrows" : false
+            },
+            "name" : "roundTripIntArray",
+            "namespace" : [
+              "ArraySupportExports"
+            ],
+            "parameters" : [
+              {
+                "label" : "_",
+                "name" : "v",
+                "type" : {
+                  "array" : {
+                    "_0" : {
+                      "integer" : {
+                        "_0" : {
+                          "isSigned" : true,
+                          "width" : "word"
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            ],
+            "returnType" : {
               "array" : {
                 "_0" : {
                   "integer" : {
@@ -6510,6 +7610,83 @@
         "swiftCallName" : "ArraySupportExports",
         "tsFullPath" : "ArraySupportExports"
       },
+      {
+        "cases" : [
+          {
+            "associatedValues" : [
+              {
+                "type" : {
+                  "string" : {
+
+                  }
+                }
+              }
+            ],
+            "name" : "success"
+          },
+          {
+            "associatedValues" : [
+              {
+                "type" : {
+                  "integer" : {
+                    "_0" : {
+                      "isSigned" : true,
+                      "width" : "word"
+                    }
+                  }
+                }
+              }
+            ],
+            "name" : "failure"
+          },
+          {
+            "associatedValues" : [
+
+            ],
+            "name" : "idle"
+          }
+        ],
+        "emitStyle" : "const",
+        "name" : "AsyncImportedPayloadResult",
+        "staticMethods" : [
+
+        ],
+        "staticProperties" : [
+
+        ],
+        "swiftCallName" : "AsyncImportedPayloadResult",
+        "tsFullPath" : "AsyncImportedPayloadResult"
+      },
+      {
+        "cases" : [
+          {
+            "associatedValues" : [
+
+            ],
+            "name" : "personal"
+          },
+          {
+            "associatedValues" : [
+
+            ],
+            "name" : "shared"
+          }
+        ],
+        "emitStyle" : "const",
+        "name" : "Kind",
+        "namespace" : [
+          "Workspace"
+        ],
+        "rawType" : "String",
+        "staticMethods" : [
+
+        ],
+        "staticProperties" : [
+
+        ],
+        "swiftCallName" : "Workspace.Kind",
+        "tsFullPath" : "Workspace.Kind"
+      },
       {
         "cases" : [
 
@@ -7675,6 +8852,53 @@
         "swiftCallName" : "TSTheme",
         "tsFullPath" : "TSTheme"
       },
+      {
+        "cases" : [
+          {
+            "associatedValues" : [
+              {
+                "type" : {
+                  "string" : {
+
+                  }
+                }
+              }
+            ],
+            "name" : "success"
+          },
+          {
+            "associatedValues" : [
+              {
+                "type" : {
+                  "integer" : {
+                    "_0" : {
+                      "isSigned" : true,
+                      "width" : "word"
+                    }
+                  }
+                }
+              }
+            ],
+            "name" : "failure"
+          },
+          {
+            "associatedValues" : [
+
+            ],
+            "name" : "idle"
+          }
+        ],
+        "emitStyle" : "const",
+        "name" : "AsyncPayloadResult",
+        "staticMethods" : [
+
+        ],
+        "staticProperties" : [
+
+        ],
+        "swiftCallName" : "AsyncPayloadResult",
+        "tsFullPath" : "AsyncPayloadResult"
+      },
       {
         "cases" : [
 
@@ -9256,275 +10480,384 @@
       },
       {
         "cases" : [
+          {
+            "associatedValues" : [
+
+            ],
+            "name" : "primary"
+          },
+          {
+            "associatedValues" : [
 
+            ],
+            "name" : "secondary"
+          }
         ],
         "emitStyle" : "const",
-        "name" : "IntegerTypesSupportExports",
+        "name" : "Variant",
+        "namespace" : [
+          "NestedTypeHost"
+        ],
+        "rawType" : "String",
         "staticMethods" : [
+
+        ],
+        "staticProperties" : [
+
+        ],
+        "swiftCallName" : "NestedTypeHost.Variant",
+        "tsFullPath" : "NestedTypeHost.Variant"
+      },
+      {
+        "cases" : [
           {
-            "abiName" : "bjs_IntegerTypesSupportExports_static_roundTripInt",
-            "effects" : {
-              "isAsync" : false,
-              "isStatic" : true,
-              "isThrows" : false
-            },
-            "name" : "roundTripInt",
-            "namespace" : [
-              "IntegerTypesSupportExports"
-            ],
-            "parameters" : [
+            "associatedValues" : [
               {
-                "label" : "_",
-                "name" : "v",
                 "type" : {
-                  "integer" : {
-                    "_0" : {
-                      "isSigned" : true,
-                      "width" : "word"
-                    }
+                  "caseEnum" : {
+                    "_0" : "Message.Update"
                   }
                 }
               }
             ],
-            "returnType" : {
-              "integer" : {
-                "_0" : {
-                  "isSigned" : true,
-                  "width" : "word"
-                }
-              }
-            },
-            "staticContext" : {
-              "namespaceEnum" : {
-                "_0" : "IntegerTypesSupportExports"
-              }
-            }
+            "name" : "update"
           },
           {
-            "abiName" : "bjs_IntegerTypesSupportExports_static_roundTripUInt",
-            "effects" : {
-              "isAsync" : false,
-              "isStatic" : true,
-              "isThrows" : false
-            },
-            "name" : "roundTripUInt",
-            "namespace" : [
-              "IntegerTypesSupportExports"
+            "associatedValues" : [
+
             ],
-            "parameters" : [
-              {
-                "label" : "_",
-                "name" : "v",
-                "type" : {
-                  "integer" : {
-                    "_0" : {
-                      "isSigned" : false,
-                      "width" : "word"
-                    }
-                  }
-                }
-              }
+            "name" : "delete"
+          }
+        ],
+        "emitStyle" : "const",
+        "name" : "Message",
+        "staticMethods" : [
+
+        ],
+        "staticProperties" : [
+
+        ],
+        "swiftCallName" : "Message",
+        "tsFullPath" : "Message"
+      },
+      {
+        "cases" : [
+          {
+            "associatedValues" : [
+
             ],
-            "returnType" : {
-              "integer" : {
-                "_0" : {
-                  "isSigned" : false,
-                  "width" : "word"
-                }
-              }
-            },
-            "staticContext" : {
-              "namespaceEnum" : {
-                "_0" : "IntegerTypesSupportExports"
-              }
-            }
+            "name" : "fiction"
           },
           {
-            "abiName" : "bjs_IntegerTypesSupportExports_static_roundTripInt8",
-            "effects" : {
-              "isAsync" : false,
-              "isStatic" : true,
-              "isThrows" : false
-            },
-            "name" : "roundTripInt8",
-            "namespace" : [
-              "IntegerTypesSupportExports"
+            "associatedValues" : [
+
             ],
-            "parameters" : [
-              {
-                "label" : "_",
-                "name" : "v",
-                "type" : {
-                  "integer" : {
-                    "_0" : {
-                      "isSigned" : true,
-                      "width" : "w8"
-                    }
-                  }
-                }
-              }
+            "name" : "reference"
+          }
+        ],
+        "emitStyle" : "const",
+        "name" : "Genre",
+        "namespace" : [
+          "Library"
+        ],
+        "rawType" : "String",
+        "staticMethods" : [
+
+        ],
+        "staticProperties" : [
+
+        ],
+        "swiftCallName" : "Library.Genre",
+        "tsFullPath" : "Library.Genre"
+      },
+      {
+        "cases" : [
+          {
+            "associatedValues" : [
+
             ],
-            "returnType" : {
-              "integer" : {
-                "_0" : {
-                  "isSigned" : true,
-                  "width" : "w8"
-                }
-              }
-            },
-            "staticContext" : {
-              "namespaceEnum" : {
-                "_0" : "IntegerTypesSupportExports"
-              }
-            }
+            "name" : "flip"
           },
           {
-            "abiName" : "bjs_IntegerTypesSupportExports_static_roundTripUInt8",
-            "effects" : {
-              "isAsync" : false,
-              "isStatic" : true,
-              "isThrows" : false
-            },
-            "name" : "roundTripUInt8",
-            "namespace" : [
-              "IntegerTypesSupportExports"
+            "associatedValues" : [
+
             ],
-            "parameters" : [
-              {
-                "label" : "_",
-                "name" : "v",
-                "type" : {
-                  "integer" : {
-                    "_0" : {
-                      "isSigned" : false,
-                      "width" : "w8"
-                    }
-                  }
-                }
-              }
+            "name" : "rotate"
+          }
+        ],
+        "emitStyle" : "const",
+        "name" : "Update",
+        "staticMethods" : [
+
+        ],
+        "staticProperties" : [
+
+        ],
+        "swiftCallName" : "Message.Update",
+        "tsFullPath" : "Update"
+      },
+      {
+        "cases" : [
+          {
+            "associatedValues" : [
+
             ],
-            "returnType" : {
-              "integer" : {
-                "_0" : {
-                  "isSigned" : false,
-                  "width" : "w8"
-                }
-              }
-            },
-            "staticContext" : {
-              "namespaceEnum" : {
-                "_0" : "IntegerTypesSupportExports"
-              }
-            }
+            "name" : "red"
           },
           {
-            "abiName" : "bjs_IntegerTypesSupportExports_static_roundTripInt16",
-            "effects" : {
-              "isAsync" : false,
-              "isStatic" : true,
-              "isThrows" : false
-            },
-            "name" : "roundTripInt16",
-            "namespace" : [
-              "IntegerTypesSupportExports"
-            ],
-            "parameters" : [
-              {
-                "label" : "_",
-                "name" : "v",
-                "type" : {
-                  "integer" : {
-                    "_0" : {
-                      "isSigned" : true,
-                      "width" : "w16"
-                    }
-                  }
-                }
-              }
+            "associatedValues" : [
+
             ],
-            "returnType" : {
-              "integer" : {
-                "_0" : {
-                  "isSigned" : true,
-                  "width" : "w16"
-                }
-              }
-            },
-            "staticContext" : {
-              "namespaceEnum" : {
-                "_0" : "IntegerTypesSupportExports"
-              }
-            }
+            "name" : "yellow"
           },
           {
-            "abiName" : "bjs_IntegerTypesSupportExports_static_roundTripUInt16",
-            "effects" : {
-              "isAsync" : false,
-              "isStatic" : true,
-              "isThrows" : false
-            },
-            "name" : "roundTripUInt16",
-            "namespace" : [
-              "IntegerTypesSupportExports"
+            "associatedValues" : [
+
             ],
-            "parameters" : [
+            "name" : "green"
+          }
+        ],
+        "emitStyle" : "const",
+        "name" : "LightColor",
+        "staticMethods" : [
+
+        ],
+        "staticProperties" : [
+
+        ],
+        "swiftCallName" : "LightColor",
+        "tsFullPath" : "LightColor"
+      },
+      {
+        "cases" : [
+          {
+            "associatedValues" : [
               {
-                "label" : "_",
-                "name" : "v",
                 "type" : {
-                  "integer" : {
-                    "_0" : {
-                      "isSigned" : false,
-                      "width" : "w16"
-                    }
+                  "string" : {
+
                   }
                 }
               }
             ],
-            "returnType" : {
-              "integer" : {
-                "_0" : {
-                  "isSigned" : false,
-                  "width" : "w16"
-                }
-              }
-            },
-            "staticContext" : {
-              "namespaceEnum" : {
-                "_0" : "IntegerTypesSupportExports"
-              }
-            }
+            "name" : "start"
           },
           {
-            "abiName" : "bjs_IntegerTypesSupportExports_static_roundTripInt32",
-            "effects" : {
-              "isAsync" : false,
-              "isStatic" : true,
-              "isThrows" : false
-            },
-            "name" : "roundTripInt32",
-            "namespace" : [
-              "IntegerTypesSupportExports"
-            ],
-            "parameters" : [
+            "associatedValues" : [
               {
-                "label" : "_",
-                "name" : "v",
                 "type" : {
                   "integer" : {
                     "_0" : {
                       "isSigned" : true,
-                      "width" : "w32"
+                      "width" : "word"
                     }
                   }
                 }
               }
             ],
-            "returnType" : {
-              "integer" : {
+            "name" : "stop"
+          },
+          {
+            "associatedValues" : [
+
+            ],
+            "name" : "idle"
+          }
+        ],
+        "emitStyle" : "const",
+        "name" : "ImportedPayloadSignal",
+        "staticMethods" : [
+
+        ],
+        "staticProperties" : [
+
+        ],
+        "swiftCallName" : "ImportedPayloadSignal",
+        "tsFullPath" : "ImportedPayloadSignal"
+      },
+      {
+        "cases" : [
+
+        ],
+        "emitStyle" : "const",
+        "name" : "GenericRTNamespace",
+        "staticMethods" : [
+
+        ],
+        "staticProperties" : [
+
+        ],
+        "swiftCallName" : "GenericRTNamespace",
+        "tsFullPath" : "GenericRTNamespace"
+      },
+      {
+        "cases" : [
+          {
+            "associatedValues" : [
+
+            ],
+            "name" : "red"
+          },
+          {
+            "associatedValues" : [
+
+            ],
+            "name" : "green"
+          },
+          {
+            "associatedValues" : [
+
+            ],
+            "name" : "blue"
+          }
+        ],
+        "emitStyle" : "const",
+        "name" : "GenericRTColor",
+        "staticMethods" : [
+
+        ],
+        "staticProperties" : [
+
+        ],
+        "swiftCallName" : "GenericRTColor",
+        "tsFullPath" : "GenericRTColor"
+      },
+      {
+        "cases" : [
+          {
+            "associatedValues" : [
+
+            ],
+            "name" : "light"
+          },
+          {
+            "associatedValues" : [
+
+            ],
+            "name" : "dark"
+          }
+        ],
+        "emitStyle" : "const",
+        "name" : "GenericRTMode",
+        "rawType" : "String",
+        "staticMethods" : [
+
+        ],
+        "staticProperties" : [
+
+        ],
+        "swiftCallName" : "GenericRTMode",
+        "tsFullPath" : "GenericRTMode"
+      },
+      {
+        "cases" : [
+          {
+            "associatedValues" : [
+
+            ],
+            "name" : "low",
+            "rawValue" : "1"
+          },
+          {
+            "associatedValues" : [
+
+            ],
+            "name" : "high",
+            "rawValue" : "9"
+          }
+        ],
+        "emitStyle" : "const",
+        "name" : "GenericRTLevel",
+        "rawType" : "Int",
+        "staticMethods" : [
+
+        ],
+        "staticProperties" : [
+
+        ],
+        "swiftCallName" : "GenericRTLevel",
+        "tsFullPath" : "GenericRTLevel"
+      },
+      {
+        "cases" : [
+          {
+            "associatedValues" : [
+              {
+                "label" : "code",
+                "type" : {
+                  "integer" : {
+                    "_0" : {
+                      "isSigned" : true,
+                      "width" : "word"
+                    }
+                  }
+                }
+              }
+            ],
+            "name" : "ok"
+          },
+          {
+            "associatedValues" : [
+              {
+                "label" : "message",
+                "type" : {
+                  "string" : {
+
+                  }
+                }
+              }
+            ],
+            "name" : "fail"
+          }
+        ],
+        "emitStyle" : "const",
+        "name" : "GenericRTOutcome",
+        "staticMethods" : [
+
+        ],
+        "staticProperties" : [
+
+        ],
+        "swiftCallName" : "GenericRTOutcome",
+        "tsFullPath" : "GenericRTOutcome"
+      },
+      {
+        "cases" : [
+
+        ],
+        "emitStyle" : "const",
+        "name" : "IntegerTypesSupportExports",
+        "staticMethods" : [
+          {
+            "abiName" : "bjs_IntegerTypesSupportExports_static_roundTripInt",
+            "effects" : {
+              "isAsync" : false,
+              "isStatic" : true,
+              "isThrows" : false
+            },
+            "name" : "roundTripInt",
+            "namespace" : [
+              "IntegerTypesSupportExports"
+            ],
+            "parameters" : [
+              {
+                "label" : "_",
+                "name" : "v",
+                "type" : {
+                  "integer" : {
+                    "_0" : {
+                      "isSigned" : true,
+                      "width" : "word"
+                    }
+                  }
+                }
+              }
+            ],
+            "returnType" : {
+              "integer" : {
                 "_0" : {
                   "isSigned" : true,
-                  "width" : "w32"
+                  "width" : "word"
                 }
               }
             },
@@ -9535,13 +10868,13 @@
             }
           },
           {
-            "abiName" : "bjs_IntegerTypesSupportExports_static_roundTripUInt32",
+            "abiName" : "bjs_IntegerTypesSupportExports_static_roundTripUInt",
             "effects" : {
               "isAsync" : false,
               "isStatic" : true,
               "isThrows" : false
             },
-            "name" : "roundTripUInt32",
+            "name" : "roundTripUInt",
             "namespace" : [
               "IntegerTypesSupportExports"
             ],
@@ -9553,7 +10886,7 @@
                   "integer" : {
                     "_0" : {
                       "isSigned" : false,
-                      "width" : "w32"
+                      "width" : "word"
                     }
                   }
                 }
@@ -9563,7 +10896,7 @@
               "integer" : {
                 "_0" : {
                   "isSigned" : false,
-                  "width" : "w32"
+                  "width" : "word"
                 }
               }
             },
@@ -9574,13 +10907,13 @@
             }
           },
           {
-            "abiName" : "bjs_IntegerTypesSupportExports_static_roundTripInt64",
+            "abiName" : "bjs_IntegerTypesSupportExports_static_roundTripInt8",
             "effects" : {
               "isAsync" : false,
               "isStatic" : true,
               "isThrows" : false
             },
-            "name" : "roundTripInt64",
+            "name" : "roundTripInt8",
             "namespace" : [
               "IntegerTypesSupportExports"
             ],
@@ -9592,7 +10925,7 @@
                   "integer" : {
                     "_0" : {
                       "isSigned" : true,
-                      "width" : "w64"
+                      "width" : "w8"
                     }
                   }
                 }
@@ -9602,7 +10935,7 @@
               "integer" : {
                 "_0" : {
                   "isSigned" : true,
-                  "width" : "w64"
+                  "width" : "w8"
                 }
               }
             },
@@ -9613,13 +10946,13 @@
             }
           },
           {
-            "abiName" : "bjs_IntegerTypesSupportExports_static_roundTripUInt64",
+            "abiName" : "bjs_IntegerTypesSupportExports_static_roundTripUInt8",
             "effects" : {
               "isAsync" : false,
               "isStatic" : true,
               "isThrows" : false
             },
-            "name" : "roundTripUInt64",
+            "name" : "roundTripUInt8",
             "namespace" : [
               "IntegerTypesSupportExports"
             ],
@@ -9631,7 +10964,7 @@
                   "integer" : {
                     "_0" : {
                       "isSigned" : false,
-                      "width" : "w64"
+                      "width" : "w8"
                     }
                   }
                 }
@@ -9641,7 +10974,7 @@
               "integer" : {
                 "_0" : {
                   "isSigned" : false,
-                  "width" : "w64"
+                  "width" : "w8"
                 }
               }
             },
@@ -9650,89 +10983,323 @@
                 "_0" : "IntegerTypesSupportExports"
               }
             }
-          }
-        ],
-        "staticProperties" : [
-
-        ],
-        "swiftCallName" : "IntegerTypesSupportExports",
-        "tsFullPath" : "IntegerTypesSupportExports"
-      },
-      {
-        "cases" : [
-
-        ],
-        "emitStyle" : "const",
-        "name" : "JSTypedArrayExports",
-        "staticMethods" : [
+          },
           {
-            "abiName" : "bjs_JSTypedArrayExports_static_roundTripUint8Array",
+            "abiName" : "bjs_IntegerTypesSupportExports_static_roundTripInt16",
             "effects" : {
               "isAsync" : false,
               "isStatic" : true,
               "isThrows" : false
             },
-            "name" : "roundTripUint8Array",
+            "name" : "roundTripInt16",
             "namespace" : [
-              "JSTypedArrayExports"
+              "IntegerTypesSupportExports"
             ],
             "parameters" : [
               {
                 "label" : "_",
                 "name" : "v",
                 "type" : {
-                  "jsObject" : {
-                    "_0" : "JSUint8Array"
+                  "integer" : {
+                    "_0" : {
+                      "isSigned" : true,
+                      "width" : "w16"
+                    }
                   }
                 }
               }
             ],
             "returnType" : {
-              "jsObject" : {
-                "_0" : "JSUint8Array"
+              "integer" : {
+                "_0" : {
+                  "isSigned" : true,
+                  "width" : "w16"
+                }
               }
             },
             "staticContext" : {
               "namespaceEnum" : {
-                "_0" : "JSTypedArrayExports"
+                "_0" : "IntegerTypesSupportExports"
               }
             }
           },
           {
-            "abiName" : "bjs_JSTypedArrayExports_static_roundTripFloat32Array",
+            "abiName" : "bjs_IntegerTypesSupportExports_static_roundTripUInt16",
             "effects" : {
               "isAsync" : false,
               "isStatic" : true,
               "isThrows" : false
             },
-            "name" : "roundTripFloat32Array",
+            "name" : "roundTripUInt16",
             "namespace" : [
-              "JSTypedArrayExports"
+              "IntegerTypesSupportExports"
             ],
             "parameters" : [
               {
                 "label" : "_",
                 "name" : "v",
                 "type" : {
-                  "jsObject" : {
-                    "_0" : "JSFloat32Array"
+                  "integer" : {
+                    "_0" : {
+                      "isSigned" : false,
+                      "width" : "w16"
+                    }
                   }
                 }
               }
             ],
             "returnType" : {
-              "jsObject" : {
-                "_0" : "JSFloat32Array"
+              "integer" : {
+                "_0" : {
+                  "isSigned" : false,
+                  "width" : "w16"
+                }
               }
             },
             "staticContext" : {
               "namespaceEnum" : {
-                "_0" : "JSTypedArrayExports"
+                "_0" : "IntegerTypesSupportExports"
               }
             }
           },
           {
-            "abiName" : "bjs_JSTypedArrayExports_static_roundTripFloat64Array",
+            "abiName" : "bjs_IntegerTypesSupportExports_static_roundTripInt32",
+            "effects" : {
+              "isAsync" : false,
+              "isStatic" : true,
+              "isThrows" : false
+            },
+            "name" : "roundTripInt32",
+            "namespace" : [
+              "IntegerTypesSupportExports"
+            ],
+            "parameters" : [
+              {
+                "label" : "_",
+                "name" : "v",
+                "type" : {
+                  "integer" : {
+                    "_0" : {
+                      "isSigned" : true,
+                      "width" : "w32"
+                    }
+                  }
+                }
+              }
+            ],
+            "returnType" : {
+              "integer" : {
+                "_0" : {
+                  "isSigned" : true,
+                  "width" : "w32"
+                }
+              }
+            },
+            "staticContext" : {
+              "namespaceEnum" : {
+                "_0" : "IntegerTypesSupportExports"
+              }
+            }
+          },
+          {
+            "abiName" : "bjs_IntegerTypesSupportExports_static_roundTripUInt32",
+            "effects" : {
+              "isAsync" : false,
+              "isStatic" : true,
+              "isThrows" : false
+            },
+            "name" : "roundTripUInt32",
+            "namespace" : [
+              "IntegerTypesSupportExports"
+            ],
+            "parameters" : [
+              {
+                "label" : "_",
+                "name" : "v",
+                "type" : {
+                  "integer" : {
+                    "_0" : {
+                      "isSigned" : false,
+                      "width" : "w32"
+                    }
+                  }
+                }
+              }
+            ],
+            "returnType" : {
+              "integer" : {
+                "_0" : {
+                  "isSigned" : false,
+                  "width" : "w32"
+                }
+              }
+            },
+            "staticContext" : {
+              "namespaceEnum" : {
+                "_0" : "IntegerTypesSupportExports"
+              }
+            }
+          },
+          {
+            "abiName" : "bjs_IntegerTypesSupportExports_static_roundTripInt64",
+            "effects" : {
+              "isAsync" : false,
+              "isStatic" : true,
+              "isThrows" : false
+            },
+            "name" : "roundTripInt64",
+            "namespace" : [
+              "IntegerTypesSupportExports"
+            ],
+            "parameters" : [
+              {
+                "label" : "_",
+                "name" : "v",
+                "type" : {
+                  "integer" : {
+                    "_0" : {
+                      "isSigned" : true,
+                      "width" : "w64"
+                    }
+                  }
+                }
+              }
+            ],
+            "returnType" : {
+              "integer" : {
+                "_0" : {
+                  "isSigned" : true,
+                  "width" : "w64"
+                }
+              }
+            },
+            "staticContext" : {
+              "namespaceEnum" : {
+                "_0" : "IntegerTypesSupportExports"
+              }
+            }
+          },
+          {
+            "abiName" : "bjs_IntegerTypesSupportExports_static_roundTripUInt64",
+            "effects" : {
+              "isAsync" : false,
+              "isStatic" : true,
+              "isThrows" : false
+            },
+            "name" : "roundTripUInt64",
+            "namespace" : [
+              "IntegerTypesSupportExports"
+            ],
+            "parameters" : [
+              {
+                "label" : "_",
+                "name" : "v",
+                "type" : {
+                  "integer" : {
+                    "_0" : {
+                      "isSigned" : false,
+                      "width" : "w64"
+                    }
+                  }
+                }
+              }
+            ],
+            "returnType" : {
+              "integer" : {
+                "_0" : {
+                  "isSigned" : false,
+                  "width" : "w64"
+                }
+              }
+            },
+            "staticContext" : {
+              "namespaceEnum" : {
+                "_0" : "IntegerTypesSupportExports"
+              }
+            }
+          }
+        ],
+        "staticProperties" : [
+
+        ],
+        "swiftCallName" : "IntegerTypesSupportExports",
+        "tsFullPath" : "IntegerTypesSupportExports"
+      },
+      {
+        "cases" : [
+
+        ],
+        "emitStyle" : "const",
+        "name" : "JSTypedArrayExports",
+        "staticMethods" : [
+          {
+            "abiName" : "bjs_JSTypedArrayExports_static_roundTripUint8Array",
+            "effects" : {
+              "isAsync" : false,
+              "isStatic" : true,
+              "isThrows" : false
+            },
+            "name" : "roundTripUint8Array",
+            "namespace" : [
+              "JSTypedArrayExports"
+            ],
+            "parameters" : [
+              {
+                "label" : "_",
+                "name" : "v",
+                "type" : {
+                  "jsObject" : {
+                    "_0" : "JSUint8Array"
+                  }
+                }
+              }
+            ],
+            "returnType" : {
+              "jsObject" : {
+                "_0" : "JSUint8Array"
+              }
+            },
+            "staticContext" : {
+              "namespaceEnum" : {
+                "_0" : "JSTypedArrayExports"
+              }
+            }
+          },
+          {
+            "abiName" : "bjs_JSTypedArrayExports_static_roundTripFloat32Array",
+            "effects" : {
+              "isAsync" : false,
+              "isStatic" : true,
+              "isThrows" : false
+            },
+            "name" : "roundTripFloat32Array",
+            "namespace" : [
+              "JSTypedArrayExports"
+            ],
+            "parameters" : [
+              {
+                "label" : "_",
+                "name" : "v",
+                "type" : {
+                  "jsObject" : {
+                    "_0" : "JSFloat32Array"
+                  }
+                }
+              }
+            ],
+            "returnType" : {
+              "jsObject" : {
+                "_0" : "JSFloat32Array"
+              }
+            },
+            "staticContext" : {
+              "namespaceEnum" : {
+                "_0" : "JSTypedArrayExports"
+              }
+            }
+          },
+          {
+            "abiName" : "bjs_JSTypedArrayExports_static_roundTripFloat64Array",
             "effects" : {
               "isAsync" : false,
               "isStatic" : true,
@@ -11392,59 +12959,96 @@
     "exposeToGlobal" : false,
     "functions" : [
       {
-        "abiName" : "bjs_roundTripVoid",
+        "abiName" : "bjs_makeTag",
         "effects" : {
           "isAsync" : false,
           "isStatic" : false,
           "isThrows" : false
         },
-        "name" : "roundTripVoid",
+        "name" : "makeTag",
         "parameters" : [
+          {
+            "label" : "_",
+            "name" : "name",
+            "type" : {
+              "string" : {
 
+              }
+            }
+          }
         ],
         "returnType" : {
-          "void" : {
-
+          "alias" : {
+            "name" : "Tag",
+            "underlying" : {
+              "swiftHeapObject" : {
+                "_0" : "TagReference"
+              }
+            }
           }
         }
       },
       {
-        "abiName" : "bjs_roundTripFloat",
+        "abiName" : "bjs_roundTripPolygon",
         "effects" : {
           "isAsync" : false,
           "isStatic" : false,
           "isThrows" : false
         },
-        "name" : "roundTripFloat",
+        "name" : "roundTripPolygon",
         "parameters" : [
           {
-            "label" : "v",
-            "name" : "v",
+            "label" : "_",
+            "name" : "polygon",
             "type" : {
-              "float" : {
-
+              "alias" : {
+                "name" : "Polygon",
+                "underlying" : {
+                  "swiftHeapObject" : {
+                    "_0" : "PolygonReference"
+                  }
+                }
               }
             }
           }
         ],
         "returnType" : {
-          "float" : {
-
+          "alias" : {
+            "name" : "Polygon",
+            "underlying" : {
+              "swiftHeapObject" : {
+                "_0" : "PolygonReference"
+              }
+            }
           }
         }
       },
       {
-        "abiName" : "bjs_roundTripDouble",
+        "abiName" : "bjs_appendVertex",
         "effects" : {
           "isAsync" : false,
           "isStatic" : false,
           "isThrows" : false
         },
-        "name" : "roundTripDouble",
+        "name" : "appendVertex",
         "parameters" : [
           {
-            "label" : "v",
-            "name" : "v",
+            "label" : "_",
+            "name" : "polygon",
+            "type" : {
+              "alias" : {
+                "name" : "Polygon",
+                "underlying" : {
+                  "swiftHeapObject" : {
+                    "_0" : "PolygonReference"
+                  }
+                }
+              }
+            }
+          },
+          {
+            "label" : "_",
+            "name" : "value",
             "type" : {
               "double" : {
 
@@ -11453,280 +13057,407 @@
           }
         ],
         "returnType" : {
-          "double" : {
-
+          "alias" : {
+            "name" : "Polygon",
+            "underlying" : {
+              "swiftHeapObject" : {
+                "_0" : "PolygonReference"
+              }
+            }
           }
         }
       },
       {
-        "abiName" : "bjs_roundTripBool",
+        "abiName" : "bjs_optionalRoundTripPolygon",
         "effects" : {
           "isAsync" : false,
           "isStatic" : false,
           "isThrows" : false
         },
-        "name" : "roundTripBool",
+        "name" : "optionalRoundTripPolygon",
         "parameters" : [
           {
-            "label" : "v",
-            "name" : "v",
+            "label" : "_",
+            "name" : "polygon",
             "type" : {
-              "bool" : {
-
+              "nullable" : {
+                "_0" : {
+                  "alias" : {
+                    "name" : "Polygon",
+                    "underlying" : {
+                      "swiftHeapObject" : {
+                        "_0" : "PolygonReference"
+                      }
+                    }
+                  }
+                },
+                "_1" : "null"
               }
             }
           }
         ],
         "returnType" : {
-          "bool" : {
-
+          "nullable" : {
+            "_0" : {
+              "alias" : {
+                "name" : "Polygon",
+                "underlying" : {
+                  "swiftHeapObject" : {
+                    "_0" : "PolygonReference"
+                  }
+                }
+              }
+            },
+            "_1" : "null"
           }
         }
       },
       {
-        "abiName" : "bjs_roundTripString",
+        "abiName" : "bjs_polygonVertexCount",
         "effects" : {
           "isAsync" : false,
           "isStatic" : false,
           "isThrows" : false
         },
-        "name" : "roundTripString",
+        "name" : "polygonVertexCount",
         "parameters" : [
           {
-            "label" : "v",
-            "name" : "v",
+            "label" : "_",
+            "name" : "polygon",
             "type" : {
-              "string" : {
-
+              "alias" : {
+                "name" : "Polygon",
+                "underlying" : {
+                  "swiftHeapObject" : {
+                    "_0" : "PolygonReference"
+                  }
+                }
               }
             }
           }
         ],
         "returnType" : {
-          "string" : {
-
+          "integer" : {
+            "_0" : {
+              "isSigned" : true,
+              "width" : "word"
+            }
           }
         }
       },
       {
-        "abiName" : "bjs_roundTripSwiftHeapObject",
+        "abiName" : "bjs_roundTripPolygonArray",
         "effects" : {
           "isAsync" : false,
           "isStatic" : false,
           "isThrows" : false
         },
-        "name" : "roundTripSwiftHeapObject",
+        "name" : "roundTripPolygonArray",
         "parameters" : [
           {
-            "label" : "v",
-            "name" : "v",
+            "label" : "_",
+            "name" : "polygons",
             "type" : {
-              "swiftHeapObject" : {
-                "_0" : "Greeter"
+              "array" : {
+                "_0" : {
+                  "alias" : {
+                    "name" : "Polygon",
+                    "underlying" : {
+                      "swiftHeapObject" : {
+                        "_0" : "PolygonReference"
+                      }
+                    }
+                  }
+                }
               }
             }
           }
         ],
         "returnType" : {
-          "swiftHeapObject" : {
-            "_0" : "Greeter"
+          "array" : {
+            "_0" : {
+              "alias" : {
+                "name" : "Polygon",
+                "underlying" : {
+                  "swiftHeapObject" : {
+                    "_0" : "PolygonReference"
+                  }
+                }
+              }
+            }
           }
         }
       },
       {
-        "abiName" : "bjs_roundTripUnsafeRawPointer",
+        "abiName" : "bjs_concatPolygons",
         "effects" : {
           "isAsync" : false,
           "isStatic" : false,
           "isThrows" : false
         },
-        "name" : "roundTripUnsafeRawPointer",
+        "name" : "concatPolygons",
         "parameters" : [
           {
-            "label" : "v",
-            "name" : "v",
+            "label" : "_",
+            "name" : "polygons",
             "type" : {
-              "unsafePointer" : {
+              "array" : {
                 "_0" : {
-                  "kind" : "unsafeRawPointer"
+                  "alias" : {
+                    "name" : "Polygon",
+                    "underlying" : {
+                      "swiftHeapObject" : {
+                        "_0" : "PolygonReference"
+                      }
+                    }
+                  }
                 }
               }
             }
           }
         ],
         "returnType" : {
-          "unsafePointer" : {
-            "_0" : {
-              "kind" : "unsafeRawPointer"
+          "alias" : {
+            "name" : "Polygon",
+            "underlying" : {
+              "swiftHeapObject" : {
+                "_0" : "PolygonReference"
+              }
             }
           }
         }
       },
       {
-        "abiName" : "bjs_roundTripUnsafeMutableRawPointer",
+        "abiName" : "bjs_validatePolygon",
         "effects" : {
           "isAsync" : false,
           "isStatic" : false,
-          "isThrows" : false
+          "isThrows" : true
         },
-        "name" : "roundTripUnsafeMutableRawPointer",
+        "name" : "validatePolygon",
         "parameters" : [
           {
-            "label" : "v",
-            "name" : "v",
+            "label" : "_",
+            "name" : "polygon",
             "type" : {
-              "unsafePointer" : {
-                "_0" : {
-                  "kind" : "unsafeMutableRawPointer"
+              "alias" : {
+                "name" : "Polygon",
+                "underlying" : {
+                  "swiftHeapObject" : {
+                    "_0" : "PolygonReference"
+                  }
                 }
               }
             }
           }
         ],
         "returnType" : {
-          "unsafePointer" : {
-            "_0" : {
-              "kind" : "unsafeMutableRawPointer"
+          "alias" : {
+            "name" : "Polygon",
+            "underlying" : {
+              "swiftHeapObject" : {
+                "_0" : "PolygonReference"
+              }
             }
           }
         }
       },
       {
-        "abiName" : "bjs_roundTripOpaquePointer",
+        "abiName" : "bjs_splitPolygon",
         "effects" : {
           "isAsync" : false,
           "isStatic" : false,
           "isThrows" : false
         },
-        "name" : "roundTripOpaquePointer",
+        "name" : "splitPolygon",
         "parameters" : [
           {
-            "label" : "v",
-            "name" : "v",
+            "label" : "_",
+            "name" : "polygon",
             "type" : {
-              "unsafePointer" : {
-                "_0" : {
-                  "kind" : "opaquePointer"
+              "alias" : {
+                "name" : "Polygon",
+                "underlying" : {
+                  "swiftHeapObject" : {
+                    "_0" : "PolygonReference"
+                  }
                 }
               }
             }
           }
         ],
         "returnType" : {
-          "unsafePointer" : {
+          "array" : {
             "_0" : {
-              "kind" : "opaquePointer"
+              "alias" : {
+                "name" : "Polygon",
+                "underlying" : {
+                  "swiftHeapObject" : {
+                    "_0" : "PolygonReference"
+                  }
+                }
+              }
             }
           }
         }
       },
       {
-        "abiName" : "bjs_roundTripUnsafePointer",
+        "abiName" : "bjs_makePolygonInspector",
         "effects" : {
           "isAsync" : false,
           "isStatic" : false,
           "isThrows" : false
         },
-        "name" : "roundTripUnsafePointer",
+        "name" : "makePolygonInspector",
         "parameters" : [
-          {
-            "label" : "v",
-            "name" : "v",
-            "type" : {
-              "unsafePointer" : {
-                "_0" : {
-                  "kind" : "unsafePointer",
-                  "pointee" : "UInt8"
-                }
-              }
-            }
-          }
+
         ],
         "returnType" : {
-          "unsafePointer" : {
+          "closure" : {
             "_0" : {
-              "kind" : "unsafePointer",
-              "pointee" : "UInt8"
-            }
+              "isAsync" : false,
+              "isThrows" : false,
+              "mangleName" : "20BridgeJSRuntimeTestsAl7Polygon_Si",
+              "moduleName" : "BridgeJSRuntimeTests",
+              "parameters" : [
+                {
+                  "alias" : {
+                    "name" : "Polygon",
+                    "underlying" : {
+                      "swiftHeapObject" : {
+                        "_0" : "PolygonReference"
+                      }
+                    }
+                  }
+                }
+              ],
+              "returnType" : {
+                "integer" : {
+                  "_0" : {
+                    "isSigned" : true,
+                    "width" : "word"
+                  }
+                }
+              },
+              "sendingParameters" : false
+            },
+            "useJSTypedClosure" : false
           }
         }
       },
       {
-        "abiName" : "bjs_roundTripUnsafeMutablePointer",
+        "abiName" : "bjs_roundTripOptionalPolygonArray",
         "effects" : {
           "isAsync" : false,
           "isStatic" : false,
           "isThrows" : false
         },
-        "name" : "roundTripUnsafeMutablePointer",
+        "name" : "roundTripOptionalPolygonArray",
         "parameters" : [
           {
-            "label" : "v",
-            "name" : "v",
+            "label" : "_",
+            "name" : "polygons",
             "type" : {
-              "unsafePointer" : {
+              "array" : {
                 "_0" : {
-                  "kind" : "unsafeMutablePointer",
-                  "pointee" : "UInt8"
+                  "nullable" : {
+                    "_0" : {
+                      "alias" : {
+                        "name" : "Polygon",
+                        "underlying" : {
+                          "swiftHeapObject" : {
+                            "_0" : "PolygonReference"
+                          }
+                        }
+                      }
+                    },
+                    "_1" : "null"
+                  }
                 }
               }
             }
           }
         ],
         "returnType" : {
-          "unsafePointer" : {
+          "array" : {
             "_0" : {
-              "kind" : "unsafeMutablePointer",
-              "pointee" : "UInt8"
+              "nullable" : {
+                "_0" : {
+                  "alias" : {
+                    "name" : "Polygon",
+                    "underlying" : {
+                      "swiftHeapObject" : {
+                        "_0" : "PolygonReference"
+                      }
+                    }
+                  }
+                },
+                "_1" : "null"
+              }
             }
           }
         }
       },
       {
-        "abiName" : "bjs_roundTripJSObject",
+        "abiName" : "bjs_makeTagHolder",
         "effects" : {
           "isAsync" : false,
           "isStatic" : false,
           "isThrows" : false
         },
-        "name" : "roundTripJSObject",
+        "name" : "makeTagHolder",
         "parameters" : [
           {
-            "label" : "v",
-            "name" : "v",
+            "label" : "_",
+            "name" : "name",
             "type" : {
-              "jsObject" : {
+              "string" : {
 
               }
             }
+          },
+          {
+            "label" : "_",
+            "name" : "version",
+            "type" : {
+              "integer" : {
+                "_0" : {
+                  "isSigned" : true,
+                  "width" : "word"
+                }
+              }
+            }
           }
         ],
         "returnType" : {
-          "jsObject" : {
-
+          "alias" : {
+            "name" : "TagHolder",
+            "underlying" : {
+              "swiftHeapObject" : {
+                "_0" : "TagHolderReference"
+              }
+            }
           }
         }
       },
       {
-        "abiName" : "bjs_roundTripDictionaryExport",
+        "abiName" : "bjs_roundTripCoordinate",
         "effects" : {
           "isAsync" : false,
           "isStatic" : false,
           "isThrows" : false
         },
-        "name" : "roundTripDictionaryExport",
+        "name" : "roundTripCoordinate",
         "parameters" : [
           {
-            "label" : "v",
-            "name" : "v",
+            "label" : "_",
+            "name" : "coordinate",
             "type" : {
-              "dictionary" : {
-                "_0" : {
-                  "integer" : {
-                    "_0" : {
-                      "isSigned" : true,
-                      "width" : "word"
-                    }
+              "alias" : {
+                "name" : "Coordinate",
+                "underlying" : {
+                  "swiftStruct" : {
+                    "_0" : "JSCoordinate"
                   }
                 }
               }
@@ -11734,561 +13465,787 @@
           }
         ],
         "returnType" : {
-          "dictionary" : {
-            "_0" : {
-              "integer" : {
-                "_0" : {
-                  "isSigned" : true,
-                  "width" : "word"
-                }
+          "alias" : {
+            "name" : "Coordinate",
+            "underlying" : {
+              "swiftStruct" : {
+                "_0" : "JSCoordinate"
               }
             }
           }
         }
       },
       {
-        "abiName" : "bjs_roundTripOptionalDictionaryExport",
+        "abiName" : "bjs_roundTripPriority",
         "effects" : {
           "isAsync" : false,
           "isStatic" : false,
           "isThrows" : false
         },
-        "name" : "roundTripOptionalDictionaryExport",
+        "name" : "roundTripPriority",
         "parameters" : [
           {
-            "label" : "v",
-            "name" : "v",
+            "label" : "_",
+            "name" : "priority",
             "type" : {
-              "nullable" : {
-                "_0" : {
-                  "dictionary" : {
-                    "_0" : {
-                      "string" : {
-
-                      }
-                    }
+              "alias" : {
+                "name" : "Priority",
+                "underlying" : {
+                  "swiftHeapObject" : {
+                    "_0" : "PriorityReference"
                   }
-                },
-                "_1" : "null"
+                }
               }
             }
           }
         ],
         "returnType" : {
-          "nullable" : {
-            "_0" : {
-              "dictionary" : {
-                "_0" : {
-                  "string" : {
-
-                  }
-                }
+          "alias" : {
+            "name" : "Priority",
+            "underlying" : {
+              "swiftHeapObject" : {
+                "_0" : "PriorityReference"
               }
-            },
-            "_1" : "null"
+            }
           }
         }
       },
       {
-        "abiName" : "bjs_roundTripJSValue",
+        "abiName" : "bjs_roundTripAlert",
         "effects" : {
           "isAsync" : false,
           "isStatic" : false,
           "isThrows" : false
         },
-        "name" : "roundTripJSValue",
+        "name" : "roundTripAlert",
         "parameters" : [
           {
-            "label" : "v",
-            "name" : "v",
+            "label" : "_",
+            "name" : "alert",
             "type" : {
-              "jsValue" : {
-
+              "alias" : {
+                "name" : "Alert",
+                "underlying" : {
+                  "caseEnum" : {
+                    "_0" : "Severity"
+                  }
+                }
               }
             }
           }
         ],
         "returnType" : {
-          "jsValue" : {
-
+          "alias" : {
+            "name" : "Alert",
+            "underlying" : {
+              "caseEnum" : {
+                "_0" : "Severity"
+              }
+            }
           }
         }
       },
       {
-        "abiName" : "bjs_roundTripOptionalJSValue",
+        "abiName" : "bjs_makeAlert",
         "effects" : {
           "isAsync" : false,
           "isStatic" : false,
           "isThrows" : false
         },
-        "name" : "roundTripOptionalJSValue",
+        "name" : "makeAlert",
         "parameters" : [
           {
-            "label" : "v",
-            "name" : "v",
+            "label" : "_",
+            "name" : "level",
             "type" : {
-              "nullable" : {
-                "_0" : {
-                  "jsValue" : {
-
-                  }
-                },
-                "_1" : "null"
+              "caseEnum" : {
+                "_0" : "Severity"
               }
             }
           }
         ],
         "returnType" : {
-          "nullable" : {
-            "_0" : {
-              "jsValue" : {
-
+          "alias" : {
+            "name" : "Alert",
+            "underlying" : {
+              "caseEnum" : {
+                "_0" : "Severity"
               }
-            },
-            "_1" : "null"
+            }
           }
         }
       },
       {
-        "abiName" : "bjs_roundTripOptionalJSValueArray",
+        "abiName" : "bjs_roundTripShape",
         "effects" : {
           "isAsync" : false,
           "isStatic" : false,
           "isThrows" : false
         },
-        "name" : "roundTripOptionalJSValueArray",
+        "name" : "roundTripShape",
         "parameters" : [
           {
-            "label" : "v",
-            "name" : "v",
+            "label" : "_",
+            "name" : "s",
             "type" : {
-              "nullable" : {
-                "_0" : {
-                  "array" : {
-                    "_0" : {
-                      "jsValue" : {
-
-                      }
-                    }
-                  }
-                },
-                "_1" : "null"
+              "associatedValueEnum" : {
+                "_0" : "Shape"
               }
             }
           }
         ],
         "returnType" : {
-          "nullable" : {
-            "_0" : {
-              "array" : {
-                "_0" : {
-                  "jsValue" : {
-
-                  }
-                }
-              }
-            },
-            "_1" : "null"
+          "associatedValueEnum" : {
+            "_0" : "Shape"
           }
         }
       },
       {
-        "abiName" : "bjs_makeImportedFoo",
+        "abiName" : "bjs_makeShapePolygon",
         "effects" : {
           "isAsync" : false,
           "isStatic" : false,
-          "isThrows" : true
+          "isThrows" : false
         },
-        "name" : "makeImportedFoo",
+        "name" : "makeShapePolygon",
         "parameters" : [
           {
-            "label" : "value",
-            "name" : "value",
+            "label" : "_",
+            "name" : "polygon",
             "type" : {
-              "string" : {
-
+              "alias" : {
+                "name" : "Polygon",
+                "underlying" : {
+                  "swiftHeapObject" : {
+                    "_0" : "PolygonReference"
+                  }
+                }
               }
             }
           }
         ],
         "returnType" : {
-          "jsObject" : {
-            "_0" : "Foo"
+          "associatedValueEnum" : {
+            "_0" : "Shape"
           }
         }
       },
       {
-        "abiName" : "bjs_throwsSwiftError",
+        "abiName" : "bjs_makeShapeEmpty",
         "effects" : {
           "isAsync" : false,
           "isStatic" : false,
-          "isThrows" : true
+          "isThrows" : false
         },
-        "name" : "throwsSwiftError",
+        "name" : "makeShapeEmpty",
         "parameters" : [
-          {
-            "label" : "shouldThrow",
-            "name" : "shouldThrow",
-            "type" : {
-              "bool" : {
 
-              }
-            }
-          }
         ],
         "returnType" : {
-          "void" : {
-
+          "associatedValueEnum" : {
+            "_0" : "Shape"
           }
         }
       },
       {
-        "abiName" : "bjs_throwsWithIntResult",
+        "abiName" : "bjs_roundTripUserId",
         "effects" : {
           "isAsync" : false,
           "isStatic" : false,
-          "isThrows" : true
+          "isThrows" : false
         },
-        "name" : "throwsWithIntResult",
+        "name" : "roundTripUserId",
         "parameters" : [
-
+          {
+            "label" : "_",
+            "name" : "id",
+            "type" : {
+              "alias" : {
+                "name" : "UserId",
+                "underlying" : {
+                  "integer" : {
+                    "_0" : {
+                      "isSigned" : true,
+                      "width" : "word"
+                    }
+                  }
+                }
+              }
+            }
+          }
         ],
         "returnType" : {
-          "integer" : {
-            "_0" : {
-              "isSigned" : true,
-              "width" : "word"
+          "alias" : {
+            "name" : "UserId",
+            "underlying" : {
+              "integer" : {
+                "_0" : {
+                  "isSigned" : true,
+                  "width" : "word"
+                }
+              }
             }
           }
         }
       },
       {
-        "abiName" : "bjs_throwsWithStringResult",
+        "abiName" : "bjs_roundTripOptionalUserId",
         "effects" : {
           "isAsync" : false,
           "isStatic" : false,
-          "isThrows" : true
+          "isThrows" : false
         },
-        "name" : "throwsWithStringResult",
+        "name" : "roundTripOptionalUserId",
         "parameters" : [
-
+          {
+            "label" : "_",
+            "name" : "id",
+            "type" : {
+              "nullable" : {
+                "_0" : {
+                  "alias" : {
+                    "name" : "UserId",
+                    "underlying" : {
+                      "integer" : {
+                        "_0" : {
+                          "isSigned" : true,
+                          "width" : "word"
+                        }
+                      }
+                    }
+                  }
+                },
+                "_1" : "null"
+              }
+            }
+          }
         ],
         "returnType" : {
-          "string" : {
-
+          "nullable" : {
+            "_0" : {
+              "alias" : {
+                "name" : "UserId",
+                "underlying" : {
+                  "integer" : {
+                    "_0" : {
+                      "isSigned" : true,
+                      "width" : "word"
+                    }
+                  }
+                }
+              }
+            },
+            "_1" : "null"
           }
         }
       },
       {
-        "abiName" : "bjs_throwsWithBoolResult",
+        "abiName" : "bjs_roundTripUserIdArray",
         "effects" : {
           "isAsync" : false,
           "isStatic" : false,
-          "isThrows" : true
+          "isThrows" : false
         },
-        "name" : "throwsWithBoolResult",
+        "name" : "roundTripUserIdArray",
         "parameters" : [
-
+          {
+            "label" : "_",
+            "name" : "ids",
+            "type" : {
+              "array" : {
+                "_0" : {
+                  "alias" : {
+                    "name" : "UserId",
+                    "underlying" : {
+                      "integer" : {
+                        "_0" : {
+                          "isSigned" : true,
+                          "width" : "word"
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          }
         ],
         "returnType" : {
-          "bool" : {
-
+          "array" : {
+            "_0" : {
+              "alias" : {
+                "name" : "UserId",
+                "underlying" : {
+                  "integer" : {
+                    "_0" : {
+                      "isSigned" : true,
+                      "width" : "word"
+                    }
+                  }
+                }
+              }
+            }
           }
         }
       },
       {
-        "abiName" : "bjs_throwsWithFloatResult",
+        "abiName" : "bjs_roundTripBoxed",
         "effects" : {
           "isAsync" : false,
           "isStatic" : false,
-          "isThrows" : true
+          "isThrows" : false
         },
-        "name" : "throwsWithFloatResult",
+        "name" : "roundTripBoxed",
         "parameters" : [
+          {
+            "label" : "_",
+            "name" : "boxed",
+            "type" : {
+              "alias" : {
+                "name" : "Boxed",
+                "underlying" : {
+                  "jsValue" : {
 
+                  }
+                }
+              }
+            }
+          }
         ],
         "returnType" : {
-          "float" : {
+          "alias" : {
+            "name" : "Boxed",
+            "underlying" : {
+              "jsValue" : {
 
+              }
+            }
           }
         }
       },
       {
-        "abiName" : "bjs_throwsWithDoubleResult",
+        "abiName" : "bjs_roundTripOptionalBoxed",
         "effects" : {
           "isAsync" : false,
           "isStatic" : false,
-          "isThrows" : true
+          "isThrows" : false
         },
-        "name" : "throwsWithDoubleResult",
+        "name" : "roundTripOptionalBoxed",
         "parameters" : [
+          {
+            "label" : "_",
+            "name" : "boxed",
+            "type" : {
+              "nullable" : {
+                "_0" : {
+                  "alias" : {
+                    "name" : "Boxed",
+                    "underlying" : {
+                      "jsValue" : {
 
+                      }
+                    }
+                  }
+                },
+                "_1" : "null"
+              }
+            }
+          }
         ],
         "returnType" : {
-          "double" : {
+          "nullable" : {
+            "_0" : {
+              "alias" : {
+                "name" : "Boxed",
+                "underlying" : {
+                  "jsValue" : {
 
+                  }
+                }
+              }
+            },
+            "_1" : "null"
           }
         }
       },
       {
-        "abiName" : "bjs_throwsWithSwiftHeapObjectResult",
+        "abiName" : "bjs_awaitAsyncCallback",
         "effects" : {
-          "isAsync" : false,
+          "isAsync" : true,
           "isStatic" : false,
           "isThrows" : true
         },
-        "name" : "throwsWithSwiftHeapObjectResult",
+        "name" : "awaitAsyncCallback",
         "parameters" : [
+          {
+            "label" : "_",
+            "name" : "fetch",
+            "type" : {
+              "closure" : {
+                "_0" : {
+                  "isAsync" : true,
+                  "isThrows" : true,
+                  "mangleName" : "20BridgeJSRuntimeTestsYaKSS_SS",
+                  "moduleName" : "BridgeJSRuntimeTests",
+                  "parameters" : [
+                    {
+                      "string" : {
+
+                      }
+                    }
+                  ],
+                  "returnType" : {
+                    "string" : {
 
+                    }
+                  },
+                  "sendingParameters" : false
+                },
+                "useJSTypedClosure" : false
+              }
+            }
+          }
         ],
         "returnType" : {
-          "swiftHeapObject" : {
-            "_0" : "Greeter"
+          "string" : {
+
           }
         }
       },
       {
-        "abiName" : "bjs_throwsWithJSObjectResult",
+        "abiName" : "bjs_makeAsyncParser",
         "effects" : {
           "isAsync" : false,
           "isStatic" : false,
-          "isThrows" : true
+          "isThrows" : false
         },
-        "name" : "throwsWithJSObjectResult",
+        "name" : "makeAsyncParser",
         "parameters" : [
 
         ],
         "returnType" : {
-          "jsObject" : {
+          "closure" : {
+            "_0" : {
+              "isAsync" : true,
+              "isThrows" : true,
+              "mangleName" : "20BridgeJSRuntimeTestsYaKSS_SS",
+              "moduleName" : "BridgeJSRuntimeTests",
+              "parameters" : [
+                {
+                  "string" : {
+
+                  }
+                }
+              ],
+              "returnType" : {
+                "string" : {
 
+                }
+              },
+              "sendingParameters" : false
+            },
+            "useJSTypedClosure" : true
           }
         }
       },
       {
-        "abiName" : "bjs_asyncRoundTripVoid",
+        "abiName" : "bjs_makeAsyncEcho",
         "effects" : {
-          "isAsync" : true,
+          "isAsync" : false,
           "isStatic" : false,
           "isThrows" : false
         },
-        "name" : "asyncRoundTripVoid",
+        "name" : "makeAsyncEcho",
         "parameters" : [
 
         ],
         "returnType" : {
-          "void" : {
+          "closure" : {
+            "_0" : {
+              "isAsync" : true,
+              "isThrows" : false,
+              "mangleName" : "20BridgeJSRuntimeTestsYaSS_SS",
+              "moduleName" : "BridgeJSRuntimeTests",
+              "parameters" : [
+                {
+                  "string" : {
+
+                  }
+                }
+              ],
+              "returnType" : {
+                "string" : {
 
+                }
+              },
+              "sendingParameters" : false
+            },
+            "useJSTypedClosure" : true
           }
         }
       },
       {
-        "abiName" : "bjs_asyncRoundTripInt",
+        "abiName" : "bjs_makeAsyncRecorder",
         "effects" : {
-          "isAsync" : true,
+          "isAsync" : false,
           "isStatic" : false,
           "isThrows" : false
         },
-        "name" : "asyncRoundTripInt",
+        "name" : "makeAsyncRecorder",
         "parameters" : [
-          {
-            "label" : "v",
-            "name" : "v",
-            "type" : {
-              "integer" : {
-                "_0" : {
-                  "isSigned" : true,
-                  "width" : "word"
-                }
-              }
-            }
-          }
+
         ],
         "returnType" : {
-          "integer" : {
+          "closure" : {
             "_0" : {
-              "isSigned" : true,
-              "width" : "word"
-            }
+              "isAsync" : true,
+              "isThrows" : true,
+              "mangleName" : "20BridgeJSRuntimeTestsYaKSS_y",
+              "moduleName" : "BridgeJSRuntimeTests",
+              "parameters" : [
+                {
+                  "string" : {
+
+                  }
+                }
+              ],
+              "returnType" : {
+                "void" : {
+
+                }
+              },
+              "sendingParameters" : false
+            },
+            "useJSTypedClosure" : true
           }
         }
       },
       {
-        "abiName" : "bjs_asyncRoundTripFloat",
+        "abiName" : "bjs_lastRecordedValue",
         "effects" : {
-          "isAsync" : true,
+          "isAsync" : false,
           "isStatic" : false,
           "isThrows" : false
         },
-        "name" : "asyncRoundTripFloat",
+        "name" : "lastRecordedValue",
         "parameters" : [
-          {
-            "label" : "v",
-            "name" : "v",
-            "type" : {
-              "float" : {
 
-              }
-            }
-          }
         ],
         "returnType" : {
-          "float" : {
+          "string" : {
 
           }
         }
       },
       {
-        "abiName" : "bjs_asyncRoundTripDouble",
+        "abiName" : "bjs_makeAsyncPayloadLoader",
         "effects" : {
-          "isAsync" : true,
+          "isAsync" : false,
           "isStatic" : false,
           "isThrows" : false
         },
-        "name" : "asyncRoundTripDouble",
+        "name" : "makeAsyncPayloadLoader",
         "parameters" : [
-          {
-            "label" : "v",
-            "name" : "v",
-            "type" : {
-              "double" : {
 
-              }
-            }
-          }
         ],
         "returnType" : {
-          "double" : {
+          "closure" : {
+            "_0" : {
+              "isAsync" : true,
+              "isThrows" : true,
+              "mangleName" : "20BridgeJSRuntimeTestsYaKSb_18AsyncPayloadResultO",
+              "moduleName" : "BridgeJSRuntimeTests",
+              "parameters" : [
+                {
+                  "bool" : {
 
+                  }
+                }
+              ],
+              "returnType" : {
+                "associatedValueEnum" : {
+                  "_0" : "AsyncPayloadResult"
+                }
+              },
+              "sendingParameters" : false
+            },
+            "useJSTypedClosure" : true
           }
         }
       },
       {
-        "abiName" : "bjs_asyncRoundTripBool",
+        "abiName" : "bjs_awaitPayloadCallback",
         "effects" : {
           "isAsync" : true,
           "isStatic" : false,
-          "isThrows" : false
+          "isThrows" : true
         },
-        "name" : "asyncRoundTripBool",
+        "name" : "awaitPayloadCallback",
         "parameters" : [
           {
-            "label" : "v",
-            "name" : "v",
+            "label" : "_",
+            "name" : "load",
             "type" : {
-              "bool" : {
+              "closure" : {
+                "_0" : {
+                  "isAsync" : true,
+                  "isThrows" : true,
+                  "mangleName" : "20BridgeJSRuntimeTestsYaKSb_18AsyncPayloadResultO",
+                  "moduleName" : "BridgeJSRuntimeTests",
+                  "parameters" : [
+                    {
+                      "bool" : {
 
+                      }
+                    }
+                  ],
+                  "returnType" : {
+                    "associatedValueEnum" : {
+                      "_0" : "AsyncPayloadResult"
+                    }
+                  },
+                  "sendingParameters" : false
+                },
+                "useJSTypedClosure" : false
               }
             }
           }
         ],
         "returnType" : {
-          "bool" : {
+          "string" : {
 
           }
         }
       },
       {
-        "abiName" : "bjs_asyncRoundTripString",
+        "abiName" : "bjs_makeAsyncPointMaker",
         "effects" : {
-          "isAsync" : true,
+          "isAsync" : false,
           "isStatic" : false,
           "isThrows" : false
         },
-        "name" : "asyncRoundTripString",
+        "name" : "makeAsyncPointMaker",
         "parameters" : [
-          {
-            "label" : "v",
-            "name" : "v",
-            "type" : {
-              "string" : {
 
-              }
-            }
-          }
         ],
         "returnType" : {
-          "string" : {
+          "closure" : {
+            "_0" : {
+              "isAsync" : true,
+              "isThrows" : false,
+              "mangleName" : "20BridgeJSRuntimeTestsYaSd_9DataPointV",
+              "moduleName" : "BridgeJSRuntimeTests",
+              "parameters" : [
+                {
+                  "double" : {
 
+                  }
+                }
+              ],
+              "returnType" : {
+                "swiftStruct" : {
+                  "_0" : "DataPoint"
+                }
+              },
+              "sendingParameters" : false
+            },
+            "useJSTypedClosure" : true
           }
         }
       },
       {
-        "abiName" : "bjs_asyncRoundTripSwiftHeapObject",
+        "abiName" : "bjs_makeThrowingParser",
         "effects" : {
-          "isAsync" : true,
+          "isAsync" : false,
           "isStatic" : false,
           "isThrows" : false
         },
-        "name" : "asyncRoundTripSwiftHeapObject",
+        "name" : "makeThrowingParser",
         "parameters" : [
-          {
-            "label" : "v",
-            "name" : "v",
-            "type" : {
-              "swiftHeapObject" : {
-                "_0" : "Greeter"
-              }
-            }
-          }
+
         ],
         "returnType" : {
-          "swiftHeapObject" : {
-            "_0" : "Greeter"
-          }
-        }
-      },
+          "closure" : {
+            "_0" : {
+              "isAsync" : false,
+              "isThrows" : true,
+              "mangleName" : "20BridgeJSRuntimeTestsKSS_Si",
+              "moduleName" : "BridgeJSRuntimeTests",
+              "parameters" : [
+                {
+                  "string" : {
+
+                  }
+                }
+              ],
+              "returnType" : {
+                "integer" : {
+                  "_0" : {
+                    "isSigned" : true,
+                    "width" : "word"
+                  }
+                }
+              },
+              "sendingParameters" : false
+            },
+            "useJSTypedClosure" : true
+          }
+        }
+      },
       {
-        "abiName" : "bjs_asyncRoundTripJSObject",
+        "abiName" : "bjs_runValidator",
         "effects" : {
-          "isAsync" : true,
+          "isAsync" : false,
           "isStatic" : false,
-          "isThrows" : false
+          "isThrows" : true
         },
-        "name" : "asyncRoundTripJSObject",
+        "name" : "runValidator",
         "parameters" : [
           {
-            "label" : "v",
-            "name" : "v",
+            "label" : "_",
+            "name" : "validate",
             "type" : {
-              "jsObject" : {
+              "closure" : {
+                "_0" : {
+                  "isAsync" : false,
+                  "isThrows" : true,
+                  "mangleName" : "20BridgeJSRuntimeTestsKSS_Sb",
+                  "moduleName" : "BridgeJSRuntimeTests",
+                  "parameters" : [
+                    {
+                      "string" : {
+
+                      }
+                    }
+                  ],
+                  "returnType" : {
+                    "bool" : {
 
+                    }
+                  },
+                  "sendingParameters" : false
+                },
+                "useJSTypedClosure" : false
               }
             }
           }
         ],
         "returnType" : {
-          "jsObject" : {
+          "bool" : {
 
           }
         }
       },
       {
-        "abiName" : "bjs_takeGreeter",
+        "abiName" : "bjs_roundTripVoid",
         "effects" : {
           "isAsync" : false,
           "isStatic" : false,
           "isThrows" : false
         },
-        "name" : "takeGreeter",
+        "name" : "roundTripVoid",
         "parameters" : [
-          {
-            "label" : "g",
-            "name" : "g",
-            "type" : {
-              "swiftHeapObject" : {
-                "_0" : "Greeter"
-              }
-            }
-          },
-          {
-            "label" : "name",
-            "name" : "name",
-            "type" : {
-              "string" : {
 
-              }
-            }
-          }
         ],
         "returnType" : {
           "void" : {
@@ -12297,120 +14254,117 @@
         }
       },
       {
-        "abiName" : "bjs_createCalculator",
+        "abiName" : "bjs_roundTripFloat",
         "effects" : {
           "isAsync" : false,
           "isStatic" : false,
           "isThrows" : false
         },
-        "name" : "createCalculator",
+        "name" : "roundTripFloat",
         "parameters" : [
+          {
+            "label" : "v",
+            "name" : "v",
+            "type" : {
+              "float" : {
 
+              }
+            }
+          }
         ],
         "returnType" : {
-          "swiftHeapObject" : {
-            "_0" : "Calculator"
+          "float" : {
+
           }
         }
       },
       {
-        "abiName" : "bjs_useCalculator",
+        "abiName" : "bjs_roundTripDouble",
         "effects" : {
           "isAsync" : false,
           "isStatic" : false,
           "isThrows" : false
         },
-        "name" : "useCalculator",
+        "name" : "roundTripDouble",
         "parameters" : [
           {
-            "label" : "calc",
-            "name" : "calc",
-            "type" : {
-              "swiftHeapObject" : {
-                "_0" : "Calculator"
-              }
-            }
-          },
-          {
-            "label" : "x",
-            "name" : "x",
-            "type" : {
-              "integer" : {
-                "_0" : {
-                  "isSigned" : true,
-                  "width" : "word"
-                }
-              }
-            }
-          },
-          {
-            "label" : "y",
-            "name" : "y",
+            "label" : "v",
+            "name" : "v",
             "type" : {
-              "integer" : {
-                "_0" : {
-                  "isSigned" : true,
-                  "width" : "word"
-                }
+              "double" : {
+
               }
             }
           }
         ],
         "returnType" : {
-          "integer" : {
-            "_0" : {
-              "isSigned" : true,
-              "width" : "word"
-            }
+          "double" : {
+
           }
         }
       },
       {
-        "abiName" : "bjs_testGreeterToJSValue",
+        "abiName" : "bjs_roundTripBool",
         "effects" : {
           "isAsync" : false,
           "isStatic" : false,
           "isThrows" : false
         },
-        "name" : "testGreeterToJSValue",
+        "name" : "roundTripBool",
         "parameters" : [
+          {
+            "label" : "v",
+            "name" : "v",
+            "type" : {
+              "bool" : {
 
+              }
+            }
+          }
         ],
         "returnType" : {
-          "jsObject" : {
+          "bool" : {
 
           }
         }
       },
       {
-        "abiName" : "bjs_testCalculatorToJSValue",
+        "abiName" : "bjs_roundTripString",
         "effects" : {
           "isAsync" : false,
           "isStatic" : false,
           "isThrows" : false
         },
-        "name" : "testCalculatorToJSValue",
+        "name" : "roundTripString",
         "parameters" : [
+          {
+            "label" : "v",
+            "name" : "v",
+            "type" : {
+              "string" : {
 
+              }
+            }
+          }
         ],
         "returnType" : {
-          "jsObject" : {
+          "string" : {
 
           }
         }
       },
       {
-        "abiName" : "bjs_testSwiftClassAsJSValue",
+        "abiName" : "bjs_roundTripSwiftHeapObject",
         "effects" : {
           "isAsync" : false,
           "isStatic" : false,
           "isThrows" : false
         },
-        "name" : "testSwiftClassAsJSValue",
+        "name" : "roundTripSwiftHeapObject",
         "parameters" : [
           {
-            "label" : "greeter",
-            "name" : "greeter",
+            "label" : "v",
+            "name" : "v",
             "type" : {
               "swiftHeapObject" : {
                 "_0" : "Greeter"
@@ -12419,2302 +14373,2225 @@
           }
         ],
         "returnType" : {
-          "jsObject" : {
-
+          "swiftHeapObject" : {
+            "_0" : "Greeter"
           }
         }
       },
       {
-        "abiName" : "bjs_setDirection",
+        "abiName" : "bjs_roundTripUnsafeRawPointer",
         "effects" : {
           "isAsync" : false,
           "isStatic" : false,
           "isThrows" : false
         },
-        "name" : "setDirection",
+        "name" : "roundTripUnsafeRawPointer",
         "parameters" : [
           {
-            "label" : "_",
-            "name" : "direction",
+            "label" : "v",
+            "name" : "v",
             "type" : {
-              "caseEnum" : {
-                "_0" : "Direction"
+              "unsafePointer" : {
+                "_0" : {
+                  "kind" : "unsafeRawPointer"
+                }
               }
             }
           }
         ],
         "returnType" : {
-          "caseEnum" : {
-            "_0" : "Direction"
+          "unsafePointer" : {
+            "_0" : {
+              "kind" : "unsafeRawPointer"
+            }
           }
         }
       },
       {
-        "abiName" : "bjs_getDirection",
+        "abiName" : "bjs_roundTripUnsafeMutableRawPointer",
         "effects" : {
           "isAsync" : false,
           "isStatic" : false,
           "isThrows" : false
         },
-        "name" : "getDirection",
+        "name" : "roundTripUnsafeMutableRawPointer",
         "parameters" : [
-
+          {
+            "label" : "v",
+            "name" : "v",
+            "type" : {
+              "unsafePointer" : {
+                "_0" : {
+                  "kind" : "unsafeMutableRawPointer"
+                }
+              }
+            }
+          }
         ],
         "returnType" : {
-          "caseEnum" : {
-            "_0" : "Direction"
+          "unsafePointer" : {
+            "_0" : {
+              "kind" : "unsafeMutableRawPointer"
+            }
           }
         }
       },
       {
-        "abiName" : "bjs_processDirection",
+        "abiName" : "bjs_roundTripOpaquePointer",
         "effects" : {
           "isAsync" : false,
           "isStatic" : false,
           "isThrows" : false
         },
-        "name" : "processDirection",
+        "name" : "roundTripOpaquePointer",
         "parameters" : [
           {
-            "label" : "_",
-            "name" : "input",
+            "label" : "v",
+            "name" : "v",
             "type" : {
-              "caseEnum" : {
-                "_0" : "Direction"
+              "unsafePointer" : {
+                "_0" : {
+                  "kind" : "opaquePointer"
+                }
               }
             }
           }
         ],
         "returnType" : {
-          "caseEnum" : {
-            "_0" : "Status"
+          "unsafePointer" : {
+            "_0" : {
+              "kind" : "opaquePointer"
+            }
           }
         }
       },
       {
-        "abiName" : "bjs_setTheme",
+        "abiName" : "bjs_roundTripUnsafePointer",
         "effects" : {
           "isAsync" : false,
           "isStatic" : false,
           "isThrows" : false
         },
-        "name" : "setTheme",
+        "name" : "roundTripUnsafePointer",
         "parameters" : [
           {
-            "label" : "_",
-            "name" : "theme",
+            "label" : "v",
+            "name" : "v",
             "type" : {
-              "rawValueEnum" : {
-                "_0" : "Theme",
-                "_1" : "String"
+              "unsafePointer" : {
+                "_0" : {
+                  "kind" : "unsafePointer",
+                  "pointee" : "UInt8"
+                }
               }
             }
           }
         ],
         "returnType" : {
-          "rawValueEnum" : {
-            "_0" : "Theme",
-            "_1" : "String"
-          }
+          "unsafePointer" : {
+            "_0" : {
+              "kind" : "unsafePointer",
+              "pointee" : "UInt8"
+            }
+          }
         }
       },
       {
-        "abiName" : "bjs_getTheme",
+        "abiName" : "bjs_roundTripUnsafeMutablePointer",
         "effects" : {
           "isAsync" : false,
           "isStatic" : false,
           "isThrows" : false
         },
-        "name" : "getTheme",
+        "name" : "roundTripUnsafeMutablePointer",
         "parameters" : [
-
+          {
+            "label" : "v",
+            "name" : "v",
+            "type" : {
+              "unsafePointer" : {
+                "_0" : {
+                  "kind" : "unsafeMutablePointer",
+                  "pointee" : "UInt8"
+                }
+              }
+            }
+          }
         ],
         "returnType" : {
-          "rawValueEnum" : {
-            "_0" : "Theme",
-            "_1" : "String"
+          "unsafePointer" : {
+            "_0" : {
+              "kind" : "unsafeMutablePointer",
+              "pointee" : "UInt8"
+            }
           }
         }
       },
       {
-        "abiName" : "bjs_setHttpStatus",
+        "abiName" : "bjs_roundTripJSObject",
         "effects" : {
           "isAsync" : false,
           "isStatic" : false,
           "isThrows" : false
         },
-        "name" : "setHttpStatus",
+        "name" : "roundTripJSObject",
         "parameters" : [
           {
-            "label" : "_",
-            "name" : "status",
+            "label" : "v",
+            "name" : "v",
             "type" : {
-              "rawValueEnum" : {
-                "_0" : "HttpStatus",
-                "_1" : "Int"
+              "jsObject" : {
+
               }
             }
           }
         ],
         "returnType" : {
-          "rawValueEnum" : {
-            "_0" : "HttpStatus",
-            "_1" : "Int"
+          "jsObject" : {
+
           }
         }
       },
       {
-        "abiName" : "bjs_getHttpStatus",
+        "abiName" : "bjs_roundTripDictionaryExport",
         "effects" : {
           "isAsync" : false,
           "isStatic" : false,
           "isThrows" : false
         },
-        "name" : "getHttpStatus",
+        "name" : "roundTripDictionaryExport",
         "parameters" : [
-
+          {
+            "label" : "v",
+            "name" : "v",
+            "type" : {
+              "dictionary" : {
+                "_0" : {
+                  "integer" : {
+                    "_0" : {
+                      "isSigned" : true,
+                      "width" : "word"
+                    }
+                  }
+                }
+              }
+            }
+          }
         ],
         "returnType" : {
-          "rawValueEnum" : {
-            "_0" : "HttpStatus",
-            "_1" : "Int"
+          "dictionary" : {
+            "_0" : {
+              "integer" : {
+                "_0" : {
+                  "isSigned" : true,
+                  "width" : "word"
+                }
+              }
+            }
           }
         }
       },
       {
-        "abiName" : "bjs_setFileSize",
+        "abiName" : "bjs_roundTripOptionalDictionaryExport",
         "effects" : {
           "isAsync" : false,
           "isStatic" : false,
           "isThrows" : false
         },
-        "name" : "setFileSize",
+        "name" : "roundTripOptionalDictionaryExport",
         "parameters" : [
           {
-            "label" : "_",
-            "name" : "size",
+            "label" : "v",
+            "name" : "v",
             "type" : {
-              "rawValueEnum" : {
-                "_0" : "FileSize",
-                "_1" : "Int64"
+              "nullable" : {
+                "_0" : {
+                  "dictionary" : {
+                    "_0" : {
+                      "string" : {
+
+                      }
+                    }
+                  }
+                },
+                "_1" : "null"
               }
             }
           }
         ],
         "returnType" : {
-          "rawValueEnum" : {
-            "_0" : "FileSize",
-            "_1" : "Int64"
+          "nullable" : {
+            "_0" : {
+              "dictionary" : {
+                "_0" : {
+                  "string" : {
+
+                  }
+                }
+              }
+            },
+            "_1" : "null"
           }
         }
       },
       {
-        "abiName" : "bjs_getFileSize",
+        "abiName" : "bjs_roundTripJSValue",
         "effects" : {
           "isAsync" : false,
           "isStatic" : false,
           "isThrows" : false
         },
-        "name" : "getFileSize",
+        "name" : "roundTripJSValue",
         "parameters" : [
+          {
+            "label" : "v",
+            "name" : "v",
+            "type" : {
+              "jsValue" : {
 
+              }
+            }
+          }
         ],
         "returnType" : {
-          "rawValueEnum" : {
-            "_0" : "FileSize",
-            "_1" : "Int64"
+          "jsValue" : {
+
           }
         }
       },
       {
-        "abiName" : "bjs_setSessionId",
+        "abiName" : "bjs_roundTripOptionalJSValue",
         "effects" : {
           "isAsync" : false,
           "isStatic" : false,
           "isThrows" : false
         },
-        "name" : "setSessionId",
+        "name" : "roundTripOptionalJSValue",
         "parameters" : [
           {
-            "label" : "_",
-            "name" : "session",
+            "label" : "v",
+            "name" : "v",
             "type" : {
-              "rawValueEnum" : {
-                "_0" : "SessionId",
-                "_1" : "UInt64"
+              "nullable" : {
+                "_0" : {
+                  "jsValue" : {
+
+                  }
+                },
+                "_1" : "null"
               }
             }
           }
         ],
         "returnType" : {
-          "rawValueEnum" : {
-            "_0" : "SessionId",
-            "_1" : "UInt64"
+          "nullable" : {
+            "_0" : {
+              "jsValue" : {
+
+              }
+            },
+            "_1" : "null"
           }
         }
       },
       {
-        "abiName" : "bjs_getSessionId",
+        "abiName" : "bjs_roundTripOptionalJSValueArray",
         "effects" : {
           "isAsync" : false,
           "isStatic" : false,
           "isThrows" : false
         },
-        "name" : "getSessionId",
+        "name" : "roundTripOptionalJSValueArray",
         "parameters" : [
+          {
+            "label" : "v",
+            "name" : "v",
+            "type" : {
+              "nullable" : {
+                "_0" : {
+                  "array" : {
+                    "_0" : {
+                      "jsValue" : {
 
+                      }
+                    }
+                  }
+                },
+                "_1" : "null"
+              }
+            }
+          }
         ],
         "returnType" : {
-          "rawValueEnum" : {
-            "_0" : "SessionId",
-            "_1" : "UInt64"
+          "nullable" : {
+            "_0" : {
+              "array" : {
+                "_0" : {
+                  "jsValue" : {
+
+                  }
+                }
+              }
+            },
+            "_1" : "null"
           }
         }
       },
       {
-        "abiName" : "bjs_processTheme",
+        "abiName" : "bjs_makeImportedFoo",
         "effects" : {
           "isAsync" : false,
           "isStatic" : false,
-          "isThrows" : false
+          "isThrows" : true
         },
-        "name" : "processTheme",
+        "name" : "makeImportedFoo",
         "parameters" : [
           {
-            "label" : "_",
-            "name" : "theme",
+            "label" : "value",
+            "name" : "value",
             "type" : {
-              "rawValueEnum" : {
-                "_0" : "Theme",
-                "_1" : "String"
+              "string" : {
+
               }
             }
           }
         ],
         "returnType" : {
-          "rawValueEnum" : {
-            "_0" : "HttpStatus",
-            "_1" : "Int"
+          "jsObject" : {
+            "_0" : "Foo"
           }
         }
       },
       {
-        "abiName" : "bjs_setTSDirection",
+        "abiName" : "bjs_roundTripOptionalImportedClass",
         "effects" : {
           "isAsync" : false,
           "isStatic" : false,
           "isThrows" : false
         },
-        "name" : "setTSDirection",
+        "name" : "roundTripOptionalImportedClass",
         "parameters" : [
           {
-            "label" : "_",
-            "name" : "direction",
+            "label" : "v",
+            "name" : "v",
             "type" : {
-              "caseEnum" : {
-                "_0" : "TSDirection"
+              "nullable" : {
+                "_0" : {
+                  "jsObject" : {
+                    "_0" : "Foo"
+                  }
+                },
+                "_1" : "null"
               }
             }
           }
         ],
         "returnType" : {
-          "caseEnum" : {
-            "_0" : "TSDirection"
+          "nullable" : {
+            "_0" : {
+              "jsObject" : {
+                "_0" : "Foo"
+              }
+            },
+            "_1" : "null"
           }
         }
       },
       {
-        "abiName" : "bjs_getTSDirection",
+        "abiName" : "bjs_throwsSwiftError",
         "effects" : {
           "isAsync" : false,
           "isStatic" : false,
-          "isThrows" : false
+          "isThrows" : true
         },
-        "name" : "getTSDirection",
+        "name" : "throwsSwiftError",
         "parameters" : [
+          {
+            "label" : "shouldThrow",
+            "name" : "shouldThrow",
+            "type" : {
+              "bool" : {
 
+              }
+            }
+          }
         ],
         "returnType" : {
-          "caseEnum" : {
-            "_0" : "TSDirection"
+          "void" : {
+
           }
         }
       },
       {
-        "abiName" : "bjs_setTSTheme",
+        "abiName" : "bjs_throwsWithIntResult",
         "effects" : {
           "isAsync" : false,
           "isStatic" : false,
-          "isThrows" : false
+          "isThrows" : true
         },
-        "name" : "setTSTheme",
+        "name" : "throwsWithIntResult",
         "parameters" : [
-          {
-            "label" : "_",
-            "name" : "theme",
-            "type" : {
-              "rawValueEnum" : {
-                "_0" : "TSTheme",
-                "_1" : "String"
-              }
-            }
-          }
+
         ],
         "returnType" : {
-          "rawValueEnum" : {
-            "_0" : "TSTheme",
-            "_1" : "String"
+          "integer" : {
+            "_0" : {
+              "isSigned" : true,
+              "width" : "word"
+            }
           }
         }
       },
       {
-        "abiName" : "bjs_getTSTheme",
+        "abiName" : "bjs_throwsWithStringResult",
         "effects" : {
           "isAsync" : false,
           "isStatic" : false,
-          "isThrows" : false
+          "isThrows" : true
         },
-        "name" : "getTSTheme",
+        "name" : "throwsWithStringResult",
         "parameters" : [
 
         ],
         "returnType" : {
-          "rawValueEnum" : {
-            "_0" : "TSTheme",
-            "_1" : "String"
+          "string" : {
+
           }
         }
       },
       {
-        "abiName" : "bjs_createConverter",
+        "abiName" : "bjs_throwsWithBoolResult",
         "effects" : {
           "isAsync" : false,
           "isStatic" : false,
-          "isThrows" : false
+          "isThrows" : true
         },
-        "name" : "createConverter",
+        "name" : "throwsWithBoolResult",
         "parameters" : [
 
         ],
         "returnType" : {
-          "swiftHeapObject" : {
-            "_0" : "Utils.Converter"
+          "bool" : {
+
           }
         }
       },
       {
-        "abiName" : "bjs_useConverter",
+        "abiName" : "bjs_throwsWithFloatResult",
         "effects" : {
           "isAsync" : false,
           "isStatic" : false,
-          "isThrows" : false
+          "isThrows" : true
         },
-        "name" : "useConverter",
+        "name" : "throwsWithFloatResult",
         "parameters" : [
-          {
-            "label" : "converter",
-            "name" : "converter",
-            "type" : {
-              "swiftHeapObject" : {
-                "_0" : "Utils.Converter"
-              }
-            }
-          },
-          {
-            "label" : "value",
-            "name" : "value",
-            "type" : {
-              "integer" : {
-                "_0" : {
-                  "isSigned" : true,
-                  "width" : "word"
-                }
-              }
-            }
-          }
+
         ],
         "returnType" : {
-          "string" : {
+          "float" : {
 
           }
         }
       },
       {
-        "abiName" : "bjs_roundTripConverterArray",
+        "abiName" : "bjs_throwsWithDoubleResult",
         "effects" : {
           "isAsync" : false,
           "isStatic" : false,
-          "isThrows" : false
+          "isThrows" : true
         },
-        "name" : "roundTripConverterArray",
+        "name" : "throwsWithDoubleResult",
         "parameters" : [
-          {
-            "label" : "_",
-            "name" : "converters",
-            "type" : {
-              "array" : {
-                "_0" : {
-                  "swiftHeapObject" : {
-                    "_0" : "Utils.Converter"
-                  }
-                }
-              }
-            }
-          }
+
         ],
         "returnType" : {
-          "array" : {
-            "_0" : {
-              "swiftHeapObject" : {
-                "_0" : "Utils.Converter"
-              }
-            }
+          "double" : {
+
           }
         }
       },
       {
-        "abiName" : "bjs_createHTTPServer",
+        "abiName" : "bjs_throwsWithSwiftHeapObjectResult",
         "effects" : {
           "isAsync" : false,
           "isStatic" : false,
-          "isThrows" : false
+          "isThrows" : true
         },
-        "name" : "createHTTPServer",
+        "name" : "throwsWithSwiftHeapObjectResult",
         "parameters" : [
 
         ],
         "returnType" : {
           "swiftHeapObject" : {
-            "_0" : "Networking.API.HTTPServer"
+            "_0" : "Greeter"
           }
         }
       },
       {
-        "abiName" : "bjs_createUUID",
+        "abiName" : "bjs_throwsWithJSObjectResult",
         "effects" : {
           "isAsync" : false,
           "isStatic" : false,
-          "isThrows" : false
+          "isThrows" : true
         },
-        "name" : "createUUID",
+        "name" : "throwsWithJSObjectResult",
         "parameters" : [
-          {
-            "label" : "value",
-            "name" : "value",
-            "type" : {
-              "string" : {
 
-              }
-            }
-          }
         ],
         "returnType" : {
-          "swiftHeapObject" : {
-            "_0" : "UUID"
+          "jsObject" : {
+
           }
         }
       },
       {
-        "abiName" : "bjs_roundTripUUID",
+        "abiName" : "bjs_zeroArgAsyncThrows",
         "effects" : {
-          "isAsync" : false,
+          "isAsync" : true,
           "isStatic" : false,
-          "isThrows" : false
+          "isThrows" : true
         },
-        "name" : "roundTripUUID",
+        "name" : "zeroArgAsyncThrows",
         "parameters" : [
-          {
-            "label" : "_",
-            "name" : "uuid",
-            "type" : {
-              "swiftHeapObject" : {
-                "_0" : "UUID"
-              }
-            }
-          }
+
         ],
         "returnType" : {
-          "swiftHeapObject" : {
-            "_0" : "UUID"
+          "string" : {
+
           }
         }
       },
       {
-        "abiName" : "bjs_roundtripNetworkingAPIMethod",
+        "abiName" : "bjs_asyncRoundTripVoid",
         "effects" : {
-          "isAsync" : false,
+          "isAsync" : true,
           "isStatic" : false,
           "isThrows" : false
         },
-        "name" : "roundtripNetworkingAPIMethod",
+        "name" : "asyncRoundTripVoid",
         "parameters" : [
-          {
-            "label" : "_",
-            "name" : "method",
-            "type" : {
-              "caseEnum" : {
-                "_0" : "Networking.API.Method"
-              }
-            }
-          }
+
         ],
         "returnType" : {
-          "caseEnum" : {
-            "_0" : "Networking.API.Method"
+          "void" : {
+
           }
         }
       },
       {
-        "abiName" : "bjs_roundtripConfigurationLogLevel",
+        "abiName" : "bjs_asyncRoundTripInt",
         "effects" : {
-          "isAsync" : false,
+          "isAsync" : true,
           "isStatic" : false,
           "isThrows" : false
         },
-        "name" : "roundtripConfigurationLogLevel",
+        "name" : "asyncRoundTripInt",
         "parameters" : [
           {
-            "label" : "_",
-            "name" : "level",
+            "label" : "v",
+            "name" : "v",
             "type" : {
-              "rawValueEnum" : {
-                "_0" : "Configuration.LogLevel",
-                "_1" : "String"
+              "integer" : {
+                "_0" : {
+                  "isSigned" : true,
+                  "width" : "word"
+                }
               }
             }
           }
         ],
         "returnType" : {
-          "rawValueEnum" : {
-            "_0" : "Configuration.LogLevel",
-            "_1" : "String"
+          "integer" : {
+            "_0" : {
+              "isSigned" : true,
+              "width" : "word"
+            }
           }
         }
       },
       {
-        "abiName" : "bjs_roundtripConfigurationPort",
+        "abiName" : "bjs_asyncRoundTripFloat",
         "effects" : {
-          "isAsync" : false,
+          "isAsync" : true,
           "isStatic" : false,
           "isThrows" : false
         },
-        "name" : "roundtripConfigurationPort",
+        "name" : "asyncRoundTripFloat",
         "parameters" : [
           {
-            "label" : "_",
-            "name" : "port",
+            "label" : "v",
+            "name" : "v",
             "type" : {
-              "rawValueEnum" : {
-                "_0" : "Configuration.Port",
-                "_1" : "Int"
+              "float" : {
+
               }
             }
           }
         ],
         "returnType" : {
-          "rawValueEnum" : {
-            "_0" : "Configuration.Port",
-            "_1" : "Int"
+          "float" : {
+
           }
         }
       },
       {
-        "abiName" : "bjs_processConfigurationLogLevel",
+        "abiName" : "bjs_asyncRoundTripDouble",
         "effects" : {
-          "isAsync" : false,
+          "isAsync" : true,
           "isStatic" : false,
           "isThrows" : false
         },
-        "name" : "processConfigurationLogLevel",
+        "name" : "asyncRoundTripDouble",
         "parameters" : [
           {
-            "label" : "_",
-            "name" : "level",
+            "label" : "v",
+            "name" : "v",
             "type" : {
-              "rawValueEnum" : {
-                "_0" : "Configuration.LogLevel",
-                "_1" : "String"
+              "double" : {
+
               }
             }
           }
         ],
         "returnType" : {
-          "rawValueEnum" : {
-            "_0" : "Configuration.Port",
-            "_1" : "Int"
+          "double" : {
+
           }
         }
       },
       {
-        "abiName" : "bjs_roundtripInternalSupportedMethod",
+        "abiName" : "bjs_asyncRoundTripBool",
         "effects" : {
-          "isAsync" : false,
+          "isAsync" : true,
           "isStatic" : false,
           "isThrows" : false
         },
-        "name" : "roundtripInternalSupportedMethod",
+        "name" : "asyncRoundTripBool",
         "parameters" : [
           {
-            "label" : "_",
-            "name" : "method",
+            "label" : "v",
+            "name" : "v",
             "type" : {
-              "caseEnum" : {
-                "_0" : "Internal.SupportedMethod"
+              "bool" : {
+
               }
             }
           }
         ],
         "returnType" : {
-          "caseEnum" : {
-            "_0" : "Internal.SupportedMethod"
+          "bool" : {
+
           }
         }
       },
       {
-        "abiName" : "bjs_roundtripAPIResult",
+        "abiName" : "bjs_asyncRoundTripString",
         "effects" : {
-          "isAsync" : false,
+          "isAsync" : true,
           "isStatic" : false,
           "isThrows" : false
         },
-        "name" : "roundtripAPIResult",
+        "name" : "asyncRoundTripString",
         "parameters" : [
           {
-            "label" : "result",
-            "name" : "result",
+            "label" : "v",
+            "name" : "v",
             "type" : {
-              "associatedValueEnum" : {
-                "_0" : "APIResult"
+              "string" : {
+
               }
             }
           }
         ],
         "returnType" : {
-          "associatedValueEnum" : {
-            "_0" : "APIResult"
+          "string" : {
+
           }
         }
       },
       {
-        "abiName" : "bjs_makeAPIResultSuccess",
+        "abiName" : "bjs_asyncRoundTripSwiftHeapObject",
         "effects" : {
-          "isAsync" : false,
+          "isAsync" : true,
           "isStatic" : false,
           "isThrows" : false
         },
-        "name" : "makeAPIResultSuccess",
+        "name" : "asyncRoundTripSwiftHeapObject",
         "parameters" : [
           {
-            "label" : "_",
-            "name" : "value",
+            "label" : "v",
+            "name" : "v",
             "type" : {
-              "string" : {
+              "swiftHeapObject" : {
+                "_0" : "Greeter"
+              }
+            }
+          }
+        ],
+        "returnType" : {
+          "swiftHeapObject" : {
+            "_0" : "Greeter"
+          }
+        }
+      },
+      {
+        "abiName" : "bjs_asyncRoundTripJSObject",
+        "effects" : {
+          "isAsync" : true,
+          "isStatic" : false,
+          "isThrows" : false
+        },
+        "name" : "asyncRoundTripJSObject",
+        "parameters" : [
+          {
+            "label" : "v",
+            "name" : "v",
+            "type" : {
+              "jsObject" : {
 
               }
             }
           }
         ],
         "returnType" : {
-          "associatedValueEnum" : {
-            "_0" : "APIResult"
+          "jsObject" : {
+
           }
         }
       },
       {
-        "abiName" : "bjs_makeAPIResultFailure",
+        "abiName" : "bjs_takeGreeter",
         "effects" : {
           "isAsync" : false,
           "isStatic" : false,
           "isThrows" : false
         },
-        "name" : "makeAPIResultFailure",
+        "name" : "takeGreeter",
         "parameters" : [
           {
-            "label" : "_",
-            "name" : "value",
+            "label" : "g",
+            "name" : "g",
             "type" : {
-              "integer" : {
-                "_0" : {
-                  "isSigned" : true,
-                  "width" : "word"
-                }
+              "swiftHeapObject" : {
+                "_0" : "Greeter"
+              }
+            }
+          },
+          {
+            "label" : "name",
+            "name" : "name",
+            "type" : {
+              "string" : {
+
               }
             }
           }
         ],
         "returnType" : {
-          "associatedValueEnum" : {
-            "_0" : "APIResult"
+          "void" : {
+
           }
         }
       },
       {
-        "abiName" : "bjs_makeAPIResultInfo",
+        "abiName" : "bjs_createCalculator",
         "effects" : {
           "isAsync" : false,
           "isStatic" : false,
           "isThrows" : false
         },
-        "name" : "makeAPIResultInfo",
+        "name" : "createCalculator",
         "parameters" : [
 
         ],
         "returnType" : {
-          "associatedValueEnum" : {
-            "_0" : "APIResult"
+          "swiftHeapObject" : {
+            "_0" : "Calculator"
           }
         }
       },
       {
-        "abiName" : "bjs_makeAPIResultFlag",
+        "abiName" : "bjs_useCalculator",
         "effects" : {
           "isAsync" : false,
           "isStatic" : false,
           "isThrows" : false
         },
-        "name" : "makeAPIResultFlag",
+        "name" : "useCalculator",
         "parameters" : [
           {
-            "label" : "_",
-            "name" : "value",
+            "label" : "calc",
+            "name" : "calc",
             "type" : {
-              "bool" : {
-
+              "swiftHeapObject" : {
+                "_0" : "Calculator"
+              }
+            }
+          },
+          {
+            "label" : "x",
+            "name" : "x",
+            "type" : {
+              "integer" : {
+                "_0" : {
+                  "isSigned" : true,
+                  "width" : "word"
+                }
+              }
+            }
+          },
+          {
+            "label" : "y",
+            "name" : "y",
+            "type" : {
+              "integer" : {
+                "_0" : {
+                  "isSigned" : true,
+                  "width" : "word"
+                }
               }
             }
           }
         ],
         "returnType" : {
-          "associatedValueEnum" : {
-            "_0" : "APIResult"
+          "integer" : {
+            "_0" : {
+              "isSigned" : true,
+              "width" : "word"
+            }
           }
         }
       },
       {
-        "abiName" : "bjs_makeAPIResultRate",
+        "abiName" : "bjs_testGreeterToJSValue",
         "effects" : {
           "isAsync" : false,
           "isStatic" : false,
           "isThrows" : false
         },
-        "name" : "makeAPIResultRate",
+        "name" : "testGreeterToJSValue",
         "parameters" : [
-          {
-            "label" : "_",
-            "name" : "value",
-            "type" : {
-              "float" : {
 
-              }
-            }
-          }
         ],
         "returnType" : {
-          "associatedValueEnum" : {
-            "_0" : "APIResult"
+          "jsObject" : {
+
           }
         }
       },
       {
-        "abiName" : "bjs_makeAPIResultPrecise",
+        "abiName" : "bjs_testCalculatorToJSValue",
         "effects" : {
           "isAsync" : false,
           "isStatic" : false,
           "isThrows" : false
         },
-        "name" : "makeAPIResultPrecise",
+        "name" : "testCalculatorToJSValue",
         "parameters" : [
-          {
-            "label" : "_",
-            "name" : "value",
-            "type" : {
-              "double" : {
 
-              }
-            }
-          }
         ],
         "returnType" : {
-          "associatedValueEnum" : {
-            "_0" : "APIResult"
+          "jsObject" : {
+
           }
         }
       },
       {
-        "abiName" : "bjs_roundtripComplexResult",
+        "abiName" : "bjs_testSwiftClassAsJSValue",
         "effects" : {
           "isAsync" : false,
           "isStatic" : false,
           "isThrows" : false
         },
-        "name" : "roundtripComplexResult",
+        "name" : "testSwiftClassAsJSValue",
         "parameters" : [
           {
-            "label" : "_",
-            "name" : "result",
+            "label" : "greeter",
+            "name" : "greeter",
             "type" : {
-              "associatedValueEnum" : {
-                "_0" : "ComplexResult"
+              "swiftHeapObject" : {
+                "_0" : "Greeter"
               }
             }
           }
         ],
         "returnType" : {
-          "associatedValueEnum" : {
-            "_0" : "ComplexResult"
+          "jsObject" : {
+
           }
         }
       },
       {
-        "abiName" : "bjs_makeComplexResultSuccess",
+        "abiName" : "bjs_setDirection",
         "effects" : {
           "isAsync" : false,
           "isStatic" : false,
           "isThrows" : false
         },
-        "name" : "makeComplexResultSuccess",
+        "name" : "setDirection",
         "parameters" : [
           {
             "label" : "_",
-            "name" : "value",
+            "name" : "direction",
             "type" : {
-              "string" : {
-
+              "caseEnum" : {
+                "_0" : "Direction"
               }
             }
           }
         ],
         "returnType" : {
-          "associatedValueEnum" : {
-            "_0" : "ComplexResult"
+          "caseEnum" : {
+            "_0" : "Direction"
           }
         }
       },
       {
-        "abiName" : "bjs_makeComplexResultError",
+        "abiName" : "bjs_getDirection",
         "effects" : {
           "isAsync" : false,
           "isStatic" : false,
           "isThrows" : false
         },
-        "name" : "makeComplexResultError",
+        "name" : "getDirection",
         "parameters" : [
-          {
-            "label" : "_",
-            "name" : "message",
-            "type" : {
-              "string" : {
 
-              }
-            }
-          },
+        ],
+        "returnType" : {
+          "caseEnum" : {
+            "_0" : "Direction"
+          }
+        }
+      },
+      {
+        "abiName" : "bjs_processDirection",
+        "effects" : {
+          "isAsync" : false,
+          "isStatic" : false,
+          "isThrows" : false
+        },
+        "name" : "processDirection",
+        "parameters" : [
           {
             "label" : "_",
-            "name" : "code",
+            "name" : "input",
             "type" : {
-              "integer" : {
-                "_0" : {
-                  "isSigned" : true,
-                  "width" : "word"
-                }
+              "caseEnum" : {
+                "_0" : "Direction"
               }
             }
           }
         ],
         "returnType" : {
-          "associatedValueEnum" : {
-            "_0" : "ComplexResult"
+          "caseEnum" : {
+            "_0" : "Status"
           }
         }
       },
       {
-        "abiName" : "bjs_makeComplexResultLocation",
+        "abiName" : "bjs_setTheme",
         "effects" : {
           "isAsync" : false,
           "isStatic" : false,
           "isThrows" : false
         },
-        "name" : "makeComplexResultLocation",
+        "name" : "setTheme",
         "parameters" : [
           {
             "label" : "_",
-            "name" : "lat",
+            "name" : "theme",
             "type" : {
-              "double" : {
-
-              }
-            }
-          },
-          {
-            "label" : "_",
-            "name" : "lng",
-            "type" : {
-              "double" : {
-
-              }
-            }
-          },
-          {
-            "label" : "_",
-            "name" : "name",
-            "type" : {
-              "string" : {
-
+              "rawValueEnum" : {
+                "_0" : "Theme",
+                "_1" : "String"
               }
             }
           }
         ],
         "returnType" : {
-          "associatedValueEnum" : {
-            "_0" : "ComplexResult"
+          "rawValueEnum" : {
+            "_0" : "Theme",
+            "_1" : "String"
           }
         }
       },
       {
-        "abiName" : "bjs_makeComplexResultStatus",
+        "abiName" : "bjs_getTheme",
         "effects" : {
           "isAsync" : false,
           "isStatic" : false,
           "isThrows" : false
         },
-        "name" : "makeComplexResultStatus",
+        "name" : "getTheme",
         "parameters" : [
-          {
-            "label" : "_",
-            "name" : "active",
-            "type" : {
-              "bool" : {
-
-              }
-            }
-          },
-          {
-            "label" : "_",
-            "name" : "code",
-            "type" : {
-              "integer" : {
-                "_0" : {
-                  "isSigned" : true,
-                  "width" : "word"
-                }
-              }
-            }
-          },
-          {
-            "label" : "_",
-            "name" : "message",
-            "type" : {
-              "string" : {
 
-              }
-            }
-          }
         ],
         "returnType" : {
-          "associatedValueEnum" : {
-            "_0" : "ComplexResult"
+          "rawValueEnum" : {
+            "_0" : "Theme",
+            "_1" : "String"
           }
         }
       },
       {
-        "abiName" : "bjs_makeComplexResultCoordinates",
+        "abiName" : "bjs_asyncRoundTripTheme",
         "effects" : {
-          "isAsync" : false,
+          "isAsync" : true,
           "isStatic" : false,
           "isThrows" : false
         },
-        "name" : "makeComplexResultCoordinates",
+        "name" : "asyncRoundTripTheme",
         "parameters" : [
           {
             "label" : "_",
-            "name" : "x",
-            "type" : {
-              "double" : {
-
-              }
-            }
-          },
-          {
-            "label" : "_",
-            "name" : "y",
-            "type" : {
-              "double" : {
-
-              }
-            }
-          },
-          {
-            "label" : "_",
-            "name" : "z",
+            "name" : "v",
             "type" : {
-              "double" : {
-
+              "rawValueEnum" : {
+                "_0" : "Theme",
+                "_1" : "String"
               }
             }
           }
         ],
         "returnType" : {
-          "associatedValueEnum" : {
-            "_0" : "ComplexResult"
+          "rawValueEnum" : {
+            "_0" : "Theme",
+            "_1" : "String"
           }
         }
       },
       {
-        "abiName" : "bjs_makeComplexResultComprehensive",
+        "abiName" : "bjs_asyncRoundTripDirection",
         "effects" : {
-          "isAsync" : false,
+          "isAsync" : true,
           "isStatic" : false,
           "isThrows" : false
         },
-        "name" : "makeComplexResultComprehensive",
+        "name" : "asyncRoundTripDirection",
         "parameters" : [
           {
             "label" : "_",
-            "name" : "flag1",
-            "type" : {
-              "bool" : {
-
-              }
-            }
-          },
-          {
-            "label" : "_",
-            "name" : "flag2",
-            "type" : {
-              "bool" : {
-
-              }
-            }
-          },
-          {
-            "label" : "_",
-            "name" : "count1",
-            "type" : {
-              "integer" : {
-                "_0" : {
-                  "isSigned" : true,
-                  "width" : "word"
-                }
-              }
-            }
-          },
-          {
-            "label" : "_",
-            "name" : "count2",
-            "type" : {
-              "integer" : {
-                "_0" : {
-                  "isSigned" : true,
-                  "width" : "word"
-                }
-              }
-            }
-          },
-          {
-            "label" : "_",
-            "name" : "value1",
-            "type" : {
-              "double" : {
-
-              }
-            }
-          },
-          {
-            "label" : "_",
-            "name" : "value2",
-            "type" : {
-              "double" : {
-
-              }
-            }
-          },
-          {
-            "label" : "_",
-            "name" : "text1",
-            "type" : {
-              "string" : {
-
-              }
-            }
-          },
-          {
-            "label" : "_",
-            "name" : "text2",
-            "type" : {
-              "string" : {
-
-              }
-            }
-          },
-          {
-            "label" : "_",
-            "name" : "text3",
+            "name" : "v",
             "type" : {
-              "string" : {
-
+              "caseEnum" : {
+                "_0" : "Direction"
               }
             }
           }
         ],
         "returnType" : {
-          "associatedValueEnum" : {
-            "_0" : "ComplexResult"
+          "caseEnum" : {
+            "_0" : "Direction"
           }
         }
       },
       {
-        "abiName" : "bjs_makeComplexResultInfo",
+        "abiName" : "bjs_asyncRoundTripOptionalTheme",
         "effects" : {
-          "isAsync" : false,
+          "isAsync" : true,
           "isStatic" : false,
           "isThrows" : false
         },
-        "name" : "makeComplexResultInfo",
+        "name" : "asyncRoundTripOptionalTheme",
         "parameters" : [
-
+          {
+            "label" : "_",
+            "name" : "v",
+            "type" : {
+              "nullable" : {
+                "_0" : {
+                  "rawValueEnum" : {
+                    "_0" : "Theme",
+                    "_1" : "String"
+                  }
+                },
+                "_1" : "null"
+              }
+            }
+          }
         ],
         "returnType" : {
-          "associatedValueEnum" : {
-            "_0" : "ComplexResult"
+          "nullable" : {
+            "_0" : {
+              "rawValueEnum" : {
+                "_0" : "Theme",
+                "_1" : "String"
+              }
+            },
+            "_1" : "null"
           }
         }
       },
       {
-        "abiName" : "bjs_makeUtilitiesResultSuccess",
+        "abiName" : "bjs_asyncRoundTripOptionalDirection",
         "effects" : {
-          "isAsync" : false,
+          "isAsync" : true,
           "isStatic" : false,
           "isThrows" : false
         },
-        "name" : "makeUtilitiesResultSuccess",
+        "name" : "asyncRoundTripOptionalDirection",
         "parameters" : [
           {
             "label" : "_",
-            "name" : "message",
+            "name" : "v",
             "type" : {
-              "string" : {
-
+              "nullable" : {
+                "_0" : {
+                  "caseEnum" : {
+                    "_0" : "Direction"
+                  }
+                },
+                "_1" : "null"
               }
             }
           }
         ],
         "returnType" : {
-          "associatedValueEnum" : {
-            "_0" : "Utilities.Result"
+          "nullable" : {
+            "_0" : {
+              "caseEnum" : {
+                "_0" : "Direction"
+              }
+            },
+            "_1" : "null"
           }
         }
       },
       {
-        "abiName" : "bjs_makeUtilitiesResultFailure",
+        "abiName" : "bjs_asyncRoundTripDirectionArray",
         "effects" : {
-          "isAsync" : false,
+          "isAsync" : true,
           "isStatic" : false,
           "isThrows" : false
         },
-        "name" : "makeUtilitiesResultFailure",
+        "name" : "asyncRoundTripDirectionArray",
         "parameters" : [
           {
             "label" : "_",
-            "name" : "error",
+            "name" : "v",
             "type" : {
-              "string" : {
-
-              }
-            }
-          },
-          {
-            "label" : "_",
-            "name" : "code",
-            "type" : {
-              "integer" : {
-                "_0" : {
-                  "isSigned" : true,
-                  "width" : "word"
-                }
+              "array" : {
+                "_0" : {
+                  "caseEnum" : {
+                    "_0" : "Direction"
+                  }
+                }
               }
             }
           }
         ],
         "returnType" : {
-          "associatedValueEnum" : {
-            "_0" : "Utilities.Result"
+          "array" : {
+            "_0" : {
+              "caseEnum" : {
+                "_0" : "Direction"
+              }
+            }
           }
         }
       },
       {
-        "abiName" : "bjs_makeUtilitiesResultStatus",
+        "abiName" : "bjs_asyncRoundTripDirectionDict",
         "effects" : {
-          "isAsync" : false,
+          "isAsync" : true,
           "isStatic" : false,
           "isThrows" : false
         },
-        "name" : "makeUtilitiesResultStatus",
+        "name" : "asyncRoundTripDirectionDict",
         "parameters" : [
           {
             "label" : "_",
-            "name" : "active",
-            "type" : {
-              "bool" : {
-
-              }
-            }
-          },
-          {
-            "label" : "_",
-            "name" : "code",
+            "name" : "v",
             "type" : {
-              "integer" : {
+              "dictionary" : {
                 "_0" : {
-                  "isSigned" : true,
-                  "width" : "word"
+                  "caseEnum" : {
+                    "_0" : "Direction"
+                  }
                 }
               }
             }
-          },
-          {
-            "label" : "_",
-            "name" : "message",
-            "type" : {
-              "string" : {
-
-              }
-            }
           }
         ],
         "returnType" : {
-          "associatedValueEnum" : {
-            "_0" : "Utilities.Result"
+          "dictionary" : {
+            "_0" : {
+              "caseEnum" : {
+                "_0" : "Direction"
+              }
+            }
           }
         }
       },
       {
-        "abiName" : "bjs_makeAPINetworkingResultSuccess",
+        "abiName" : "bjs_asyncRoundTripThemeArray",
         "effects" : {
-          "isAsync" : false,
+          "isAsync" : true,
           "isStatic" : false,
           "isThrows" : false
         },
-        "name" : "makeAPINetworkingResultSuccess",
+        "name" : "asyncRoundTripThemeArray",
         "parameters" : [
           {
             "label" : "_",
-            "name" : "message",
+            "name" : "v",
             "type" : {
-              "string" : {
-
+              "array" : {
+                "_0" : {
+                  "rawValueEnum" : {
+                    "_0" : "Theme",
+                    "_1" : "String"
+                  }
+                }
               }
             }
           }
         ],
         "returnType" : {
-          "associatedValueEnum" : {
-            "_0" : "API.NetworkingResult"
+          "array" : {
+            "_0" : {
+              "rawValueEnum" : {
+                "_0" : "Theme",
+                "_1" : "String"
+              }
+            }
           }
         }
       },
       {
-        "abiName" : "bjs_makeAPINetworkingResultFailure",
+        "abiName" : "bjs_asyncRoundTripThemeDict",
         "effects" : {
-          "isAsync" : false,
+          "isAsync" : true,
           "isStatic" : false,
           "isThrows" : false
         },
-        "name" : "makeAPINetworkingResultFailure",
+        "name" : "asyncRoundTripThemeDict",
         "parameters" : [
           {
             "label" : "_",
-            "name" : "error",
-            "type" : {
-              "string" : {
-
-              }
-            }
-          },
-          {
-            "label" : "_",
-            "name" : "code",
+            "name" : "v",
             "type" : {
-              "integer" : {
+              "dictionary" : {
                 "_0" : {
-                  "isSigned" : true,
-                  "width" : "word"
+                  "rawValueEnum" : {
+                    "_0" : "Theme",
+                    "_1" : "String"
+                  }
                 }
               }
             }
           }
         ],
         "returnType" : {
-          "associatedValueEnum" : {
-            "_0" : "API.NetworkingResult"
+          "dictionary" : {
+            "_0" : {
+              "rawValueEnum" : {
+                "_0" : "Theme",
+                "_1" : "String"
+              }
+            }
           }
         }
       },
       {
-        "abiName" : "bjs_roundtripUtilitiesResult",
+        "abiName" : "bjs_asyncRoundTripFileSize",
         "effects" : {
-          "isAsync" : false,
+          "isAsync" : true,
           "isStatic" : false,
           "isThrows" : false
         },
-        "name" : "roundtripUtilitiesResult",
+        "name" : "asyncRoundTripFileSize",
         "parameters" : [
           {
             "label" : "_",
-            "name" : "result",
+            "name" : "v",
             "type" : {
-              "associatedValueEnum" : {
-                "_0" : "Utilities.Result"
+              "rawValueEnum" : {
+                "_0" : "FileSize",
+                "_1" : "Int64"
               }
             }
           }
         ],
         "returnType" : {
-          "associatedValueEnum" : {
-            "_0" : "Utilities.Result"
+          "rawValueEnum" : {
+            "_0" : "FileSize",
+            "_1" : "Int64"
           }
         }
       },
       {
-        "abiName" : "bjs_roundtripAPINetworkingResult",
+        "abiName" : "bjs_asyncRoundTripOptionalFileSize",
         "effects" : {
-          "isAsync" : false,
+          "isAsync" : true,
           "isStatic" : false,
           "isThrows" : false
         },
-        "name" : "roundtripAPINetworkingResult",
+        "name" : "asyncRoundTripOptionalFileSize",
         "parameters" : [
           {
             "label" : "_",
-            "name" : "result",
+            "name" : "v",
             "type" : {
-              "associatedValueEnum" : {
-                "_0" : "API.NetworkingResult"
+              "nullable" : {
+                "_0" : {
+                  "rawValueEnum" : {
+                    "_0" : "FileSize",
+                    "_1" : "Int64"
+                  }
+                },
+                "_1" : "null"
               }
             }
           }
         ],
         "returnType" : {
-          "associatedValueEnum" : {
-            "_0" : "API.NetworkingResult"
+          "nullable" : {
+            "_0" : {
+              "rawValueEnum" : {
+                "_0" : "FileSize",
+                "_1" : "Int64"
+              }
+            },
+            "_1" : "null"
           }
         }
       },
       {
-        "abiName" : "bjs_roundTripAllTypesResult",
+        "abiName" : "bjs_asyncRoundTripAssociatedValueEnum",
         "effects" : {
-          "isAsync" : false,
+          "isAsync" : true,
           "isStatic" : false,
           "isThrows" : false
         },
-        "name" : "roundTripAllTypesResult",
+        "name" : "asyncRoundTripAssociatedValueEnum",
         "parameters" : [
           {
             "label" : "_",
-            "name" : "result",
+            "name" : "v",
             "type" : {
               "associatedValueEnum" : {
-                "_0" : "AllTypesResult"
+                "_0" : "AsyncPayloadResult"
               }
             }
           }
         ],
         "returnType" : {
           "associatedValueEnum" : {
-            "_0" : "AllTypesResult"
+            "_0" : "AsyncPayloadResult"
           }
         }
       },
       {
-        "abiName" : "bjs_roundTripTypedPayloadResult",
+        "abiName" : "bjs_asyncRoundTripOptionalAssociatedValueEnum",
         "effects" : {
-          "isAsync" : false,
+          "isAsync" : true,
           "isStatic" : false,
           "isThrows" : false
         },
-        "name" : "roundTripTypedPayloadResult",
+        "name" : "asyncRoundTripOptionalAssociatedValueEnum",
         "parameters" : [
           {
             "label" : "_",
-            "name" : "result",
+            "name" : "v",
             "type" : {
-              "associatedValueEnum" : {
-                "_0" : "TypedPayloadResult"
+              "nullable" : {
+                "_0" : {
+                  "associatedValueEnum" : {
+                    "_0" : "AsyncPayloadResult"
+                  }
+                },
+                "_1" : "null"
               }
             }
           }
         ],
         "returnType" : {
-          "associatedValueEnum" : {
-            "_0" : "TypedPayloadResult"
+          "nullable" : {
+            "_0" : {
+              "associatedValueEnum" : {
+                "_0" : "AsyncPayloadResult"
+              }
+            },
+            "_1" : "null"
           }
         }
       },
       {
-        "abiName" : "bjs_createPropertyHolder",
+        "abiName" : "bjs_setHttpStatus",
         "effects" : {
           "isAsync" : false,
           "isStatic" : false,
           "isThrows" : false
         },
-        "name" : "createPropertyHolder",
+        "name" : "setHttpStatus",
         "parameters" : [
           {
-            "label" : "intValue",
-            "name" : "intValue",
-            "type" : {
-              "integer" : {
-                "_0" : {
-                  "isSigned" : true,
-                  "width" : "word"
-                }
-              }
-            }
-          },
-          {
-            "label" : "floatValue",
-            "name" : "floatValue",
-            "type" : {
-              "float" : {
-
-              }
-            }
-          },
-          {
-            "label" : "doubleValue",
-            "name" : "doubleValue",
-            "type" : {
-              "double" : {
-
-              }
-            }
-          },
-          {
-            "label" : "boolValue",
-            "name" : "boolValue",
-            "type" : {
-              "bool" : {
-
-              }
-            }
-          },
-          {
-            "label" : "stringValue",
-            "name" : "stringValue",
-            "type" : {
-              "string" : {
-
-              }
-            }
-          },
-          {
-            "label" : "jsObject",
-            "name" : "jsObject",
+            "label" : "_",
+            "name" : "status",
             "type" : {
-              "jsObject" : {
-
+              "rawValueEnum" : {
+                "_0" : "HttpStatus",
+                "_1" : "Int"
               }
             }
           }
         ],
         "returnType" : {
-          "swiftHeapObject" : {
-            "_0" : "PropertyHolder"
+          "rawValueEnum" : {
+            "_0" : "HttpStatus",
+            "_1" : "Int"
           }
         }
       },
       {
-        "abiName" : "bjs_testPropertyHolder",
+        "abiName" : "bjs_getHttpStatus",
         "effects" : {
           "isAsync" : false,
           "isStatic" : false,
           "isThrows" : false
         },
-        "name" : "testPropertyHolder",
+        "name" : "getHttpStatus",
         "parameters" : [
-          {
-            "label" : "holder",
-            "name" : "holder",
-            "type" : {
-              "swiftHeapObject" : {
-                "_0" : "PropertyHolder"
-              }
-            }
-          }
+
         ],
         "returnType" : {
-          "string" : {
-
+          "rawValueEnum" : {
+            "_0" : "HttpStatus",
+            "_1" : "Int"
           }
         }
       },
       {
-        "abiName" : "bjs_resetObserverCounts",
+        "abiName" : "bjs_setFileSize",
         "effects" : {
           "isAsync" : false,
           "isStatic" : false,
           "isThrows" : false
         },
-        "name" : "resetObserverCounts",
+        "name" : "setFileSize",
         "parameters" : [
-
+          {
+            "label" : "_",
+            "name" : "size",
+            "type" : {
+              "rawValueEnum" : {
+                "_0" : "FileSize",
+                "_1" : "Int64"
+              }
+            }
+          }
         ],
         "returnType" : {
-          "void" : {
-
+          "rawValueEnum" : {
+            "_0" : "FileSize",
+            "_1" : "Int64"
           }
         }
       },
       {
-        "abiName" : "bjs_getObserverStats",
+        "abiName" : "bjs_getFileSize",
         "effects" : {
           "isAsync" : false,
           "isStatic" : false,
           "isThrows" : false
         },
-        "name" : "getObserverStats",
+        "name" : "getFileSize",
         "parameters" : [
 
         ],
         "returnType" : {
-          "string" : {
-
+          "rawValueEnum" : {
+            "_0" : "FileSize",
+            "_1" : "Int64"
           }
         }
       },
       {
-        "abiName" : "bjs_formatName",
+        "abiName" : "bjs_setSessionId",
         "effects" : {
           "isAsync" : false,
           "isStatic" : false,
           "isThrows" : false
         },
-        "name" : "formatName",
+        "name" : "setSessionId",
         "parameters" : [
           {
             "label" : "_",
-            "name" : "name",
-            "type" : {
-              "string" : {
-
-              }
-            }
-          },
-          {
-            "label" : "transform",
-            "name" : "transform",
+            "name" : "session",
             "type" : {
-              "closure" : {
-                "_0" : {
-                  "isAsync" : false,
-                  "isThrows" : false,
-                  "mangleName" : "20BridgeJSRuntimeTestsSS_SS",
-                  "moduleName" : "BridgeJSRuntimeTests",
-                  "parameters" : [
-                    {
-                      "string" : {
-
-                      }
-                    }
-                  ],
-                  "returnType" : {
-                    "string" : {
-
-                    }
-                  },
-                  "sendingParameters" : false
-                },
-                "useJSTypedClosure" : false
+              "rawValueEnum" : {
+                "_0" : "SessionId",
+                "_1" : "UInt64"
               }
             }
           }
         ],
         "returnType" : {
-          "string" : {
-
+          "rawValueEnum" : {
+            "_0" : "SessionId",
+            "_1" : "UInt64"
           }
         }
       },
       {
-        "abiName" : "bjs_makeFormatter",
+        "abiName" : "bjs_getSessionId",
         "effects" : {
           "isAsync" : false,
           "isStatic" : false,
           "isThrows" : false
         },
-        "name" : "makeFormatter",
+        "name" : "getSessionId",
         "parameters" : [
-          {
-            "label" : "prefix",
-            "name" : "prefix",
-            "type" : {
-              "string" : {
 
-              }
-            }
-          }
         ],
         "returnType" : {
-          "closure" : {
-            "_0" : {
-              "isAsync" : false,
-              "isThrows" : false,
-              "mangleName" : "20BridgeJSRuntimeTestsSS_SS",
-              "moduleName" : "BridgeJSRuntimeTests",
-              "parameters" : [
-                {
-                  "string" : {
-
-                  }
-                }
-              ],
-              "returnType" : {
-                "string" : {
-
-                }
-              },
-              "sendingParameters" : false
-            },
-            "useJSTypedClosure" : false
+          "rawValueEnum" : {
+            "_0" : "SessionId",
+            "_1" : "UInt64"
           }
         }
       },
       {
-        "abiName" : "bjs_makeAdder",
+        "abiName" : "bjs_processTheme",
         "effects" : {
           "isAsync" : false,
           "isStatic" : false,
           "isThrows" : false
         },
-        "name" : "makeAdder",
+        "name" : "processTheme",
         "parameters" : [
           {
-            "label" : "base",
-            "name" : "base",
+            "label" : "_",
+            "name" : "theme",
             "type" : {
-              "integer" : {
-                "_0" : {
-                  "isSigned" : true,
-                  "width" : "word"
-                }
+              "rawValueEnum" : {
+                "_0" : "Theme",
+                "_1" : "String"
               }
             }
           }
         ],
         "returnType" : {
-          "closure" : {
-            "_0" : {
-              "isAsync" : false,
-              "isThrows" : false,
-              "mangleName" : "20BridgeJSRuntimeTestsSi_Si",
-              "moduleName" : "BridgeJSRuntimeTests",
-              "parameters" : [
-                {
-                  "integer" : {
-                    "_0" : {
-                      "isSigned" : true,
-                      "width" : "word"
-                    }
-                  }
-                }
-              ],
-              "returnType" : {
-                "integer" : {
-                  "_0" : {
-                    "isSigned" : true,
-                    "width" : "word"
-                  }
-                }
-              },
-              "sendingParameters" : false
-            },
-            "useJSTypedClosure" : false
+          "rawValueEnum" : {
+            "_0" : "HttpStatus",
+            "_1" : "Int"
           }
         }
       },
       {
-        "abiName" : "bjs_roundTripPointerFields",
+        "abiName" : "bjs_setTSDirection",
         "effects" : {
           "isAsync" : false,
           "isStatic" : false,
           "isThrows" : false
         },
-        "name" : "roundTripPointerFields",
+        "name" : "setTSDirection",
         "parameters" : [
           {
             "label" : "_",
-            "name" : "value",
+            "name" : "direction",
             "type" : {
-              "swiftStruct" : {
-                "_0" : "PointerFields"
+              "caseEnum" : {
+                "_0" : "TSDirection"
               }
             }
           }
         ],
         "returnType" : {
-          "swiftStruct" : {
-            "_0" : "PointerFields"
+          "caseEnum" : {
+            "_0" : "TSDirection"
           }
         }
       },
       {
-        "abiName" : "bjs_testStructDefault",
+        "abiName" : "bjs_getTSDirection",
         "effects" : {
           "isAsync" : false,
           "isStatic" : false,
           "isThrows" : false
         },
-        "name" : "testStructDefault",
+        "name" : "getTSDirection",
         "parameters" : [
-          {
-            "defaultValue" : {
-              "structLiteral" : {
-                "_0" : "DataPoint",
-                "_1" : [
-                  {
-                    "name" : "x",
-                    "value" : {
-                      "float" : {
-                        "_0" : 1
-                      }
-                    }
-                  },
-                  {
-                    "name" : "y",
-                    "value" : {
-                      "float" : {
-                        "_0" : 2
-                      }
-                    }
-                  },
-                  {
-                    "name" : "label",
-                    "value" : {
-                      "string" : {
-                        "_0" : "default"
-                      }
-                    }
-                  },
-                  {
-                    "name" : "optCount",
-                    "value" : {
-                      "null" : {
-
-                      }
-                    }
-                  },
-                  {
-                    "name" : "optFlag",
-                    "value" : {
-                      "null" : {
 
-                      }
-                    }
-                  }
-                ]
-              }
-            },
-            "label" : "point",
-            "name" : "point",
-            "type" : {
-              "swiftStruct" : {
-                "_0" : "DataPoint"
-              }
-            }
-          }
         ],
         "returnType" : {
-          "string" : {
-
+          "caseEnum" : {
+            "_0" : "TSDirection"
           }
         }
       },
       {
-        "abiName" : "bjs_cartToJSObject",
+        "abiName" : "bjs_setTSTheme",
         "effects" : {
           "isAsync" : false,
           "isStatic" : false,
           "isThrows" : false
         },
-        "name" : "cartToJSObject",
+        "name" : "setTSTheme",
         "parameters" : [
           {
             "label" : "_",
-            "name" : "cart",
+            "name" : "theme",
             "type" : {
-              "swiftStruct" : {
-                "_0" : "CopyableCart"
+              "rawValueEnum" : {
+                "_0" : "TSTheme",
+                "_1" : "String"
               }
             }
           }
         ],
         "returnType" : {
-          "jsObject" : {
-
+          "rawValueEnum" : {
+            "_0" : "TSTheme",
+            "_1" : "String"
           }
         }
       },
       {
-        "abiName" : "bjs_nestedCartToJSObject",
+        "abiName" : "bjs_getTSTheme",
         "effects" : {
           "isAsync" : false,
           "isStatic" : false,
           "isThrows" : false
         },
-        "name" : "nestedCartToJSObject",
+        "name" : "getTSTheme",
         "parameters" : [
-          {
-            "label" : "_",
-            "name" : "cart",
-            "type" : {
-              "swiftStruct" : {
-                "_0" : "CopyableNestedCart"
-              }
-            }
-          }
+
         ],
         "returnType" : {
-          "jsObject" : {
-
+          "rawValueEnum" : {
+            "_0" : "TSTheme",
+            "_1" : "String"
           }
         }
       },
       {
-        "abiName" : "bjs_roundTripDataPoint",
+        "abiName" : "bjs_createConverter",
         "effects" : {
           "isAsync" : false,
           "isStatic" : false,
           "isThrows" : false
         },
-        "name" : "roundTripDataPoint",
+        "name" : "createConverter",
         "parameters" : [
-          {
-            "label" : "_",
-            "name" : "data",
-            "type" : {
-              "swiftStruct" : {
-                "_0" : "DataPoint"
-              }
-            }
-          }
+
         ],
         "returnType" : {
-          "swiftStruct" : {
-            "_0" : "DataPoint"
+          "swiftHeapObject" : {
+            "_0" : "Utils.Converter"
           }
         }
       },
       {
-        "abiName" : "bjs_roundTripPublicPoint",
+        "abiName" : "bjs_useConverter",
         "effects" : {
           "isAsync" : false,
           "isStatic" : false,
           "isThrows" : false
         },
-        "name" : "roundTripPublicPoint",
+        "name" : "useConverter",
         "parameters" : [
           {
-            "label" : "_",
-            "name" : "point",
+            "label" : "converter",
+            "name" : "converter",
             "type" : {
-              "swiftStruct" : {
-                "_0" : "PublicPoint"
+              "swiftHeapObject" : {
+                "_0" : "Utils.Converter"
+              }
+            }
+          },
+          {
+            "label" : "value",
+            "name" : "value",
+            "type" : {
+              "integer" : {
+                "_0" : {
+                  "isSigned" : true,
+                  "width" : "word"
+                }
               }
             }
           }
         ],
         "returnType" : {
-          "swiftStruct" : {
-            "_0" : "PublicPoint"
+          "string" : {
+
           }
         }
       },
       {
-        "abiName" : "bjs_roundTripContact",
+        "abiName" : "bjs_roundTripConverterArray",
         "effects" : {
           "isAsync" : false,
           "isStatic" : false,
           "isThrows" : false
         },
-        "name" : "roundTripContact",
+        "name" : "roundTripConverterArray",
         "parameters" : [
           {
             "label" : "_",
-            "name" : "contact",
+            "name" : "converters",
             "type" : {
-              "swiftStruct" : {
-                "_0" : "Contact"
+              "array" : {
+                "_0" : {
+                  "swiftHeapObject" : {
+                    "_0" : "Utils.Converter"
+                  }
+                }
               }
             }
           }
         ],
         "returnType" : {
-          "swiftStruct" : {
-            "_0" : "Contact"
+          "array" : {
+            "_0" : {
+              "swiftHeapObject" : {
+                "_0" : "Utils.Converter"
+              }
+            }
           }
         }
       },
       {
-        "abiName" : "bjs_roundTripConfig",
+        "abiName" : "bjs_createHTTPServer",
         "effects" : {
           "isAsync" : false,
           "isStatic" : false,
           "isThrows" : false
         },
-        "name" : "roundTripConfig",
+        "name" : "createHTTPServer",
         "parameters" : [
-          {
-            "label" : "_",
-            "name" : "config",
-            "type" : {
-              "swiftStruct" : {
-                "_0" : "Config"
-              }
-            }
-          }
+
         ],
         "returnType" : {
-          "swiftStruct" : {
-            "_0" : "Config"
+          "swiftHeapObject" : {
+            "_0" : "Networking.API.HTTPServer"
           }
         }
       },
       {
-        "abiName" : "bjs_roundTripSessionData",
+        "abiName" : "bjs_createUUID",
         "effects" : {
           "isAsync" : false,
           "isStatic" : false,
           "isThrows" : false
         },
-        "name" : "roundTripSessionData",
+        "name" : "createUUID",
         "parameters" : [
           {
-            "label" : "_",
-            "name" : "session",
+            "label" : "value",
+            "name" : "value",
             "type" : {
-              "swiftStruct" : {
-                "_0" : "SessionData"
+              "string" : {
+
               }
             }
           }
         ],
         "returnType" : {
-          "swiftStruct" : {
-            "_0" : "SessionData"
+          "swiftHeapObject" : {
+            "_0" : "UUID"
           }
         }
       },
       {
-        "abiName" : "bjs_roundTripValidationReport",
+        "abiName" : "bjs_roundTripUUID",
         "effects" : {
           "isAsync" : false,
           "isStatic" : false,
           "isThrows" : false
         },
-        "name" : "roundTripValidationReport",
+        "name" : "roundTripUUID",
         "parameters" : [
           {
             "label" : "_",
-            "name" : "report",
+            "name" : "uuid",
             "type" : {
-              "swiftStruct" : {
-                "_0" : "ValidationReport"
+              "swiftHeapObject" : {
+                "_0" : "UUID"
               }
             }
           }
         ],
         "returnType" : {
-          "swiftStruct" : {
-            "_0" : "ValidationReport"
+          "swiftHeapObject" : {
+            "_0" : "UUID"
           }
         }
       },
       {
-        "abiName" : "bjs_roundTripAdvancedConfig",
+        "abiName" : "bjs_roundtripNetworkingAPIMethod",
         "effects" : {
           "isAsync" : false,
           "isStatic" : false,
           "isThrows" : false
         },
-        "name" : "roundTripAdvancedConfig",
+        "name" : "roundtripNetworkingAPIMethod",
         "parameters" : [
           {
             "label" : "_",
-            "name" : "config",
+            "name" : "method",
             "type" : {
-              "swiftStruct" : {
-                "_0" : "AdvancedConfig"
+              "caseEnum" : {
+                "_0" : "Networking.API.Method"
               }
             }
           }
         ],
         "returnType" : {
-          "swiftStruct" : {
-            "_0" : "AdvancedConfig"
+          "caseEnum" : {
+            "_0" : "Networking.API.Method"
           }
         }
       },
       {
-        "abiName" : "bjs_roundTripMeasurementConfig",
+        "abiName" : "bjs_roundtripConfigurationLogLevel",
         "effects" : {
           "isAsync" : false,
           "isStatic" : false,
           "isThrows" : false
         },
-        "name" : "roundTripMeasurementConfig",
+        "name" : "roundtripConfigurationLogLevel",
         "parameters" : [
           {
             "label" : "_",
-            "name" : "config",
+            "name" : "level",
             "type" : {
-              "swiftStruct" : {
-                "_0" : "MeasurementConfig"
+              "rawValueEnum" : {
+                "_0" : "Configuration.LogLevel",
+                "_1" : "String"
               }
             }
           }
         ],
         "returnType" : {
-          "swiftStruct" : {
-            "_0" : "MeasurementConfig"
+          "rawValueEnum" : {
+            "_0" : "Configuration.LogLevel",
+            "_1" : "String"
           }
         }
       },
       {
-        "abiName" : "bjs_updateValidationReport",
+        "abiName" : "bjs_roundtripConfigurationPort",
         "effects" : {
           "isAsync" : false,
           "isStatic" : false,
           "isThrows" : false
         },
-        "name" : "updateValidationReport",
+        "name" : "roundtripConfigurationPort",
         "parameters" : [
           {
             "label" : "_",
-            "name" : "newResult",
-            "type" : {
-              "nullable" : {
-                "_0" : {
-                  "associatedValueEnum" : {
-                    "_0" : "APIResult"
-                  }
-                },
-                "_1" : "null"
-              }
-            }
-          },
-          {
-            "label" : "_",
-            "name" : "report",
+            "name" : "port",
             "type" : {
-              "swiftStruct" : {
-                "_0" : "ValidationReport"
+              "rawValueEnum" : {
+                "_0" : "Configuration.Port",
+                "_1" : "Int"
               }
             }
           }
         ],
         "returnType" : {
-          "swiftStruct" : {
-            "_0" : "ValidationReport"
+          "rawValueEnum" : {
+            "_0" : "Configuration.Port",
+            "_1" : "Int"
           }
         }
       },
       {
-        "abiName" : "bjs_testContainerWithStruct",
+        "abiName" : "bjs_processConfigurationLogLevel",
         "effects" : {
           "isAsync" : false,
           "isStatic" : false,
           "isThrows" : false
         },
-        "name" : "testContainerWithStruct",
+        "name" : "processConfigurationLogLevel",
         "parameters" : [
           {
             "label" : "_",
-            "name" : "point",
+            "name" : "level",
             "type" : {
-              "swiftStruct" : {
-                "_0" : "DataPoint"
+              "rawValueEnum" : {
+                "_0" : "Configuration.LogLevel",
+                "_1" : "String"
               }
             }
           }
         ],
         "returnType" : {
-          "swiftHeapObject" : {
-            "_0" : "Container"
+          "rawValueEnum" : {
+            "_0" : "Configuration.Port",
+            "_1" : "Int"
           }
         }
       },
       {
-        "abiName" : "bjs_roundTripJSObjectContainer",
+        "abiName" : "bjs_roundtripInternalSupportedMethod",
         "effects" : {
           "isAsync" : false,
           "isStatic" : false,
           "isThrows" : false
         },
-        "name" : "roundTripJSObjectContainer",
+        "name" : "roundtripInternalSupportedMethod",
         "parameters" : [
           {
             "label" : "_",
-            "name" : "container",
+            "name" : "method",
             "type" : {
-              "swiftStruct" : {
-                "_0" : "JSObjectContainer"
+              "caseEnum" : {
+                "_0" : "Internal.SupportedMethod"
               }
             }
           }
         ],
         "returnType" : {
-          "swiftStruct" : {
-            "_0" : "JSObjectContainer"
+          "caseEnum" : {
+            "_0" : "Internal.SupportedMethod"
           }
         }
       },
       {
-        "abiName" : "bjs_roundTripFooContainer",
+        "abiName" : "bjs_roundtripAPIResult",
         "effects" : {
           "isAsync" : false,
           "isStatic" : false,
           "isThrows" : false
         },
-        "name" : "roundTripFooContainer",
+        "name" : "roundtripAPIResult",
         "parameters" : [
           {
-            "label" : "_",
-            "name" : "container",
+            "label" : "result",
+            "name" : "result",
             "type" : {
-              "swiftStruct" : {
-                "_0" : "FooContainer"
+              "associatedValueEnum" : {
+                "_0" : "APIResult"
               }
             }
           }
         ],
         "returnType" : {
-          "swiftStruct" : {
-            "_0" : "FooContainer"
+          "associatedValueEnum" : {
+            "_0" : "APIResult"
           }
         }
       },
       {
-        "abiName" : "bjs_roundTripArrayMembers",
+        "abiName" : "bjs_makeAPIResultSuccess",
         "effects" : {
           "isAsync" : false,
           "isStatic" : false,
           "isThrows" : false
         },
-        "name" : "roundTripArrayMembers",
+        "name" : "makeAPIResultSuccess",
         "parameters" : [
           {
             "label" : "_",
             "name" : "value",
             "type" : {
-              "swiftStruct" : {
-                "_0" : "ArrayMembers"
+              "string" : {
+
               }
             }
           }
         ],
         "returnType" : {
-          "swiftStruct" : {
-            "_0" : "ArrayMembers"
+          "associatedValueEnum" : {
+            "_0" : "APIResult"
           }
         }
       },
       {
-        "abiName" : "bjs_arrayMembersSum",
+        "abiName" : "bjs_makeAPIResultFailure",
         "effects" : {
           "isAsync" : false,
           "isStatic" : false,
           "isThrows" : false
         },
-        "name" : "arrayMembersSum",
+        "name" : "makeAPIResultFailure",
         "parameters" : [
           {
             "label" : "_",
             "name" : "value",
             "type" : {
-              "swiftStruct" : {
-                "_0" : "ArrayMembers"
+              "integer" : {
+                "_0" : {
+                  "isSigned" : true,
+                  "width" : "word"
+                }
               }
             }
-          },
+          }
+        ],
+        "returnType" : {
+          "associatedValueEnum" : {
+            "_0" : "APIResult"
+          }
+        }
+      },
+      {
+        "abiName" : "bjs_makeAPIResultInfo",
+        "effects" : {
+          "isAsync" : false,
+          "isStatic" : false,
+          "isThrows" : false
+        },
+        "name" : "makeAPIResultInfo",
+        "parameters" : [
+
+        ],
+        "returnType" : {
+          "associatedValueEnum" : {
+            "_0" : "APIResult"
+          }
+        }
+      },
+      {
+        "abiName" : "bjs_makeAPIResultFlag",
+        "effects" : {
+          "isAsync" : false,
+          "isStatic" : false,
+          "isThrows" : false
+        },
+        "name" : "makeAPIResultFlag",
+        "parameters" : [
           {
             "label" : "_",
-            "name" : "values",
+            "name" : "value",
             "type" : {
-              "array" : {
-                "_0" : {
-                  "integer" : {
-                    "_0" : {
-                      "isSigned" : true,
-                      "width" : "word"
-                    }
-                  }
-                }
+              "bool" : {
+
               }
             }
           }
         ],
         "returnType" : {
-          "integer" : {
-            "_0" : {
-              "isSigned" : true,
-              "width" : "word"
-            }
+          "associatedValueEnum" : {
+            "_0" : "APIResult"
           }
         }
       },
       {
-        "abiName" : "bjs_arrayMembersFirst",
+        "abiName" : "bjs_makeAPIResultRate",
         "effects" : {
           "isAsync" : false,
           "isStatic" : false,
           "isThrows" : false
         },
-        "name" : "arrayMembersFirst",
+        "name" : "makeAPIResultRate",
         "parameters" : [
           {
             "label" : "_",
             "name" : "value",
             "type" : {
-              "swiftStruct" : {
-                "_0" : "ArrayMembers"
+              "float" : {
+
               }
             }
-          },
+          }
+        ],
+        "returnType" : {
+          "associatedValueEnum" : {
+            "_0" : "APIResult"
+          }
+        }
+      },
+      {
+        "abiName" : "bjs_makeAPIResultPrecise",
+        "effects" : {
+          "isAsync" : false,
+          "isStatic" : false,
+          "isThrows" : false
+        },
+        "name" : "makeAPIResultPrecise",
+        "parameters" : [
           {
             "label" : "_",
-            "name" : "values",
+            "name" : "value",
             "type" : {
-              "array" : {
-                "_0" : {
-                  "string" : {
+              "double" : {
 
-                  }
-                }
               }
             }
           }
         ],
         "returnType" : {
-          "nullable" : {
-            "_0" : {
+          "associatedValueEnum" : {
+            "_0" : "APIResult"
+          }
+        }
+      },
+      {
+        "abiName" : "bjs_roundtripComplexResult",
+        "effects" : {
+          "isAsync" : false,
+          "isStatic" : false,
+          "isThrows" : false
+        },
+        "name" : "roundtripComplexResult",
+        "parameters" : [
+          {
+            "label" : "_",
+            "name" : "result",
+            "type" : {
+              "associatedValueEnum" : {
+                "_0" : "ComplexResult"
+              }
+            }
+          }
+        ],
+        "returnType" : {
+          "associatedValueEnum" : {
+            "_0" : "ComplexResult"
+          }
+        }
+      },
+      {
+        "abiName" : "bjs_makeComplexResultSuccess",
+        "effects" : {
+          "isAsync" : false,
+          "isStatic" : false,
+          "isThrows" : false
+        },
+        "name" : "makeComplexResultSuccess",
+        "parameters" : [
+          {
+            "label" : "_",
+            "name" : "value",
+            "type" : {
               "string" : {
 
               }
-            },
-            "_1" : "null"
+            }
+          }
+        ],
+        "returnType" : {
+          "associatedValueEnum" : {
+            "_0" : "ComplexResult"
           }
         }
-      }
-    ],
-    "protocols" : [
+      },
       {
-        "methods" : [
+        "abiName" : "bjs_makeComplexResultError",
+        "effects" : {
+          "isAsync" : false,
+          "isStatic" : false,
+          "isThrows" : false
+        },
+        "name" : "makeComplexResultError",
+        "parameters" : [
+          {
+            "label" : "_",
+            "name" : "message",
+            "type" : {
+              "string" : {
 
-        ],
-        "name" : "ArrayElementProtocol",
-        "properties" : [
+              }
+            }
+          },
           {
-            "isReadonly" : false,
-            "name" : "value",
+            "label" : "_",
+            "name" : "code",
             "type" : {
               "integer" : {
                 "_0" : {
@@ -14724,278 +16601,311 @@
               }
             }
           }
-        ]
+        ],
+        "returnType" : {
+          "associatedValueEnum" : {
+            "_0" : "ComplexResult"
+          }
+        }
       },
       {
-        "methods" : [
+        "abiName" : "bjs_makeComplexResultLocation",
+        "effects" : {
+          "isAsync" : false,
+          "isStatic" : false,
+          "isThrows" : false
+        },
+        "name" : "makeComplexResultLocation",
+        "parameters" : [
           {
-            "abiName" : "bjs_DataProcessor_increment",
-            "effects" : {
-              "isAsync" : false,
-              "isStatic" : false,
-              "isThrows" : false
-            },
-            "name" : "increment",
-            "parameters" : [
-              {
-                "label" : "by",
-                "name" : "amount",
-                "type" : {
-                  "integer" : {
-                    "_0" : {
-                      "isSigned" : true,
-                      "width" : "word"
-                    }
-                  }
-                }
-              }
-            ],
-            "returnType" : {
-              "void" : {
+            "label" : "_",
+            "name" : "lat",
+            "type" : {
+              "double" : {
 
               }
             }
           },
           {
-            "abiName" : "bjs_DataProcessor_getValue",
-            "effects" : {
-              "isAsync" : false,
-              "isStatic" : false,
-              "isThrows" : false
-            },
-            "name" : "getValue",
-            "parameters" : [
+            "label" : "_",
+            "name" : "lng",
+            "type" : {
+              "double" : {
 
-            ],
-            "returnType" : {
-              "integer" : {
-                "_0" : {
-                  "isSigned" : true,
-                  "width" : "word"
-                }
               }
             }
           },
           {
-            "abiName" : "bjs_DataProcessor_setLabelElements",
-            "effects" : {
-              "isAsync" : false,
-              "isStatic" : false,
-              "isThrows" : false
-            },
-            "name" : "setLabelElements",
-            "parameters" : [
-              {
-                "label" : "_",
-                "name" : "labelPrefix",
-                "type" : {
-                  "string" : {
+            "label" : "_",
+            "name" : "name",
+            "type" : {
+              "string" : {
 
-                  }
-                }
-              },
-              {
-                "label" : "_",
-                "name" : "labelSuffix",
-                "type" : {
-                  "string" : {
+              }
+            }
+          }
+        ],
+        "returnType" : {
+          "associatedValueEnum" : {
+            "_0" : "ComplexResult"
+          }
+        }
+      },
+      {
+        "abiName" : "bjs_makeComplexResultStatus",
+        "effects" : {
+          "isAsync" : false,
+          "isStatic" : false,
+          "isThrows" : false
+        },
+        "name" : "makeComplexResultStatus",
+        "parameters" : [
+          {
+            "label" : "_",
+            "name" : "active",
+            "type" : {
+              "bool" : {
 
-                  }
+              }
+            }
+          },
+          {
+            "label" : "_",
+            "name" : "code",
+            "type" : {
+              "integer" : {
+                "_0" : {
+                  "isSigned" : true,
+                  "width" : "word"
                 }
               }
-            ],
-            "returnType" : {
-              "void" : {
+            }
+          },
+          {
+            "label" : "_",
+            "name" : "message",
+            "type" : {
+              "string" : {
 
               }
             }
-          },
+          }
+        ],
+        "returnType" : {
+          "associatedValueEnum" : {
+            "_0" : "ComplexResult"
+          }
+        }
+      },
+      {
+        "abiName" : "bjs_makeComplexResultCoordinates",
+        "effects" : {
+          "isAsync" : false,
+          "isStatic" : false,
+          "isThrows" : false
+        },
+        "name" : "makeComplexResultCoordinates",
+        "parameters" : [
           {
-            "abiName" : "bjs_DataProcessor_getLabel",
-            "effects" : {
-              "isAsync" : false,
-              "isStatic" : false,
-              "isThrows" : false
-            },
-            "name" : "getLabel",
-            "parameters" : [
+            "label" : "_",
+            "name" : "x",
+            "type" : {
+              "double" : {
 
-            ],
-            "returnType" : {
-              "string" : {
+              }
+            }
+          },
+          {
+            "label" : "_",
+            "name" : "y",
+            "type" : {
+              "double" : {
 
               }
             }
           },
           {
-            "abiName" : "bjs_DataProcessor_isEven",
-            "effects" : {
-              "isAsync" : false,
-              "isStatic" : false,
-              "isThrows" : false
-            },
-            "name" : "isEven",
-            "parameters" : [
+            "label" : "_",
+            "name" : "z",
+            "type" : {
+              "double" : {
 
-            ],
-            "returnType" : {
+              }
+            }
+          }
+        ],
+        "returnType" : {
+          "associatedValueEnum" : {
+            "_0" : "ComplexResult"
+          }
+        }
+      },
+      {
+        "abiName" : "bjs_makeComplexResultComprehensive",
+        "effects" : {
+          "isAsync" : false,
+          "isStatic" : false,
+          "isThrows" : false
+        },
+        "name" : "makeComplexResultComprehensive",
+        "parameters" : [
+          {
+            "label" : "_",
+            "name" : "flag1",
+            "type" : {
               "bool" : {
 
               }
             }
           },
           {
-            "abiName" : "bjs_DataProcessor_processGreeter",
-            "effects" : {
-              "isAsync" : false,
-              "isStatic" : false,
-              "isThrows" : false
-            },
-            "name" : "processGreeter",
-            "parameters" : [
-              {
-                "label" : "_",
-                "name" : "greeter",
-                "type" : {
-                  "swiftHeapObject" : {
-                    "_0" : "Greeter"
-                  }
+            "label" : "_",
+            "name" : "flag2",
+            "type" : {
+              "bool" : {
+
+              }
+            }
+          },
+          {
+            "label" : "_",
+            "name" : "count1",
+            "type" : {
+              "integer" : {
+                "_0" : {
+                  "isSigned" : true,
+                  "width" : "word"
                 }
               }
-            ],
-            "returnType" : {
-              "string" : {
-
+            }
+          },
+          {
+            "label" : "_",
+            "name" : "count2",
+            "type" : {
+              "integer" : {
+                "_0" : {
+                  "isSigned" : true,
+                  "width" : "word"
+                }
               }
             }
           },
           {
-            "abiName" : "bjs_DataProcessor_createGreeter",
-            "effects" : {
-              "isAsync" : false,
-              "isStatic" : false,
-              "isThrows" : false
-            },
-            "name" : "createGreeter",
-            "parameters" : [
+            "label" : "_",
+            "name" : "value1",
+            "type" : {
+              "double" : {
 
-            ],
-            "returnType" : {
-              "swiftHeapObject" : {
-                "_0" : "Greeter"
               }
             }
           },
           {
-            "abiName" : "bjs_DataProcessor_processOptionalGreeter",
-            "effects" : {
-              "isAsync" : false,
-              "isStatic" : false,
-              "isThrows" : false
-            },
-            "name" : "processOptionalGreeter",
-            "parameters" : [
-              {
-                "label" : "_",
-                "name" : "greeter",
-                "type" : {
-                  "nullable" : {
-                    "_0" : {
-                      "swiftHeapObject" : {
-                        "_0" : "Greeter"
-                      }
-                    },
-                    "_1" : "null"
-                  }
-                }
+            "label" : "_",
+            "name" : "value2",
+            "type" : {
+              "double" : {
+
               }
-            ],
-            "returnType" : {
+            }
+          },
+          {
+            "label" : "_",
+            "name" : "text1",
+            "type" : {
               "string" : {
 
               }
             }
           },
           {
-            "abiName" : "bjs_DataProcessor_createOptionalGreeter",
-            "effects" : {
-              "isAsync" : false,
-              "isStatic" : false,
-              "isThrows" : false
-            },
-            "name" : "createOptionalGreeter",
-            "parameters" : [
+            "label" : "_",
+            "name" : "text2",
+            "type" : {
+              "string" : {
 
-            ],
-            "returnType" : {
-              "nullable" : {
-                "_0" : {
-                  "swiftHeapObject" : {
-                    "_0" : "Greeter"
-                  }
-                },
-                "_1" : "null"
               }
             }
           },
           {
-            "abiName" : "bjs_DataProcessor_handleAPIResult",
-            "effects" : {
-              "isAsync" : false,
-              "isStatic" : false,
-              "isThrows" : false
-            },
-            "name" : "handleAPIResult",
-            "parameters" : [
-              {
-                "label" : "_",
-                "name" : "result",
-                "type" : {
-                  "nullable" : {
-                    "_0" : {
-                      "associatedValueEnum" : {
-                        "_0" : "APIResult"
-                      }
-                    },
-                    "_1" : "null"
-                  }
-                }
-              }
-            ],
-            "returnType" : {
-              "void" : {
+            "label" : "_",
+            "name" : "text3",
+            "type" : {
+              "string" : {
 
               }
             }
-          },
+          }
+        ],
+        "returnType" : {
+          "associatedValueEnum" : {
+            "_0" : "ComplexResult"
+          }
+        }
+      },
+      {
+        "abiName" : "bjs_makeComplexResultInfo",
+        "effects" : {
+          "isAsync" : false,
+          "isStatic" : false,
+          "isThrows" : false
+        },
+        "name" : "makeComplexResultInfo",
+        "parameters" : [
+
+        ],
+        "returnType" : {
+          "associatedValueEnum" : {
+            "_0" : "ComplexResult"
+          }
+        }
+      },
+      {
+        "abiName" : "bjs_makeUtilitiesResultSuccess",
+        "effects" : {
+          "isAsync" : false,
+          "isStatic" : false,
+          "isThrows" : false
+        },
+        "name" : "makeUtilitiesResultSuccess",
+        "parameters" : [
           {
-            "abiName" : "bjs_DataProcessor_getAPIResult",
-            "effects" : {
-              "isAsync" : false,
-              "isStatic" : false,
-              "isThrows" : false
-            },
-            "name" : "getAPIResult",
-            "parameters" : [
+            "label" : "_",
+            "name" : "message",
+            "type" : {
+              "string" : {
 
-            ],
-            "returnType" : {
-              "nullable" : {
-                "_0" : {
-                  "associatedValueEnum" : {
-                    "_0" : "APIResult"
-                  }
-                },
-                "_1" : "null"
               }
             }
           }
         ],
-        "name" : "DataProcessor",
-        "properties" : [
+        "returnType" : {
+          "associatedValueEnum" : {
+            "_0" : "Utilities.Result"
+          }
+        }
+      },
+      {
+        "abiName" : "bjs_makeUtilitiesResultFailure",
+        "effects" : {
+          "isAsync" : false,
+          "isStatic" : false,
+          "isThrows" : false
+        },
+        "name" : "makeUtilitiesResultFailure",
+        "parameters" : [
           {
-            "isReadonly" : false,
-            "name" : "count",
+            "label" : "_",
+            "name" : "error",
+            "type" : {
+              "string" : {
+
+              }
+            }
+          },
+          {
+            "label" : "_",
+            "name" : "code",
             "type" : {
               "integer" : {
                 "_0" : {
@@ -15004,161 +16914,234 @@
                 }
               }
             }
-          },
+          }
+        ],
+        "returnType" : {
+          "associatedValueEnum" : {
+            "_0" : "Utilities.Result"
+          }
+        }
+      },
+      {
+        "abiName" : "bjs_makeUtilitiesResultStatus",
+        "effects" : {
+          "isAsync" : false,
+          "isStatic" : false,
+          "isThrows" : false
+        },
+        "name" : "makeUtilitiesResultStatus",
+        "parameters" : [
           {
-            "isReadonly" : true,
-            "name" : "name",
+            "label" : "_",
+            "name" : "active",
             "type" : {
-              "string" : {
+              "bool" : {
 
               }
             }
           },
           {
-            "isReadonly" : false,
-            "name" : "optionalTag",
+            "label" : "_",
+            "name" : "code",
             "type" : {
-              "nullable" : {
+              "integer" : {
                 "_0" : {
-                  "string" : {
-
-                  }
-                },
-                "_1" : "null"
+                  "isSigned" : true,
+                  "width" : "word"
+                }
               }
             }
           },
           {
-            "isReadonly" : false,
-            "name" : "optionalCount",
+            "label" : "_",
+            "name" : "message",
             "type" : {
-              "nullable" : {
-                "_0" : {
-                  "integer" : {
-                    "_0" : {
-                      "isSigned" : true,
-                      "width" : "word"
-                    }
-                  }
-                },
-                "_1" : "null"
+              "string" : {
+
               }
             }
-          },
+          }
+        ],
+        "returnType" : {
+          "associatedValueEnum" : {
+            "_0" : "Utilities.Result"
+          }
+        }
+      },
+      {
+        "abiName" : "bjs_makeAPINetworkingResultSuccess",
+        "effects" : {
+          "isAsync" : false,
+          "isStatic" : false,
+          "isThrows" : false
+        },
+        "name" : "makeAPINetworkingResultSuccess",
+        "parameters" : [
           {
-            "isReadonly" : false,
-            "name" : "direction",
+            "label" : "_",
+            "name" : "message",
             "type" : {
-              "nullable" : {
-                "_0" : {
-                  "caseEnum" : {
-                    "_0" : "Direction"
-                  }
-                },
-                "_1" : "null"
+              "string" : {
+
               }
             }
-          },
+          }
+        ],
+        "returnType" : {
+          "associatedValueEnum" : {
+            "_0" : "API.NetworkingResult"
+          }
+        }
+      },
+      {
+        "abiName" : "bjs_makeAPINetworkingResultFailure",
+        "effects" : {
+          "isAsync" : false,
+          "isStatic" : false,
+          "isThrows" : false
+        },
+        "name" : "makeAPINetworkingResultFailure",
+        "parameters" : [
           {
-            "isReadonly" : false,
-            "name" : "optionalTheme",
+            "label" : "_",
+            "name" : "error",
             "type" : {
-              "nullable" : {
-                "_0" : {
-                  "rawValueEnum" : {
-                    "_0" : "Theme",
-                    "_1" : "String"
-                  }
-                },
-                "_1" : "null"
+              "string" : {
+
               }
             }
           },
           {
-            "isReadonly" : false,
-            "name" : "httpStatus",
+            "label" : "_",
+            "name" : "code",
             "type" : {
-              "nullable" : {
+              "integer" : {
                 "_0" : {
-                  "rawValueEnum" : {
-                    "_0" : "HttpStatus",
-                    "_1" : "Int"
-                  }
-                },
-                "_1" : "null"
+                  "isSigned" : true,
+                  "width" : "word"
+                }
               }
             }
-          },
-          {
-            "isReadonly" : false,
-            "name" : "apiResult",
-            "type" : {
-              "nullable" : {
-                "_0" : {
-                  "associatedValueEnum" : {
-                    "_0" : "APIResult"
-                  }
-                },
-                "_1" : "null"
+          }
+        ],
+        "returnType" : {
+          "associatedValueEnum" : {
+            "_0" : "API.NetworkingResult"
+          }
+        }
+      },
+      {
+        "abiName" : "bjs_roundtripUtilitiesResult",
+        "effects" : {
+          "isAsync" : false,
+          "isStatic" : false,
+          "isThrows" : false
+        },
+        "name" : "roundtripUtilitiesResult",
+        "parameters" : [
+          {
+            "label" : "_",
+            "name" : "result",
+            "type" : {
+              "associatedValueEnum" : {
+                "_0" : "Utilities.Result"
               }
             }
-          },
+          }
+        ],
+        "returnType" : {
+          "associatedValueEnum" : {
+            "_0" : "Utilities.Result"
+          }
+        }
+      },
+      {
+        "abiName" : "bjs_roundtripAPINetworkingResult",
+        "effects" : {
+          "isAsync" : false,
+          "isStatic" : false,
+          "isThrows" : false
+        },
+        "name" : "roundtripAPINetworkingResult",
+        "parameters" : [
           {
-            "isReadonly" : false,
-            "name" : "helper",
+            "label" : "_",
+            "name" : "result",
             "type" : {
-              "swiftHeapObject" : {
-                "_0" : "Greeter"
+              "associatedValueEnum" : {
+                "_0" : "API.NetworkingResult"
               }
             }
-          },
+          }
+        ],
+        "returnType" : {
+          "associatedValueEnum" : {
+            "_0" : "API.NetworkingResult"
+          }
+        }
+      },
+      {
+        "abiName" : "bjs_roundTripAllTypesResult",
+        "effects" : {
+          "isAsync" : false,
+          "isStatic" : false,
+          "isThrows" : false
+        },
+        "name" : "roundTripAllTypesResult",
+        "parameters" : [
           {
-            "isReadonly" : false,
-            "name" : "optionalHelper",
+            "label" : "_",
+            "name" : "result",
             "type" : {
-              "nullable" : {
-                "_0" : {
-                  "swiftHeapObject" : {
-                    "_0" : "Greeter"
-                  }
-                },
-                "_1" : "null"
+              "associatedValueEnum" : {
+                "_0" : "AllTypesResult"
               }
             }
           }
-        ]
-      }
-    ],
-    "structs" : [
-      {
-        "methods" : [
-
-        ],
-        "name" : "Metadata",
-        "namespace" : [
-          "NestedStructGroupA"
         ],
-        "properties" : [
+        "returnType" : {
+          "associatedValueEnum" : {
+            "_0" : "AllTypesResult"
+          }
+        }
+      },
+      {
+        "abiName" : "bjs_roundTripTypedPayloadResult",
+        "effects" : {
+          "isAsync" : false,
+          "isStatic" : false,
+          "isThrows" : false
+        },
+        "name" : "roundTripTypedPayloadResult",
+        "parameters" : [
           {
-            "isReadonly" : true,
-            "isStatic" : false,
-            "name" : "label",
-            "namespace" : [
-              "NestedStructGroupA"
-            ],
+            "label" : "_",
+            "name" : "result",
             "type" : {
-              "string" : {
-
+              "associatedValueEnum" : {
+                "_0" : "TypedPayloadResult"
               }
             }
-          },
+          }
+        ],
+        "returnType" : {
+          "associatedValueEnum" : {
+            "_0" : "TypedPayloadResult"
+          }
+        }
+      },
+      {
+        "abiName" : "bjs_createPropertyHolder",
+        "effects" : {
+          "isAsync" : false,
+          "isStatic" : false,
+          "isThrows" : false
+        },
+        "name" : "createPropertyHolder",
+        "parameters" : [
           {
-            "isReadonly" : true,
-            "isStatic" : false,
-            "name" : "count",
-            "namespace" : [
-              "NestedStructGroupA"
-            ],
+            "label" : "intValue",
+            "name" : "intValue",
             "type" : {
               "integer" : {
                 "_0" : {
@@ -15167,388 +17150,358 @@
                 }
               }
             }
-          }
-        ],
-        "swiftCallName" : "NestedStructGroupA.Metadata"
-      },
-      {
-        "methods" : [
-
-        ],
-        "name" : "Metadata",
-        "namespace" : [
-          "NestedStructGroupB"
-        ],
-        "properties" : [
+          },
           {
-            "isReadonly" : true,
-            "isStatic" : false,
-            "name" : "tag",
-            "namespace" : [
-              "NestedStructGroupB"
-            ],
+            "label" : "floatValue",
+            "name" : "floatValue",
             "type" : {
-              "string" : {
+              "float" : {
 
               }
             }
           },
           {
-            "isReadonly" : true,
-            "isStatic" : false,
-            "name" : "value",
-            "namespace" : [
-              "NestedStructGroupB"
-            ],
+            "label" : "doubleValue",
+            "name" : "doubleValue",
             "type" : {
               "double" : {
 
               }
             }
-          }
-        ],
-        "swiftCallName" : "NestedStructGroupB.Metadata"
-      },
-      {
-        "methods" : [
+          },
+          {
+            "label" : "boolValue",
+            "name" : "boolValue",
+            "type" : {
+              "bool" : {
 
-        ],
-        "name" : "Point",
-        "properties" : [
+              }
+            }
+          },
           {
-            "isReadonly" : true,
-            "isStatic" : false,
-            "name" : "x",
+            "label" : "stringValue",
+            "name" : "stringValue",
             "type" : {
-              "integer" : {
-                "_0" : {
-                  "isSigned" : true,
-                  "width" : "word"
-                }
+              "string" : {
+
               }
             }
           },
           {
-            "isReadonly" : true,
-            "isStatic" : false,
-            "name" : "y",
+            "label" : "jsObject",
+            "name" : "jsObject",
             "type" : {
-              "integer" : {
-                "_0" : {
-                  "isSigned" : true,
-                  "width" : "word"
-                }
+              "jsObject" : {
+
               }
             }
           }
         ],
-        "swiftCallName" : "Point"
+        "returnType" : {
+          "swiftHeapObject" : {
+            "_0" : "PropertyHolder"
+          }
+        }
       },
       {
-        "constructor" : {
-          "abiName" : "bjs_PointerFields_init",
-          "effects" : {
-            "isAsync" : false,
-            "isStatic" : false,
-            "isThrows" : false
-          },
-          "parameters" : [
-            {
-              "label" : "raw",
-              "name" : "raw",
-              "type" : {
-                "unsafePointer" : {
-                  "_0" : {
-                    "kind" : "unsafeRawPointer"
-                  }
-                }
-              }
-            },
-            {
-              "label" : "mutRaw",
-              "name" : "mutRaw",
-              "type" : {
-                "unsafePointer" : {
-                  "_0" : {
-                    "kind" : "unsafeMutableRawPointer"
-                  }
-                }
-              }
-            },
-            {
-              "label" : "opaque",
-              "name" : "opaque",
-              "type" : {
-                "unsafePointer" : {
-                  "_0" : {
-                    "kind" : "opaquePointer"
-                  }
-                }
-              }
-            },
-            {
-              "label" : "ptr",
-              "name" : "ptr",
-              "type" : {
-                "unsafePointer" : {
-                  "_0" : {
-                    "kind" : "unsafePointer",
-                    "pointee" : "UInt8"
-                  }
-                }
-              }
-            },
-            {
-              "label" : "mutPtr",
-              "name" : "mutPtr",
-              "type" : {
-                "unsafePointer" : {
-                  "_0" : {
-                    "kind" : "unsafeMutablePointer",
-                    "pointee" : "UInt8"
-                  }
-                }
+        "abiName" : "bjs_testPropertyHolder",
+        "effects" : {
+          "isAsync" : false,
+          "isStatic" : false,
+          "isThrows" : false
+        },
+        "name" : "testPropertyHolder",
+        "parameters" : [
+          {
+            "label" : "holder",
+            "name" : "holder",
+            "type" : {
+              "swiftHeapObject" : {
+                "_0" : "PropertyHolder"
               }
             }
-          ]
+          }
+        ],
+        "returnType" : {
+          "string" : {
+
+          }
+        }
+      },
+      {
+        "abiName" : "bjs_resetObserverCounts",
+        "effects" : {
+          "isAsync" : false,
+          "isStatic" : false,
+          "isThrows" : false
         },
-        "methods" : [
+        "name" : "resetObserverCounts",
+        "parameters" : [
 
         ],
-        "name" : "PointerFields",
-        "properties" : [
+        "returnType" : {
+          "void" : {
+
+          }
+        }
+      },
+      {
+        "abiName" : "bjs_getObserverStats",
+        "effects" : {
+          "isAsync" : false,
+          "isStatic" : false,
+          "isThrows" : false
+        },
+        "name" : "getObserverStats",
+        "parameters" : [
+
+        ],
+        "returnType" : {
+          "string" : {
+
+          }
+        }
+      },
+      {
+        "abiName" : "bjs_formatName",
+        "effects" : {
+          "isAsync" : false,
+          "isStatic" : false,
+          "isThrows" : false
+        },
+        "name" : "formatName",
+        "parameters" : [
           {
-            "isReadonly" : true,
-            "isStatic" : false,
-            "name" : "raw",
+            "label" : "_",
+            "name" : "name",
             "type" : {
-              "unsafePointer" : {
-                "_0" : {
-                  "kind" : "unsafeRawPointer"
-                }
+              "string" : {
+
               }
             }
           },
           {
-            "isReadonly" : true,
-            "isStatic" : false,
-            "name" : "mutRaw",
+            "label" : "transform",
+            "name" : "transform",
             "type" : {
-              "unsafePointer" : {
+              "closure" : {
                 "_0" : {
-                  "kind" : "unsafeMutableRawPointer"
-                }
+                  "isAsync" : false,
+                  "isThrows" : false,
+                  "mangleName" : "20BridgeJSRuntimeTestsSS_SS",
+                  "moduleName" : "BridgeJSRuntimeTests",
+                  "parameters" : [
+                    {
+                      "string" : {
+
+                      }
+                    }
+                  ],
+                  "returnType" : {
+                    "string" : {
+
+                    }
+                  },
+                  "sendingParameters" : false
+                },
+                "useJSTypedClosure" : false
               }
             }
-          },
+          }
+        ],
+        "returnType" : {
+          "string" : {
+
+          }
+        }
+      },
+      {
+        "abiName" : "bjs_makeFormatter",
+        "effects" : {
+          "isAsync" : false,
+          "isStatic" : false,
+          "isThrows" : false
+        },
+        "name" : "makeFormatter",
+        "parameters" : [
           {
-            "isReadonly" : true,
-            "isStatic" : false,
-            "name" : "opaque",
+            "label" : "prefix",
+            "name" : "prefix",
             "type" : {
-              "unsafePointer" : {
-                "_0" : {
-                  "kind" : "opaquePointer"
-                }
+              "string" : {
+
               }
             }
-          },
-          {
-            "isReadonly" : true,
-            "isStatic" : false,
-            "name" : "ptr",
-            "type" : {
-              "unsafePointer" : {
-                "_0" : {
-                  "kind" : "unsafePointer",
-                  "pointee" : "UInt8"
+          }
+        ],
+        "returnType" : {
+          "closure" : {
+            "_0" : {
+              "isAsync" : false,
+              "isThrows" : false,
+              "mangleName" : "20BridgeJSRuntimeTestsSS_SS",
+              "moduleName" : "BridgeJSRuntimeTests",
+              "parameters" : [
+                {
+                  "string" : {
+
+                  }
                 }
-              }
-            }
-          },
+              ],
+              "returnType" : {
+                "string" : {
+
+                }
+              },
+              "sendingParameters" : false
+            },
+            "useJSTypedClosure" : false
+          }
+        }
+      },
+      {
+        "abiName" : "bjs_makeAdder",
+        "effects" : {
+          "isAsync" : false,
+          "isStatic" : false,
+          "isThrows" : false
+        },
+        "name" : "makeAdder",
+        "parameters" : [
           {
-            "isReadonly" : true,
-            "isStatic" : false,
-            "name" : "mutPtr",
+            "label" : "base",
+            "name" : "base",
             "type" : {
-              "unsafePointer" : {
+              "integer" : {
                 "_0" : {
-                  "kind" : "unsafeMutablePointer",
-                  "pointee" : "UInt8"
+                  "isSigned" : true,
+                  "width" : "word"
                 }
               }
             }
           }
         ],
-        "swiftCallName" : "PointerFields"
-      },
-      {
-        "constructor" : {
-          "abiName" : "bjs_DataPoint_init",
-          "effects" : {
-            "isAsync" : false,
-            "isStatic" : false,
-            "isThrows" : false
-          },
-          "parameters" : [
-            {
-              "label" : "x",
-              "name" : "x",
-              "type" : {
-                "double" : {
-
-                }
-              }
-            },
-            {
-              "label" : "y",
-              "name" : "y",
-              "type" : {
-                "double" : {
-
-                }
-              }
-            },
-            {
-              "label" : "label",
-              "name" : "label",
-              "type" : {
-                "string" : {
-
-                }
-              }
-            },
-            {
-              "label" : "optCount",
-              "name" : "optCount",
-              "type" : {
-                "nullable" : {
-                  "_0" : {
-                    "integer" : {
-                      "_0" : {
-                        "isSigned" : true,
-                        "width" : "word"
-                      }
+        "returnType" : {
+          "closure" : {
+            "_0" : {
+              "isAsync" : false,
+              "isThrows" : false,
+              "mangleName" : "20BridgeJSRuntimeTestsSi_Si",
+              "moduleName" : "BridgeJSRuntimeTests",
+              "parameters" : [
+                {
+                  "integer" : {
+                    "_0" : {
+                      "isSigned" : true,
+                      "width" : "word"
                     }
-                  },
-                  "_1" : "null"
+                  }
                 }
-              }
-            },
-            {
-              "label" : "optFlag",
-              "name" : "optFlag",
-              "type" : {
-                "nullable" : {
+              ],
+              "returnType" : {
+                "integer" : {
                   "_0" : {
-                    "bool" : {
-
-                    }
-                  },
-                  "_1" : "null"
+                    "isSigned" : true,
+                    "width" : "word"
+                  }
                 }
-              }
-            }
-          ]
+              },
+              "sendingParameters" : false
+            },
+            "useJSTypedClosure" : false
+          }
+        }
+      },
+      {
+        "abiName" : "bjs_roundTripMessage",
+        "effects" : {
+          "isAsync" : false,
+          "isStatic" : false,
+          "isThrows" : false
         },
-        "methods" : [
+        "name" : "roundTripMessage",
+        "parameters" : [
           {
-            "abiName" : "bjs_DataPoint_static_origin",
-            "effects" : {
-              "isAsync" : false,
-              "isStatic" : true,
-              "isThrows" : false
-            },
-            "name" : "origin",
-            "parameters" : [
-
-            ],
-            "returnType" : {
-              "swiftStruct" : {
-                "_0" : "DataPoint"
-              }
-            },
-            "staticContext" : {
-              "structName" : {
-                "_0" : "DataPoint"
+            "label" : "_",
+            "name" : "message",
+            "type" : {
+              "associatedValueEnum" : {
+                "_0" : "Message"
               }
             }
           }
         ],
-        "name" : "DataPoint",
-        "properties" : [
+        "returnType" : {
+          "associatedValueEnum" : {
+            "_0" : "Message"
+          }
+        }
+      },
+      {
+        "abiName" : "bjs_renamedEcho",
+        "effects" : {
+          "isAsync" : false,
+          "isStatic" : false,
+          "isThrows" : false
+        },
+        "jsName" : "renamedEcho",
+        "name" : "jsNameEcho",
+        "parameters" : [
           {
-            "isReadonly" : true,
-            "isStatic" : false,
-            "name" : "x",
+            "label" : "_",
+            "name" : "value",
             "type" : {
-              "double" : {
+              "string" : {
 
               }
             }
-          },
-          {
-            "isReadonly" : true,
-            "isStatic" : false,
-            "name" : "y",
-            "type" : {
-              "double" : {
+          }
+        ],
+        "returnType" : {
+          "string" : {
 
-              }
-            }
-          },
+          }
+        }
+      },
+      {
+        "abiName" : "bjs_greetName",
+        "effects" : {
+          "isAsync" : false,
+          "isStatic" : false,
+          "isThrows" : false
+        },
+        "jsName" : "greetName",
+        "name" : "greet",
+        "parameters" : [
           {
-            "isReadonly" : true,
-            "isStatic" : false,
-            "name" : "label",
+            "label" : "_",
+            "name" : "name",
             "type" : {
               "string" : {
 
               }
             }
-          },
-          {
-            "isReadonly" : true,
-            "isStatic" : false,
-            "name" : "optCount",
-            "type" : {
-              "nullable" : {
-                "_0" : {
-                  "integer" : {
-                    "_0" : {
-                      "isSigned" : true,
-                      "width" : "word"
-                    }
-                  }
-                },
-                "_1" : "null"
-              }
-            }
-          },
-          {
-            "isReadonly" : true,
-            "isStatic" : false,
-            "name" : "optFlag",
-            "type" : {
-              "nullable" : {
-                "_0" : {
-                  "bool" : {
+          }
+        ],
+        "returnType" : {
+          "string" : {
 
-                  }
-                },
-                "_1" : "null"
-              }
-            }
-          },
+          }
+        }
+      },
+      {
+        "abiName" : "bjs_greetCount",
+        "effects" : {
+          "isAsync" : false,
+          "isStatic" : false,
+          "isThrows" : false
+        },
+        "jsName" : "greetCount",
+        "name" : "greet",
+        "parameters" : [
           {
-            "isReadonly" : true,
-            "isStatic" : true,
-            "name" : "dimensions",
-            "staticContext" : {
-              "structName" : {
-                "_0" : "DataPoint"
-              }
-            },
+            "label" : "_",
+            "name" : "count",
             "type" : {
               "integer" : {
                 "_0" : {
@@ -15559,455 +17512,611 @@
             }
           }
         ],
-        "swiftCallName" : "DataPoint"
+        "returnType" : {
+          "string" : {
+
+          }
+        }
       },
       {
-        "constructor" : {
-          "abiName" : "bjs_PublicPoint_init",
-          "effects" : {
-            "isAsync" : false,
-            "isStatic" : false,
-            "isThrows" : false
-          },
-          "parameters" : [
-            {
-              "label" : "x",
-              "name" : "x",
-              "type" : {
-                "integer" : {
-                  "_0" : {
-                    "isSigned" : true,
-                    "width" : "word"
-                  }
-                }
-              }
-            },
-            {
-              "label" : "y",
-              "name" : "y",
-              "type" : {
-                "integer" : {
-                  "_0" : {
-                    "isSigned" : true,
-                    "width" : "word"
-                  }
-                }
+        "abiName" : "bjs_roundTripPointerFields",
+        "effects" : {
+          "isAsync" : false,
+          "isStatic" : false,
+          "isThrows" : false
+        },
+        "name" : "roundTripPointerFields",
+        "parameters" : [
+          {
+            "label" : "_",
+            "name" : "value",
+            "type" : {
+              "swiftStruct" : {
+                "_0" : "PointerFields"
               }
             }
-          ]
-        },
-        "explicitAccessControl" : "public",
-        "methods" : [
-
+          }
         ],
-        "name" : "PublicPoint",
-        "properties" : [
+        "returnType" : {
+          "swiftStruct" : {
+            "_0" : "PointerFields"
+          }
+        }
+      },
+      {
+        "abiName" : "bjs_testStructDefault",
+        "effects" : {
+          "isAsync" : false,
+          "isStatic" : false,
+          "isThrows" : false
+        },
+        "name" : "testStructDefault",
+        "parameters" : [
           {
-            "isReadonly" : true,
-            "isStatic" : false,
-            "name" : "x",
-            "type" : {
-              "integer" : {
-                "_0" : {
-                  "isSigned" : true,
-                  "width" : "word"
-                }
+            "defaultValue" : {
+              "structLiteral" : {
+                "_0" : "DataPoint",
+                "_1" : [
+                  {
+                    "name" : "x",
+                    "value" : {
+                      "float" : {
+                        "_0" : 1
+                      }
+                    }
+                  },
+                  {
+                    "name" : "y",
+                    "value" : {
+                      "float" : {
+                        "_0" : 2
+                      }
+                    }
+                  },
+                  {
+                    "name" : "label",
+                    "value" : {
+                      "string" : {
+                        "_0" : "default"
+                      }
+                    }
+                  },
+                  {
+                    "name" : "optCount",
+                    "value" : {
+                      "null" : {
+
+                      }
+                    }
+                  },
+                  {
+                    "name" : "optFlag",
+                    "value" : {
+                      "null" : {
+
+                      }
+                    }
+                  }
+                ]
               }
-            }
-          },
-          {
-            "isReadonly" : true,
-            "isStatic" : false,
-            "name" : "y",
+            },
+            "label" : "point",
+            "name" : "point",
             "type" : {
-              "integer" : {
-                "_0" : {
-                  "isSigned" : true,
-                  "width" : "word"
-                }
+              "swiftStruct" : {
+                "_0" : "DataPoint"
               }
             }
           }
         ],
-        "swiftCallName" : "PublicPoint"
+        "returnType" : {
+          "string" : {
+
+          }
+        }
       },
       {
-        "methods" : [
-
-        ],
-        "name" : "Address",
-        "properties" : [
+        "abiName" : "bjs_cartToJSObject",
+        "effects" : {
+          "isAsync" : false,
+          "isStatic" : false,
+          "isThrows" : false
+        },
+        "name" : "cartToJSObject",
+        "parameters" : [
           {
-            "isReadonly" : true,
-            "isStatic" : false,
-            "name" : "street",
+            "label" : "_",
+            "name" : "cart",
             "type" : {
-              "string" : {
-
+              "swiftStruct" : {
+                "_0" : "CopyableCart"
               }
             }
-          },
+          }
+        ],
+        "returnType" : {
+          "jsObject" : {
+
+          }
+        }
+      },
+      {
+        "abiName" : "bjs_nestedCartToJSObject",
+        "effects" : {
+          "isAsync" : false,
+          "isStatic" : false,
+          "isThrows" : false
+        },
+        "name" : "nestedCartToJSObject",
+        "parameters" : [
           {
-            "isReadonly" : true,
-            "isStatic" : false,
-            "name" : "city",
+            "label" : "_",
+            "name" : "cart",
             "type" : {
-              "string" : {
-
+              "swiftStruct" : {
+                "_0" : "CopyableNestedCart"
               }
             }
-          },
+          }
+        ],
+        "returnType" : {
+          "jsObject" : {
+
+          }
+        }
+      },
+      {
+        "abiName" : "bjs_roundTripDataPoint",
+        "effects" : {
+          "isAsync" : false,
+          "isStatic" : false,
+          "isThrows" : false
+        },
+        "name" : "roundTripDataPoint",
+        "parameters" : [
           {
-            "isReadonly" : true,
-            "isStatic" : false,
-            "name" : "zipCode",
+            "label" : "_",
+            "name" : "data",
             "type" : {
-              "nullable" : {
-                "_0" : {
-                  "integer" : {
-                    "_0" : {
-                      "isSigned" : true,
-                      "width" : "word"
-                    }
-                  }
-                },
-                "_1" : "null"
+              "swiftStruct" : {
+                "_0" : "DataPoint"
               }
             }
           }
         ],
-        "swiftCallName" : "Address"
+        "returnType" : {
+          "swiftStruct" : {
+            "_0" : "DataPoint"
+          }
+        }
       },
       {
-        "methods" : [
-
-        ],
-        "name" : "Contact",
-        "properties" : [
+        "abiName" : "bjs_roundTripPublicPoint",
+        "effects" : {
+          "isAsync" : false,
+          "isStatic" : false,
+          "isThrows" : false
+        },
+        "name" : "roundTripPublicPoint",
+        "parameters" : [
           {
-            "isReadonly" : true,
-            "isStatic" : false,
-            "name" : "name",
+            "label" : "_",
+            "name" : "point",
             "type" : {
-              "string" : {
-
+              "swiftStruct" : {
+                "_0" : "PublicPoint"
               }
             }
-          },
+          }
+        ],
+        "returnType" : {
+          "swiftStruct" : {
+            "_0" : "PublicPoint"
+          }
+        }
+      },
+      {
+        "abiName" : "bjs_asyncRoundTripPublicPoint",
+        "effects" : {
+          "isAsync" : true,
+          "isStatic" : false,
+          "isThrows" : false
+        },
+        "name" : "asyncRoundTripPublicPoint",
+        "parameters" : [
           {
-            "isReadonly" : true,
-            "isStatic" : false,
-            "name" : "age",
+            "label" : "_",
+            "name" : "point",
             "type" : {
-              "integer" : {
-                "_0" : {
-                  "isSigned" : true,
-                  "width" : "word"
-                }
+              "swiftStruct" : {
+                "_0" : "PublicPoint"
               }
             }
-          },
+          }
+        ],
+        "returnType" : {
+          "swiftStruct" : {
+            "_0" : "PublicPoint"
+          }
+        }
+      },
+      {
+        "abiName" : "bjs_asyncRoundTripPublicPointThrows",
+        "effects" : {
+          "isAsync" : true,
+          "isStatic" : false,
+          "isThrows" : true
+        },
+        "name" : "asyncRoundTripPublicPointThrows",
+        "parameters" : [
           {
-            "isReadonly" : true,
-            "isStatic" : false,
-            "name" : "address",
+            "label" : "_",
+            "name" : "point",
             "type" : {
               "swiftStruct" : {
-                "_0" : "Address"
-              }
-            }
-          },
-          {
-            "isReadonly" : true,
-            "isStatic" : false,
-            "name" : "email",
-            "type" : {
-              "nullable" : {
-                "_0" : {
-                  "string" : {
-
-                  }
-                },
-                "_1" : "null"
-              }
-            }
-          },
-          {
-            "isReadonly" : true,
-            "isStatic" : false,
-            "name" : "secondaryAddress",
-            "type" : {
-              "nullable" : {
-                "_0" : {
-                  "swiftStruct" : {
-                    "_0" : "Address"
-                  }
-                },
-                "_1" : "null"
+                "_0" : "PublicPoint"
               }
             }
           }
         ],
-        "swiftCallName" : "Contact"
+        "returnType" : {
+          "swiftStruct" : {
+            "_0" : "PublicPoint"
+          }
+        }
       },
       {
-        "methods" : [
-
-        ],
-        "name" : "Config",
-        "properties" : [
+        "abiName" : "bjs_asyncStructOrThrow",
+        "effects" : {
+          "isAsync" : true,
+          "isStatic" : false,
+          "isThrows" : true
+        },
+        "name" : "asyncStructOrThrow",
+        "parameters" : [
           {
-            "isReadonly" : true,
-            "isStatic" : false,
-            "name" : "name",
+            "label" : "_",
+            "name" : "shouldThrow",
             "type" : {
-              "string" : {
+              "bool" : {
 
               }
             }
-          },
-          {
-            "isReadonly" : true,
-            "isStatic" : false,
-            "name" : "theme",
-            "type" : {
-              "nullable" : {
-                "_0" : {
-                  "rawValueEnum" : {
-                    "_0" : "Theme",
-                    "_1" : "String"
-                  }
-                },
-                "_1" : "null"
-              }
-            }
-          },
+          }
+        ],
+        "returnType" : {
+          "swiftStruct" : {
+            "_0" : "PublicPoint"
+          }
+        }
+      },
+      {
+        "abiName" : "bjs_asyncCombinePublicPoints",
+        "effects" : {
+          "isAsync" : true,
+          "isStatic" : false,
+          "isThrows" : false
+        },
+        "name" : "asyncCombinePublicPoints",
+        "parameters" : [
           {
-            "isReadonly" : true,
-            "isStatic" : false,
-            "name" : "direction",
+            "label" : "_",
+            "name" : "a",
             "type" : {
-              "nullable" : {
-                "_0" : {
-                  "caseEnum" : {
-                    "_0" : "Direction"
-                  }
-                },
-                "_1" : "null"
+              "swiftStruct" : {
+                "_0" : "PublicPoint"
               }
             }
           },
           {
-            "isReadonly" : true,
-            "isStatic" : false,
-            "name" : "status",
+            "label" : "_",
+            "name" : "b",
             "type" : {
-              "caseEnum" : {
-                "_0" : "Status"
+              "swiftStruct" : {
+                "_0" : "PublicPoint"
               }
             }
           }
         ],
-        "swiftCallName" : "Config"
+        "returnType" : {
+          "swiftStruct" : {
+            "_0" : "PublicPoint"
+          }
+        }
       },
       {
-        "methods" : [
-
-        ],
-        "name" : "SessionData",
-        "properties" : [
-          {
-            "isReadonly" : true,
-            "isStatic" : false,
-            "name" : "id",
-            "type" : {
-              "integer" : {
-                "_0" : {
-                  "isSigned" : true,
-                  "width" : "word"
-                }
-              }
-            }
-          },
+        "abiName" : "bjs_asyncRoundTripContact",
+        "effects" : {
+          "isAsync" : true,
+          "isStatic" : false,
+          "isThrows" : false
+        },
+        "name" : "asyncRoundTripContact",
+        "parameters" : [
           {
-            "isReadonly" : true,
-            "isStatic" : false,
-            "name" : "owner",
+            "label" : "_",
+            "name" : "contact",
             "type" : {
-              "nullable" : {
-                "_0" : {
-                  "swiftHeapObject" : {
-                    "_0" : "Greeter"
-                  }
-                },
-                "_1" : "null"
+              "swiftStruct" : {
+                "_0" : "Contact"
               }
             }
           }
         ],
-        "swiftCallName" : "SessionData"
+        "returnType" : {
+          "swiftStruct" : {
+            "_0" : "Contact"
+          }
+        }
       },
       {
-        "methods" : [
-
-        ],
-        "name" : "ValidationReport",
-        "properties" : [
+        "abiName" : "bjs_asyncRoundTripPublicPointArray",
+        "effects" : {
+          "isAsync" : true,
+          "isStatic" : false,
+          "isThrows" : false
+        },
+        "name" : "asyncRoundTripPublicPointArray",
+        "parameters" : [
           {
-            "isReadonly" : true,
-            "isStatic" : false,
-            "name" : "id",
+            "label" : "_",
+            "name" : "points",
             "type" : {
-              "integer" : {
+              "array" : {
                 "_0" : {
-                  "isSigned" : true,
-                  "width" : "word"
+                  "swiftStruct" : {
+                    "_0" : "PublicPoint"
+                  }
                 }
               }
             }
-          },
-          {
-            "isReadonly" : true,
-            "isStatic" : false,
-            "name" : "result",
-            "type" : {
-              "associatedValueEnum" : {
-                "_0" : "APIResult"
+          }
+        ],
+        "returnType" : {
+          "array" : {
+            "_0" : {
+              "swiftStruct" : {
+                "_0" : "PublicPoint"
               }
             }
-          },
+          }
+        }
+      },
+      {
+        "abiName" : "bjs_asyncRoundTripOptionalPublicPoint",
+        "effects" : {
+          "isAsync" : true,
+          "isStatic" : false,
+          "isThrows" : false
+        },
+        "name" : "asyncRoundTripOptionalPublicPoint",
+        "parameters" : [
           {
-            "isReadonly" : true,
-            "isStatic" : false,
-            "name" : "status",
+            "label" : "_",
+            "name" : "point",
             "type" : {
               "nullable" : {
                 "_0" : {
-                  "caseEnum" : {
-                    "_0" : "Status"
+                  "swiftStruct" : {
+                    "_0" : "PublicPoint"
                   }
                 },
                 "_1" : "null"
               }
             }
-          },
+          }
+        ],
+        "returnType" : {
+          "nullable" : {
+            "_0" : {
+              "swiftStruct" : {
+                "_0" : "PublicPoint"
+              }
+            },
+            "_1" : "null"
+          }
+        }
+      },
+      {
+        "abiName" : "bjs_asyncRoundTripPublicPointDict",
+        "effects" : {
+          "isAsync" : true,
+          "isStatic" : false,
+          "isThrows" : false
+        },
+        "name" : "asyncRoundTripPublicPointDict",
+        "parameters" : [
           {
-            "isReadonly" : true,
-            "isStatic" : false,
-            "name" : "outcome",
+            "label" : "_",
+            "name" : "points",
             "type" : {
-              "nullable" : {
+              "dictionary" : {
                 "_0" : {
-                  "associatedValueEnum" : {
-                    "_0" : "APIResult"
+                  "swiftStruct" : {
+                    "_0" : "PublicPoint"
                   }
-                },
-                "_1" : "null"
+                }
               }
             }
           }
         ],
-        "swiftCallName" : "ValidationReport"
+        "returnType" : {
+          "dictionary" : {
+            "_0" : {
+              "swiftStruct" : {
+                "_0" : "PublicPoint"
+              }
+            }
+          }
+        }
       },
       {
-        "methods" : [
-
-        ],
-        "name" : "AdvancedConfig",
-        "properties" : [
-          {
-            "isReadonly" : true,
-            "isStatic" : false,
-            "name" : "id",
-            "type" : {
-              "integer" : {
-                "_0" : {
-                  "isSigned" : true,
-                  "width" : "word"
-                }
-              }
-            }
-          },
+        "abiName" : "bjs_roundTripContact",
+        "effects" : {
+          "isAsync" : false,
+          "isStatic" : false,
+          "isThrows" : false
+        },
+        "name" : "roundTripContact",
+        "parameters" : [
           {
-            "isReadonly" : true,
-            "isStatic" : false,
-            "name" : "title",
+            "label" : "_",
+            "name" : "contact",
             "type" : {
-              "string" : {
-
+              "swiftStruct" : {
+                "_0" : "Contact"
               }
             }
-          },
+          }
+        ],
+        "returnType" : {
+          "swiftStruct" : {
+            "_0" : "Contact"
+          }
+        }
+      },
+      {
+        "abiName" : "bjs_roundTripConfig",
+        "effects" : {
+          "isAsync" : false,
+          "isStatic" : false,
+          "isThrows" : false
+        },
+        "name" : "roundTripConfig",
+        "parameters" : [
           {
-            "isReadonly" : true,
-            "isStatic" : false,
-            "name" : "enabled",
+            "label" : "_",
+            "name" : "config",
             "type" : {
-              "bool" : {
-
+              "swiftStruct" : {
+                "_0" : "Config"
               }
             }
-          },
+          }
+        ],
+        "returnType" : {
+          "swiftStruct" : {
+            "_0" : "Config"
+          }
+        }
+      },
+      {
+        "abiName" : "bjs_roundTripSessionData",
+        "effects" : {
+          "isAsync" : false,
+          "isStatic" : false,
+          "isThrows" : false
+        },
+        "name" : "roundTripSessionData",
+        "parameters" : [
           {
-            "isReadonly" : true,
-            "isStatic" : false,
-            "name" : "theme",
+            "label" : "_",
+            "name" : "session",
             "type" : {
-              "rawValueEnum" : {
-                "_0" : "Theme",
-                "_1" : "String"
+              "swiftStruct" : {
+                "_0" : "SessionData"
               }
             }
-          },
+          }
+        ],
+        "returnType" : {
+          "swiftStruct" : {
+            "_0" : "SessionData"
+          }
+        }
+      },
+      {
+        "abiName" : "bjs_roundTripValidationReport",
+        "effects" : {
+          "isAsync" : false,
+          "isStatic" : false,
+          "isThrows" : false
+        },
+        "name" : "roundTripValidationReport",
+        "parameters" : [
           {
-            "isReadonly" : true,
-            "isStatic" : false,
-            "name" : "status",
+            "label" : "_",
+            "name" : "report",
             "type" : {
-              "caseEnum" : {
-                "_0" : "Status"
+              "swiftStruct" : {
+                "_0" : "ValidationReport"
               }
             }
-          },
+          }
+        ],
+        "returnType" : {
+          "swiftStruct" : {
+            "_0" : "ValidationReport"
+          }
+        }
+      },
+      {
+        "abiName" : "bjs_roundTripAdvancedConfig",
+        "effects" : {
+          "isAsync" : false,
+          "isStatic" : false,
+          "isThrows" : false
+        },
+        "name" : "roundTripAdvancedConfig",
+        "parameters" : [
           {
-            "isReadonly" : true,
-            "isStatic" : false,
-            "name" : "result",
+            "label" : "_",
+            "name" : "config",
             "type" : {
-              "nullable" : {
-                "_0" : {
-                  "associatedValueEnum" : {
-                    "_0" : "APIResult"
-                  }
-                },
-                "_1" : "null"
+              "swiftStruct" : {
+                "_0" : "AdvancedConfig"
               }
             }
-          },
+          }
+        ],
+        "returnType" : {
+          "swiftStruct" : {
+            "_0" : "AdvancedConfig"
+          }
+        }
+      },
+      {
+        "abiName" : "bjs_roundTripMeasurementConfig",
+        "effects" : {
+          "isAsync" : false,
+          "isStatic" : false,
+          "isThrows" : false
+        },
+        "name" : "roundTripMeasurementConfig",
+        "parameters" : [
           {
-            "isReadonly" : true,
-            "isStatic" : false,
-            "name" : "metadata",
+            "label" : "_",
+            "name" : "config",
             "type" : {
-              "nullable" : {
-                "_0" : {
-                  "jsObject" : {
-
-                  }
-                },
-                "_1" : "null"
+              "swiftStruct" : {
+                "_0" : "MeasurementConfig"
               }
             }
-          },
+          }
+        ],
+        "returnType" : {
+          "swiftStruct" : {
+            "_0" : "MeasurementConfig"
+          }
+        }
+      },
+      {
+        "abiName" : "bjs_updateValidationReport",
+        "effects" : {
+          "isAsync" : false,
+          "isStatic" : false,
+          "isThrows" : false
+        },
+        "name" : "updateValidationReport",
+        "parameters" : [
           {
-            "isReadonly" : true,
-            "isStatic" : false,
-            "name" : "location",
+            "label" : "_",
+            "name" : "newResult",
             "type" : {
               "nullable" : {
                 "_0" : {
-                  "swiftStruct" : {
-                    "_0" : "DataPoint"
+                  "associatedValueEnum" : {
+                    "_0" : "APIResult"
                   }
                 },
                 "_1" : "null"
@@ -16015,420 +18124,488 @@
             }
           },
           {
-            "isReadonly" : true,
-            "isStatic" : false,
-            "name" : "defaults",
+            "label" : "_",
+            "name" : "report",
             "type" : {
               "swiftStruct" : {
-                "_0" : "ConfigStruct"
+                "_0" : "ValidationReport"
               }
             }
-          },
+          }
+        ],
+        "returnType" : {
+          "swiftStruct" : {
+            "_0" : "ValidationReport"
+          }
+        }
+      },
+      {
+        "abiName" : "bjs_testContainerWithStruct",
+        "effects" : {
+          "isAsync" : false,
+          "isStatic" : false,
+          "isThrows" : false
+        },
+        "name" : "testContainerWithStruct",
+        "parameters" : [
           {
-            "isReadonly" : true,
-            "isStatic" : false,
-            "name" : "overrideDefaults",
+            "label" : "_",
+            "name" : "point",
             "type" : {
-              "nullable" : {
-                "_0" : {
-                  "swiftStruct" : {
-                    "_0" : "ConfigStruct"
-                  }
-                },
-                "_1" : "null"
+              "swiftStruct" : {
+                "_0" : "DataPoint"
               }
             }
           }
         ],
-        "swiftCallName" : "AdvancedConfig"
+        "returnType" : {
+          "swiftHeapObject" : {
+            "_0" : "Container"
+          }
+        }
       },
       {
-        "methods" : [
-
-        ],
-        "name" : "MeasurementConfig",
-        "properties" : [
+        "abiName" : "bjs_roundTripJSObjectContainer",
+        "effects" : {
+          "isAsync" : false,
+          "isStatic" : false,
+          "isThrows" : false
+        },
+        "name" : "roundTripJSObjectContainer",
+        "parameters" : [
           {
-            "isReadonly" : true,
-            "isStatic" : false,
-            "name" : "precision",
+            "label" : "_",
+            "name" : "container",
             "type" : {
-              "rawValueEnum" : {
-                "_0" : "Precision",
-                "_1" : "Float"
+              "swiftStruct" : {
+                "_0" : "JSObjectContainer"
               }
             }
-          },
+          }
+        ],
+        "returnType" : {
+          "swiftStruct" : {
+            "_0" : "JSObjectContainer"
+          }
+        }
+      },
+      {
+        "abiName" : "bjs_roundTripFooContainer",
+        "effects" : {
+          "isAsync" : false,
+          "isStatic" : false,
+          "isThrows" : false
+        },
+        "name" : "roundTripFooContainer",
+        "parameters" : [
           {
-            "isReadonly" : true,
-            "isStatic" : false,
-            "name" : "ratio",
+            "label" : "_",
+            "name" : "container",
             "type" : {
-              "rawValueEnum" : {
-                "_0" : "Ratio",
-                "_1" : "Double"
+              "swiftStruct" : {
+                "_0" : "FooContainer"
               }
             }
-          },
+          }
+        ],
+        "returnType" : {
+          "swiftStruct" : {
+            "_0" : "FooContainer"
+          }
+        }
+      },
+      {
+        "abiName" : "bjs_roundTripArrayMembers",
+        "effects" : {
+          "isAsync" : false,
+          "isStatic" : false,
+          "isThrows" : false
+        },
+        "name" : "roundTripArrayMembers",
+        "parameters" : [
           {
-            "isReadonly" : true,
-            "isStatic" : false,
-            "name" : "optionalPrecision",
+            "label" : "_",
+            "name" : "value",
             "type" : {
-              "nullable" : {
-                "_0" : {
-                  "rawValueEnum" : {
-                    "_0" : "Precision",
-                    "_1" : "Float"
-                  }
-                },
-                "_1" : "null"
+              "swiftStruct" : {
+                "_0" : "ArrayMembers"
+              }
+            }
+          }
+        ],
+        "returnType" : {
+          "swiftStruct" : {
+            "_0" : "ArrayMembers"
+          }
+        }
+      },
+      {
+        "abiName" : "bjs_arrayMembersSum",
+        "effects" : {
+          "isAsync" : false,
+          "isStatic" : false,
+          "isThrows" : false
+        },
+        "name" : "arrayMembersSum",
+        "parameters" : [
+          {
+            "label" : "_",
+            "name" : "value",
+            "type" : {
+              "swiftStruct" : {
+                "_0" : "ArrayMembers"
               }
             }
           },
           {
-            "isReadonly" : true,
-            "isStatic" : false,
-            "name" : "optionalRatio",
+            "label" : "_",
+            "name" : "values",
             "type" : {
-              "nullable" : {
+              "array" : {
                 "_0" : {
-                  "rawValueEnum" : {
-                    "_0" : "Ratio",
-                    "_1" : "Double"
+                  "integer" : {
+                    "_0" : {
+                      "isSigned" : true,
+                      "width" : "word"
+                    }
                   }
-                },
-                "_1" : "null"
+                }
               }
             }
           }
         ],
-        "swiftCallName" : "MeasurementConfig"
+        "returnType" : {
+          "integer" : {
+            "_0" : {
+              "isSigned" : true,
+              "width" : "word"
+            }
+          }
+        }
       },
       {
-        "constructor" : {
-          "abiName" : "bjs_MathOperations_init",
-          "effects" : {
-            "isAsync" : false,
-            "isStatic" : false,
-            "isThrows" : false
+        "abiName" : "bjs_arrayMembersFirst",
+        "effects" : {
+          "isAsync" : false,
+          "isStatic" : false,
+          "isThrows" : false
+        },
+        "name" : "arrayMembersFirst",
+        "parameters" : [
+          {
+            "label" : "_",
+            "name" : "value",
+            "type" : {
+              "swiftStruct" : {
+                "_0" : "ArrayMembers"
+              }
+            }
           },
-          "parameters" : [
-            {
-              "defaultValue" : {
-                "double" : {
-                  "_0" : 0
+          {
+            "label" : "_",
+            "name" : "values",
+            "type" : {
+              "array" : {
+                "_0" : {
+                  "string" : {
+
+                  }
                 }
-              },
-              "label" : "baseValue",
-              "name" : "baseValue",
-              "type" : {
-                "double" : {
+              }
+            }
+          }
+        ],
+        "returnType" : {
+          "nullable" : {
+            "_0" : {
+              "string" : {
+
+              }
+            },
+            "_1" : "null"
+          }
+        }
+      }
+    ],
+    "protocols" : [
+      {
+        "methods" : [
 
+        ],
+        "name" : "ArrayElementProtocol",
+        "properties" : [
+          {
+            "isReadonly" : false,
+            "name" : "value",
+            "type" : {
+              "integer" : {
+                "_0" : {
+                  "isSigned" : true,
+                  "width" : "word"
                 }
               }
             }
-          ]
-        },
+          }
+        ]
+      },
+      {
         "methods" : [
           {
-            "abiName" : "bjs_MathOperations_add",
+            "abiName" : "bjs_DataProcessor_increment",
             "effects" : {
               "isAsync" : false,
               "isStatic" : false,
               "isThrows" : false
             },
-            "name" : "add",
+            "name" : "increment",
             "parameters" : [
               {
-                "label" : "a",
-                "name" : "a",
-                "type" : {
-                  "double" : {
-
-                  }
-                }
-              },
-              {
-                "defaultValue" : {
-                  "double" : {
-                    "_0" : 10
-                  }
-                },
-                "label" : "b",
-                "name" : "b",
+                "label" : "by",
+                "name" : "amount",
                 "type" : {
-                  "double" : {
-
+                  "integer" : {
+                    "_0" : {
+                      "isSigned" : true,
+                      "width" : "word"
+                    }
                   }
                 }
               }
             ],
             "returnType" : {
-              "double" : {
+              "void" : {
 
               }
             }
           },
           {
-            "abiName" : "bjs_MathOperations_multiply",
+            "abiName" : "bjs_DataProcessor_getValue",
             "effects" : {
               "isAsync" : false,
               "isStatic" : false,
               "isThrows" : false
             },
-            "name" : "multiply",
+            "name" : "getValue",
             "parameters" : [
-              {
-                "label" : "a",
-                "name" : "a",
-                "type" : {
-                  "double" : {
 
-                  }
+            ],
+            "returnType" : {
+              "integer" : {
+                "_0" : {
+                  "isSigned" : true,
+                  "width" : "word"
                 }
-              },
-              {
-                "label" : "b",
-                "name" : "b",
-                "type" : {
-                  "double" : {
-
-                  }
-                }
-              }
-            ],
-            "returnType" : {
-              "double" : {
-
               }
             }
           },
           {
-            "abiName" : "bjs_MathOperations_static_subtract",
+            "abiName" : "bjs_DataProcessor_setLabelElements",
             "effects" : {
               "isAsync" : false,
-              "isStatic" : true,
+              "isStatic" : false,
               "isThrows" : false
             },
-            "name" : "subtract",
+            "name" : "setLabelElements",
             "parameters" : [
               {
-                "label" : "a",
-                "name" : "a",
+                "label" : "_",
+                "name" : "labelPrefix",
                 "type" : {
-                  "double" : {
+                  "string" : {
 
                   }
                 }
               },
               {
-                "defaultValue" : {
-                  "double" : {
-                    "_0" : 5
-                  }
-                },
-                "label" : "b",
-                "name" : "b",
+                "label" : "_",
+                "name" : "labelSuffix",
                 "type" : {
-                  "double" : {
+                  "string" : {
 
                   }
                 }
               }
             ],
             "returnType" : {
-              "double" : {
+              "void" : {
 
               }
+            }
+          },
+          {
+            "abiName" : "bjs_DataProcessor_getLabel",
+            "effects" : {
+              "isAsync" : false,
+              "isStatic" : false,
+              "isThrows" : false
             },
-            "staticContext" : {
-              "structName" : {
-                "_0" : "MathOperations"
+            "name" : "getLabel",
+            "parameters" : [
+
+            ],
+            "returnType" : {
+              "string" : {
+
               }
             }
-          }
-        ],
-        "name" : "MathOperations",
-        "properties" : [
+          },
           {
-            "isReadonly" : true,
-            "isStatic" : false,
-            "name" : "baseValue",
-            "type" : {
-              "double" : {
+            "abiName" : "bjs_DataProcessor_isEven",
+            "effects" : {
+              "isAsync" : false,
+              "isStatic" : false,
+              "isThrows" : false
+            },
+            "name" : "isEven",
+            "parameters" : [
+
+            ],
+            "returnType" : {
+              "bool" : {
 
               }
             }
-          }
-        ],
-        "swiftCallName" : "MathOperations"
-      },
-      {
-        "methods" : [
+          },
           {
-            "abiName" : "bjs_CopyableCart_static_fromJSObject",
+            "abiName" : "bjs_DataProcessor_processGreeter",
             "effects" : {
               "isAsync" : false,
-              "isStatic" : true,
+              "isStatic" : false,
               "isThrows" : false
             },
-            "name" : "fromJSObject",
+            "name" : "processGreeter",
             "parameters" : [
               {
                 "label" : "_",
-                "name" : "object",
+                "name" : "greeter",
                 "type" : {
-                  "jsObject" : {
-
+                  "swiftHeapObject" : {
+                    "_0" : "Greeter"
                   }
                 }
               }
             ],
             "returnType" : {
-              "swiftStruct" : {
-                "_0" : "CopyableCart"
-              }
-            },
-            "staticContext" : {
-              "structName" : {
-                "_0" : "CopyableCart"
+              "string" : {
+
               }
             }
-          }
-        ],
-        "name" : "CopyableCart",
-        "properties" : [
+          },
           {
-            "isReadonly" : true,
-            "isStatic" : false,
-            "name" : "x",
-            "type" : {
-              "integer" : {
-                "_0" : {
-                  "isSigned" : true,
-                  "width" : "word"
-                }
+            "abiName" : "bjs_DataProcessor_createGreeter",
+            "effects" : {
+              "isAsync" : false,
+              "isStatic" : false,
+              "isThrows" : false
+            },
+            "name" : "createGreeter",
+            "parameters" : [
+
+            ],
+            "returnType" : {
+              "swiftHeapObject" : {
+                "_0" : "Greeter"
               }
             }
           },
           {
-            "isReadonly" : true,
-            "isStatic" : false,
-            "name" : "note",
-            "type" : {
-              "nullable" : {
-                "_0" : {
-                  "string" : {
-
+            "abiName" : "bjs_DataProcessor_processOptionalGreeter",
+            "effects" : {
+              "isAsync" : false,
+              "isStatic" : false,
+              "isThrows" : false
+            },
+            "name" : "processOptionalGreeter",
+            "parameters" : [
+              {
+                "label" : "_",
+                "name" : "greeter",
+                "type" : {
+                  "nullable" : {
+                    "_0" : {
+                      "swiftHeapObject" : {
+                        "_0" : "Greeter"
+                      }
+                    },
+                    "_1" : "null"
                   }
-                },
-                "_1" : "null"
+                }
               }
-            }
-          }
-        ],
-        "swiftCallName" : "CopyableCart"
-      },
-      {
-        "methods" : [
-
-        ],
-        "name" : "CopyableCartItem",
-        "properties" : [
-          {
-            "isReadonly" : true,
-            "isStatic" : false,
-            "name" : "sku",
-            "type" : {
+            ],
+            "returnType" : {
               "string" : {
 
               }
             }
           },
           {
-            "isReadonly" : true,
-            "isStatic" : false,
-            "name" : "quantity",
-            "type" : {
-              "integer" : {
+            "abiName" : "bjs_DataProcessor_createOptionalGreeter",
+            "effects" : {
+              "isAsync" : false,
+              "isStatic" : false,
+              "isThrows" : false
+            },
+            "name" : "createOptionalGreeter",
+            "parameters" : [
+
+            ],
+            "returnType" : {
+              "nullable" : {
                 "_0" : {
-                  "isSigned" : true,
-                  "width" : "word"
-                }
+                  "swiftHeapObject" : {
+                    "_0" : "Greeter"
+                  }
+                },
+                "_1" : "null"
               }
             }
-          }
-        ],
-        "swiftCallName" : "CopyableCartItem"
-      },
-      {
-        "methods" : [
+          },
           {
-            "abiName" : "bjs_CopyableNestedCart_static_fromJSObject",
+            "abiName" : "bjs_DataProcessor_handleAPIResult",
             "effects" : {
               "isAsync" : false,
-              "isStatic" : true,
+              "isStatic" : false,
               "isThrows" : false
             },
-            "name" : "fromJSObject",
+            "name" : "handleAPIResult",
             "parameters" : [
               {
                 "label" : "_",
-                "name" : "object",
+                "name" : "result",
                 "type" : {
-                  "jsObject" : {
-
+                  "nullable" : {
+                    "_0" : {
+                      "associatedValueEnum" : {
+                        "_0" : "APIResult"
+                      }
+                    },
+                    "_1" : "null"
                   }
                 }
               }
             ],
             "returnType" : {
-              "swiftStruct" : {
-                "_0" : "CopyableNestedCart"
-              }
-            },
-            "staticContext" : {
-              "structName" : {
-                "_0" : "CopyableNestedCart"
-              }
-            }
-          }
-        ],
-        "name" : "CopyableNestedCart",
-        "properties" : [
-          {
-            "isReadonly" : true,
-            "isStatic" : false,
-            "name" : "id",
-            "type" : {
-              "integer" : {
-                "_0" : {
-                  "isSigned" : true,
-                  "width" : "word"
-                }
+              "void" : {
+
               }
             }
           },
           {
-            "isReadonly" : true,
-            "isStatic" : false,
-            "name" : "item",
-            "type" : {
-              "swiftStruct" : {
-                "_0" : "CopyableCartItem"
-              }
-            }
-          },
-          {
-            "isReadonly" : true,
-            "isStatic" : false,
-            "name" : "shippingAddress",
-            "type" : {
+            "abiName" : "bjs_DataProcessor_getAPIResult",
+            "effects" : {
+              "isAsync" : false,
+              "isStatic" : false,
+              "isThrows" : false
+            },
+            "name" : "getAPIResult",
+            "parameters" : [
+
+            ],
+            "returnType" : {
               "nullable" : {
                 "_0" : {
-                  "swiftStruct" : {
-                    "_0" : "Address"
+                  "associatedValueEnum" : {
+                    "_0" : "APIResult"
                   }
                 },
                 "_1" : "null"
@@ -16436,17 +18613,22 @@
             }
           }
         ],
-        "swiftCallName" : "CopyableNestedCart"
-      },
-      {
-        "methods" : [
-
-        ],
-        "name" : "ConfigStruct",
+        "name" : "DataProcessor",
         "properties" : [
+          {
+            "isReadonly" : false,
+            "name" : "count",
+            "type" : {
+              "integer" : {
+                "_0" : {
+                  "isSigned" : true,
+                  "width" : "word"
+                }
+              }
+            }
+          },
           {
             "isReadonly" : true,
-            "isStatic" : false,
             "name" : "name",
             "type" : {
               "string" : {
@@ -16455,87 +18637,124 @@
             }
           },
           {
-            "isReadonly" : true,
-            "isStatic" : false,
-            "name" : "value",
+            "isReadonly" : false,
+            "name" : "optionalTag",
             "type" : {
-              "integer" : {
+              "nullable" : {
                 "_0" : {
-                  "isSigned" : true,
-                  "width" : "word"
-                }
+                  "string" : {
+
+                  }
+                },
+                "_1" : "null"
               }
             }
           },
           {
             "isReadonly" : false,
-            "isStatic" : true,
-            "name" : "defaultConfig",
-            "staticContext" : {
-              "structName" : {
-                "_0" : "ConfigStruct"
-              }
-            },
+            "name" : "optionalCount",
             "type" : {
-              "string" : {
-
+              "nullable" : {
+                "_0" : {
+                  "integer" : {
+                    "_0" : {
+                      "isSigned" : true,
+                      "width" : "word"
+                    }
+                  }
+                },
+                "_1" : "null"
               }
             }
           },
           {
-            "isReadonly" : true,
-            "isStatic" : true,
-            "name" : "maxRetries",
-            "staticContext" : {
-              "structName" : {
-                "_0" : "ConfigStruct"
+            "isReadonly" : false,
+            "name" : "direction",
+            "type" : {
+              "nullable" : {
+                "_0" : {
+                  "caseEnum" : {
+                    "_0" : "Direction"
+                  }
+                },
+                "_1" : "null"
               }
-            },
+            }
+          },
+          {
+            "isReadonly" : false,
+            "name" : "optionalTheme",
             "type" : {
-              "integer" : {
+              "nullable" : {
                 "_0" : {
-                  "isSigned" : true,
-                  "width" : "word"
-                }
+                  "rawValueEnum" : {
+                    "_0" : "Theme",
+                    "_1" : "String"
+                  }
+                },
+                "_1" : "null"
               }
             }
           },
           {
             "isReadonly" : false,
-            "isStatic" : true,
-            "name" : "timeout",
-            "staticContext" : {
-              "structName" : {
-                "_0" : "ConfigStruct"
+            "name" : "httpStatus",
+            "type" : {
+              "nullable" : {
+                "_0" : {
+                  "rawValueEnum" : {
+                    "_0" : "HttpStatus",
+                    "_1" : "Int"
+                  }
+                },
+                "_1" : "null"
               }
-            },
+            }
+          },
+          {
+            "isReadonly" : false,
+            "name" : "apiResult",
             "type" : {
-              "double" : {
-
+              "nullable" : {
+                "_0" : {
+                  "associatedValueEnum" : {
+                    "_0" : "APIResult"
+                  }
+                },
+                "_1" : "null"
               }
             }
           },
           {
-            "isReadonly" : true,
-            "isStatic" : true,
-            "name" : "computedSetting",
-            "staticContext" : {
-              "structName" : {
-                "_0" : "ConfigStruct"
+            "isReadonly" : false,
+            "name" : "helper",
+            "type" : {
+              "swiftHeapObject" : {
+                "_0" : "Greeter"
               }
-            },
+            }
+          },
+          {
+            "isReadonly" : false,
+            "name" : "optionalHelper",
             "type" : {
-              "string" : {
-
+              "nullable" : {
+                "_0" : {
+                  "swiftHeapObject" : {
+                    "_0" : "Greeter"
+                  }
+                },
+                "_1" : "null"
               }
             }
           }
-        ],
-        "swiftCallName" : "ConfigStruct"
-      },
+        ]
+      }
+    ],
+    "structs" : [
       {
         "constructor" : {
-          "abiName" : "bjs_Vector2D_init",
+          "abiName" : "bjs_JSCoordinate_init",
           "effects" : {
             "isAsync" : false,
             "isStatic" : false,
@@ -16543,8 +18762,8 @@
           },
           "parameters" : [
             {
-              "label" : "dx",
-              "name" : "dx",
+              "label" : "latitude",
+              "name" : "latitude",
               "type" : {
                 "double" : {
 
@@ -16552,8 +18771,8 @@
               }
             },
             {
-              "label" : "dy",
-              "name" : "dy",
+              "label" : "longitude",
+              "name" : "longitude",
               "type" : {
                 "double" : {
 
@@ -16563,55 +18782,14 @@
           ]
         },
         "methods" : [
-          {
-            "abiName" : "bjs_Vector2D_magnitude",
-            "effects" : {
-              "isAsync" : false,
-              "isStatic" : false,
-              "isThrows" : false
-            },
-            "name" : "magnitude",
-            "parameters" : [
-
-            ],
-            "returnType" : {
-              "double" : {
-
-              }
-            }
-          },
-          {
-            "abiName" : "bjs_Vector2D_scaled",
-            "effects" : {
-              "isAsync" : false,
-              "isStatic" : false,
-              "isThrows" : false
-            },
-            "name" : "scaled",
-            "parameters" : [
-              {
-                "label" : "by",
-                "name" : "factor",
-                "type" : {
-                  "double" : {
 
-                  }
-                }
-              }
-            ],
-            "returnType" : {
-              "swiftStruct" : {
-                "_0" : "Vector2D"
-              }
-            }
-          }
         ],
-        "name" : "Vector2D",
+        "name" : "JSCoordinate",
         "properties" : [
           {
             "isReadonly" : true,
             "isStatic" : false,
-            "name" : "dx",
+            "name" : "latitude",
             "type" : {
               "double" : {
 
@@ -16621,7 +18799,7 @@
           {
             "isReadonly" : true,
             "isStatic" : false,
-            "name" : "dy",
+            "name" : "longitude",
             "type" : {
               "double" : {
 
@@ -16629,20 +18807,26 @@
             }
           }
         ],
-        "swiftCallName" : "Vector2D"
+        "swiftCallName" : "JSCoordinate"
       },
       {
         "methods" : [
 
         ],
-        "name" : "JSObjectContainer",
+        "name" : "Metadata",
+        "namespace" : [
+          "NestedStructGroupA"
+        ],
         "properties" : [
           {
             "isReadonly" : true,
             "isStatic" : false,
-            "name" : "object",
+            "name" : "label",
+            "namespace" : [
+              "NestedStructGroupA"
+            ],
             "type" : {
-              "jsObject" : {
+              "string" : {
 
               }
             }
@@ -16650,84 +18834,132 @@
           {
             "isReadonly" : true,
             "isStatic" : false,
-            "name" : "optionalObject",
+            "name" : "count",
+            "namespace" : [
+              "NestedStructGroupA"
+            ],
             "type" : {
-              "nullable" : {
+              "integer" : {
                 "_0" : {
-                  "jsObject" : {
-
-                  }
-                },
-                "_1" : "null"
-              }
+                  "isSigned" : true,
+                  "width" : "word"
+                }
+              }
             }
           }
         ],
-        "swiftCallName" : "JSObjectContainer"
+        "swiftCallName" : "NestedStructGroupA.Metadata"
       },
       {
         "methods" : [
 
         ],
-        "name" : "FooContainer",
+        "name" : "Metadata",
+        "namespace" : [
+          "NestedStructGroupB"
+        ],
         "properties" : [
           {
             "isReadonly" : true,
             "isStatic" : false,
-            "name" : "foo",
+            "name" : "tag",
+            "namespace" : [
+              "NestedStructGroupB"
+            ],
             "type" : {
-              "jsObject" : {
-                "_0" : "Foo"
+              "string" : {
+
               }
             }
           },
           {
             "isReadonly" : true,
             "isStatic" : false,
-            "name" : "optionalFoo",
+            "name" : "value",
+            "namespace" : [
+              "NestedStructGroupB"
+            ],
             "type" : {
-              "nullable" : {
-                "_0" : {
-                  "jsObject" : {
-                    "_0" : "Foo"
-                  }
-                },
-                "_1" : "null"
+              "double" : {
+
               }
             }
           }
         ],
-        "swiftCallName" : "FooContainer"
+        "swiftCallName" : "NestedStructGroupB.Metadata"
       },
       {
+        "constructor" : {
+          "abiName" : "bjs_NestedTypeHost_Label_init",
+          "effects" : {
+            "isAsync" : false,
+            "isStatic" : false,
+            "isThrows" : false
+          },
+          "parameters" : [
+            {
+              "label" : "text",
+              "name" : "text",
+              "type" : {
+                "string" : {
+
+                }
+              }
+            }
+          ]
+        },
         "methods" : [
           {
-            "abiName" : "bjs_ArrayMembers_sumValues",
+            "abiName" : "bjs_NestedTypeHost_Label_static_untitled",
             "effects" : {
               "isAsync" : false,
-              "isStatic" : false,
+              "isStatic" : true,
               "isThrows" : false
             },
-            "name" : "sumValues",
+            "name" : "untitled",
             "parameters" : [
-              {
-                "label" : "_",
-                "name" : "values",
-                "type" : {
-                  "array" : {
-                    "_0" : {
-                      "integer" : {
-                        "_0" : {
-                          "isSigned" : true,
-                          "width" : "word"
-                        }
-                      }
-                    }
-                  }
-                }
-              }
+
             ],
             "returnType" : {
+              "swiftStruct" : {
+                "_0" : "NestedTypeHost.Label"
+              }
+            },
+            "staticContext" : {
+              "structName" : {
+                "_0" : "NestedTypeHost_Label"
+              }
+            }
+          }
+        ],
+        "name" : "Label",
+        "namespace" : [
+          "NestedTypeHost"
+        ],
+        "properties" : [
+          {
+            "isReadonly" : true,
+            "isStatic" : false,
+            "name" : "text",
+            "namespace" : [
+              "NestedTypeHost"
+            ],
+            "type" : {
+              "string" : {
+
+              }
+            }
+          },
+          {
+            "isReadonly" : true,
+            "isStatic" : true,
+            "name" : "maxLength",
+            "staticContext" : {
+              "structName" : {
+                "_0" : "NestedTypeHost_Label"
+              }
+            },
+            "type" : {
               "integer" : {
                 "_0" : {
                   "isSigned" : true,
@@ -16735,254 +18967,3120 @@
                 }
               }
             }
+          }
+        ],
+        "swiftCallName" : "NestedTypeHost.Label"
+      },
+      {
+        "constructor" : {
+          "abiName" : "bjs_Library_Shelf_init",
+          "effects" : {
+            "isAsync" : false,
+            "isStatic" : false,
+            "isThrows" : false
           },
+          "parameters" : [
+            {
+              "label" : "label",
+              "name" : "label",
+              "type" : {
+                "string" : {
+
+                }
+              }
+            }
+          ]
+        },
+        "methods" : [
           {
-            "abiName" : "bjs_ArrayMembers_firstString",
+            "abiName" : "bjs_Library_Shelf_describeShelf",
             "effects" : {
               "isAsync" : false,
               "isStatic" : false,
               "isThrows" : false
             },
-            "name" : "firstString",
+            "name" : "describeShelf",
             "parameters" : [
-              {
-                "label" : "_",
-                "name" : "values",
-                "type" : {
-                  "array" : {
-                    "_0" : {
-                      "string" : {
 
-                      }
-                    }
-                  }
-                }
-              }
             ],
             "returnType" : {
-              "nullable" : {
-                "_0" : {
-                  "string" : {
+              "string" : {
 
-                  }
-                },
-                "_1" : "null"
               }
             }
           }
         ],
-        "name" : "ArrayMembers",
+        "name" : "Shelf",
+        "namespace" : [
+          "Library"
+        ],
         "properties" : [
           {
             "isReadonly" : true,
             "isStatic" : false,
-            "name" : "ints",
+            "name" : "label",
+            "namespace" : [
+              "Library"
+            ],
             "type" : {
-              "array" : {
+              "string" : {
+
+              }
+            }
+          },
+          {
+            "isReadonly" : true,
+            "isStatic" : true,
+            "name" : "capacity",
+            "staticContext" : {
+              "structName" : {
+                "_0" : "Library_Shelf"
+              }
+            },
+            "type" : {
+              "integer" : {
                 "_0" : {
-                  "integer" : {
-                    "_0" : {
-                      "isSigned" : true,
-                      "width" : "word"
-                    }
-                  }
+                  "isSigned" : true,
+                  "width" : "word"
                 }
               }
             }
+          }
+        ],
+        "swiftCallName" : "Library.Shelf"
+      },
+      {
+        "constructor" : {
+          "abiName" : "bjs_Library_Shelf_Divider_init",
+          "effects" : {
+            "isAsync" : false,
+            "isStatic" : false,
+            "isThrows" : false
           },
+          "parameters" : [
+            {
+              "label" : "slot",
+              "name" : "slot",
+              "type" : {
+                "integer" : {
+                  "_0" : {
+                    "isSigned" : true,
+                    "width" : "word"
+                  }
+                }
+              }
+            }
+          ]
+        },
+        "methods" : [
+
+        ],
+        "name" : "Divider",
+        "namespace" : [
+          "Library",
+          "Shelf"
+        ],
+        "properties" : [
           {
             "isReadonly" : true,
             "isStatic" : false,
-            "name" : "optStrings",
+            "name" : "slot",
+            "namespace" : [
+              "Library",
+              "Shelf"
+            ],
             "type" : {
-              "nullable" : {
+              "integer" : {
                 "_0" : {
-                  "array" : {
-                    "_0" : {
-                      "string" : {
-
-                      }
-                    }
-                  }
-                },
-                "_1" : "null"
+                  "isSigned" : true,
+                  "width" : "word"
+                }
               }
             }
           }
         ],
-        "swiftCallName" : "ArrayMembers"
-      }
-    ]
-  },
-  "imported" : {
-    "children" : [
+        "swiftCallName" : "Library.Shelf.Divider"
+      },
       {
-        "functions" : [
+        "methods" : [
 
         ],
-        "types" : [
+        "name" : "GenericRTPoint",
+        "properties" : [
           {
-            "accessLevel" : "internal",
-            "constructor" : {
-              "accessLevel" : "internal",
-              "parameters" : [
-                {
-                  "name" : "id",
-                  "type" : {
-                    "string" : {
-
-                    }
-                  }
+            "isReadonly" : true,
+            "isStatic" : false,
+            "name" : "x",
+            "type" : {
+              "integer" : {
+                "_0" : {
+                  "isSigned" : true,
+                  "width" : "word"
                 }
-              ]
-            },
-            "getters" : [
-              {
-                "accessLevel" : "internal",
-                "name" : "id",
-                "type" : {
-                  "string" : {
-
-                  }
+              }
+            }
+          },
+          {
+            "isReadonly" : true,
+            "isStatic" : false,
+            "name" : "y",
+            "type" : {
+              "integer" : {
+                "_0" : {
+                  "isSigned" : true,
+                  "width" : "word"
                 }
               }
-            ],
-            "methods" : [
-
-            ],
-            "name" : "ArrayElementObject",
-            "setters" : [
+            }
+          }
+        ],
+        "swiftCallName" : "GenericRTPoint"
+      },
+      {
+        "methods" : [
 
+        ],
+        "name" : "Metadata",
+        "namespace" : [
+          "GenericRTNamespace"
+        ],
+        "properties" : [
+          {
+            "isReadonly" : true,
+            "isStatic" : false,
+            "name" : "label",
+            "namespace" : [
+              "GenericRTNamespace"
             ],
-            "staticMethods" : [
+            "type" : {
+              "string" : {
 
-            ]
+              }
+            }
           },
           {
-            "accessLevel" : "internal",
-            "getters" : [
-
-            ],
-            "methods" : [
-
+            "isReadonly" : true,
+            "isStatic" : false,
+            "name" : "count",
+            "namespace" : [
+              "GenericRTNamespace"
             ],
-            "name" : "ArraySupportImports",
-            "setters" : [
+            "type" : {
+              "integer" : {
+                "_0" : {
+                  "isSigned" : true,
+                  "width" : "word"
+                }
+              }
+            }
+          }
+        ],
+        "swiftCallName" : "GenericRTNamespace.Metadata"
+      },
+      {
+        "methods" : [
 
-            ],
-            "staticMethods" : [
-              {
-                "accessLevel" : "internal",
-                "effects" : {
-                  "isAsync" : false,
-                  "isStatic" : false,
-                  "isThrows" : true
-                },
-                "name" : "jsIntArrayLength",
-                "parameters" : [
-                  {
-                    "name" : "items",
-                    "type" : {
-                      "array" : {
-                        "_0" : {
-                          "integer" : {
-                            "_0" : {
-                              "isSigned" : true,
-                              "width" : "word"
-                            }
-                          }
-                        }
-                      }
-                    }
-                  }
-                ],
-                "returnType" : {
-                  "integer" : {
-                    "_0" : {
-                      "isSigned" : true,
-                      "width" : "word"
-                    }
+        ],
+        "name" : "Point",
+        "properties" : [
+          {
+            "isReadonly" : true,
+            "isStatic" : false,
+            "name" : "x",
+            "type" : {
+              "integer" : {
+                "_0" : {
+                  "isSigned" : true,
+                  "width" : "word"
+                }
+              }
+            }
+          },
+          {
+            "isReadonly" : true,
+            "isStatic" : false,
+            "name" : "y",
+            "type" : {
+              "integer" : {
+                "_0" : {
+                  "isSigned" : true,
+                  "width" : "word"
+                }
+              }
+            }
+          }
+        ],
+        "swiftCallName" : "Point"
+      },
+      {
+        "constructor" : {
+          "abiName" : "bjs_PointerFields_init",
+          "effects" : {
+            "isAsync" : false,
+            "isStatic" : false,
+            "isThrows" : false
+          },
+          "parameters" : [
+            {
+              "label" : "raw",
+              "name" : "raw",
+              "type" : {
+                "unsafePointer" : {
+                  "_0" : {
+                    "kind" : "unsafeRawPointer"
                   }
                 }
-              },
-              {
-                "accessLevel" : "internal",
-                "effects" : {
-                  "isAsync" : false,
-                  "isStatic" : false,
-                  "isThrows" : true
-                },
-                "name" : "jsRoundTripIntArray",
-                "parameters" : [
-                  {
-                    "name" : "items",
-                    "type" : {
-                      "array" : {
-                        "_0" : {
-                          "integer" : {
-                            "_0" : {
-                              "isSigned" : true,
-                              "width" : "word"
-                            }
-                          }
-                        }
-                      }
-                    }
+              }
+            },
+            {
+              "label" : "mutRaw",
+              "name" : "mutRaw",
+              "type" : {
+                "unsafePointer" : {
+                  "_0" : {
+                    "kind" : "unsafeMutableRawPointer"
                   }
-                ],
-                "returnType" : {
-                  "array" : {
-                    "_0" : {
-                      "integer" : {
-                        "_0" : {
-                          "isSigned" : true,
-                          "width" : "word"
-                        }
-                      }
-                    }
+                }
+              }
+            },
+            {
+              "label" : "opaque",
+              "name" : "opaque",
+              "type" : {
+                "unsafePointer" : {
+                  "_0" : {
+                    "kind" : "opaquePointer"
                   }
                 }
-              },
-              {
-                "accessLevel" : "internal",
-                "effects" : {
-                  "isAsync" : false,
-                  "isStatic" : false,
-                  "isThrows" : true
-                },
-                "name" : "jsRoundTripNumberArray",
-                "parameters" : [
-                  {
-                    "name" : "values",
-                    "type" : {
-                      "array" : {
-                        "_0" : {
-                          "double" : {
-
-                          }
-                        }
-                      }
-                    }
+              }
+            },
+            {
+              "label" : "ptr",
+              "name" : "ptr",
+              "type" : {
+                "unsafePointer" : {
+                  "_0" : {
+                    "kind" : "unsafePointer",
+                    "pointee" : "UInt8"
                   }
-                ],
-                "returnType" : {
-                  "array" : {
-                    "_0" : {
-                      "double" : {
-
-                      }
-                    }
+                }
+              }
+            },
+            {
+              "label" : "mutPtr",
+              "name" : "mutPtr",
+              "type" : {
+                "unsafePointer" : {
+                  "_0" : {
+                    "kind" : "unsafeMutablePointer",
+                    "pointee" : "UInt8"
+                  }
+                }
+              }
+            }
+          ]
+        },
+        "methods" : [
+
+        ],
+        "name" : "PointerFields",
+        "properties" : [
+          {
+            "isReadonly" : true,
+            "isStatic" : false,
+            "name" : "raw",
+            "type" : {
+              "unsafePointer" : {
+                "_0" : {
+                  "kind" : "unsafeRawPointer"
+                }
+              }
+            }
+          },
+          {
+            "isReadonly" : true,
+            "isStatic" : false,
+            "name" : "mutRaw",
+            "type" : {
+              "unsafePointer" : {
+                "_0" : {
+                  "kind" : "unsafeMutableRawPointer"
+                }
+              }
+            }
+          },
+          {
+            "isReadonly" : true,
+            "isStatic" : false,
+            "name" : "opaque",
+            "type" : {
+              "unsafePointer" : {
+                "_0" : {
+                  "kind" : "opaquePointer"
+                }
+              }
+            }
+          },
+          {
+            "isReadonly" : true,
+            "isStatic" : false,
+            "name" : "ptr",
+            "type" : {
+              "unsafePointer" : {
+                "_0" : {
+                  "kind" : "unsafePointer",
+                  "pointee" : "UInt8"
+                }
+              }
+            }
+          },
+          {
+            "isReadonly" : true,
+            "isStatic" : false,
+            "name" : "mutPtr",
+            "type" : {
+              "unsafePointer" : {
+                "_0" : {
+                  "kind" : "unsafeMutablePointer",
+                  "pointee" : "UInt8"
+                }
+              }
+            }
+          }
+        ],
+        "swiftCallName" : "PointerFields"
+      },
+      {
+        "constructor" : {
+          "abiName" : "bjs_DataPoint_init",
+          "effects" : {
+            "isAsync" : false,
+            "isStatic" : false,
+            "isThrows" : false
+          },
+          "parameters" : [
+            {
+              "label" : "x",
+              "name" : "x",
+              "type" : {
+                "double" : {
+
+                }
+              }
+            },
+            {
+              "label" : "y",
+              "name" : "y",
+              "type" : {
+                "double" : {
+
+                }
+              }
+            },
+            {
+              "label" : "label",
+              "name" : "label",
+              "type" : {
+                "string" : {
+
+                }
+              }
+            },
+            {
+              "label" : "optCount",
+              "name" : "optCount",
+              "type" : {
+                "nullable" : {
+                  "_0" : {
+                    "integer" : {
+                      "_0" : {
+                        "isSigned" : true,
+                        "width" : "word"
+                      }
+                    }
+                  },
+                  "_1" : "null"
+                }
+              }
+            },
+            {
+              "label" : "optFlag",
+              "name" : "optFlag",
+              "type" : {
+                "nullable" : {
+                  "_0" : {
+                    "bool" : {
+
+                    }
+                  },
+                  "_1" : "null"
+                }
+              }
+            }
+          ]
+        },
+        "methods" : [
+          {
+            "abiName" : "bjs_DataPoint_static_origin",
+            "effects" : {
+              "isAsync" : false,
+              "isStatic" : true,
+              "isThrows" : false
+            },
+            "name" : "origin",
+            "parameters" : [
+
+            ],
+            "returnType" : {
+              "swiftStruct" : {
+                "_0" : "DataPoint"
+              }
+            },
+            "staticContext" : {
+              "structName" : {
+                "_0" : "DataPoint"
+              }
+            }
+          }
+        ],
+        "name" : "DataPoint",
+        "properties" : [
+          {
+            "isReadonly" : true,
+            "isStatic" : false,
+            "name" : "x",
+            "type" : {
+              "double" : {
+
+              }
+            }
+          },
+          {
+            "isReadonly" : true,
+            "isStatic" : false,
+            "name" : "y",
+            "type" : {
+              "double" : {
+
+              }
+            }
+          },
+          {
+            "isReadonly" : true,
+            "isStatic" : false,
+            "name" : "label",
+            "type" : {
+              "string" : {
+
+              }
+            }
+          },
+          {
+            "isReadonly" : true,
+            "isStatic" : false,
+            "name" : "optCount",
+            "type" : {
+              "nullable" : {
+                "_0" : {
+                  "integer" : {
+                    "_0" : {
+                      "isSigned" : true,
+                      "width" : "word"
+                    }
+                  }
+                },
+                "_1" : "null"
+              }
+            }
+          },
+          {
+            "isReadonly" : true,
+            "isStatic" : false,
+            "name" : "optFlag",
+            "type" : {
+              "nullable" : {
+                "_0" : {
+                  "bool" : {
+
+                  }
+                },
+                "_1" : "null"
+              }
+            }
+          },
+          {
+            "isReadonly" : true,
+            "isStatic" : true,
+            "name" : "dimensions",
+            "staticContext" : {
+              "structName" : {
+                "_0" : "DataPoint"
+              }
+            },
+            "type" : {
+              "integer" : {
+                "_0" : {
+                  "isSigned" : true,
+                  "width" : "word"
+                }
+              }
+            }
+          }
+        ],
+        "swiftCallName" : "DataPoint"
+      },
+      {
+        "constructor" : {
+          "abiName" : "bjs_PublicPoint_init",
+          "effects" : {
+            "isAsync" : false,
+            "isStatic" : false,
+            "isThrows" : false
+          },
+          "parameters" : [
+            {
+              "label" : "x",
+              "name" : "x",
+              "type" : {
+                "integer" : {
+                  "_0" : {
+                    "isSigned" : true,
+                    "width" : "word"
+                  }
+                }
+              }
+            },
+            {
+              "label" : "y",
+              "name" : "y",
+              "type" : {
+                "integer" : {
+                  "_0" : {
+                    "isSigned" : true,
+                    "width" : "word"
+                  }
+                }
+              }
+            }
+          ]
+        },
+        "explicitAccessControl" : "public",
+        "methods" : [
+
+        ],
+        "name" : "PublicPoint",
+        "properties" : [
+          {
+            "isReadonly" : true,
+            "isStatic" : false,
+            "name" : "x",
+            "type" : {
+              "integer" : {
+                "_0" : {
+                  "isSigned" : true,
+                  "width" : "word"
+                }
+              }
+            }
+          },
+          {
+            "isReadonly" : true,
+            "isStatic" : false,
+            "name" : "y",
+            "type" : {
+              "integer" : {
+                "_0" : {
+                  "isSigned" : true,
+                  "width" : "word"
+                }
+              }
+            }
+          }
+        ],
+        "swiftCallName" : "PublicPoint"
+      },
+      {
+        "methods" : [
+
+        ],
+        "name" : "Address",
+        "properties" : [
+          {
+            "isReadonly" : true,
+            "isStatic" : false,
+            "name" : "street",
+            "type" : {
+              "string" : {
+
+              }
+            }
+          },
+          {
+            "isReadonly" : true,
+            "isStatic" : false,
+            "name" : "city",
+            "type" : {
+              "string" : {
+
+              }
+            }
+          },
+          {
+            "isReadonly" : true,
+            "isStatic" : false,
+            "name" : "zipCode",
+            "type" : {
+              "nullable" : {
+                "_0" : {
+                  "integer" : {
+                    "_0" : {
+                      "isSigned" : true,
+                      "width" : "word"
+                    }
+                  }
+                },
+                "_1" : "null"
+              }
+            }
+          }
+        ],
+        "swiftCallName" : "Address"
+      },
+      {
+        "methods" : [
+
+        ],
+        "name" : "Contact",
+        "properties" : [
+          {
+            "isReadonly" : true,
+            "isStatic" : false,
+            "name" : "name",
+            "type" : {
+              "string" : {
+
+              }
+            }
+          },
+          {
+            "isReadonly" : true,
+            "isStatic" : false,
+            "name" : "age",
+            "type" : {
+              "integer" : {
+                "_0" : {
+                  "isSigned" : true,
+                  "width" : "word"
+                }
+              }
+            }
+          },
+          {
+            "isReadonly" : true,
+            "isStatic" : false,
+            "name" : "address",
+            "type" : {
+              "swiftStruct" : {
+                "_0" : "Address"
+              }
+            }
+          },
+          {
+            "isReadonly" : true,
+            "isStatic" : false,
+            "name" : "email",
+            "type" : {
+              "nullable" : {
+                "_0" : {
+                  "string" : {
+
+                  }
+                },
+                "_1" : "null"
+              }
+            }
+          },
+          {
+            "isReadonly" : true,
+            "isStatic" : false,
+            "name" : "secondaryAddress",
+            "type" : {
+              "nullable" : {
+                "_0" : {
+                  "swiftStruct" : {
+                    "_0" : "Address"
+                  }
+                },
+                "_1" : "null"
+              }
+            }
+          }
+        ],
+        "swiftCallName" : "Contact"
+      },
+      {
+        "methods" : [
+
+        ],
+        "name" : "Config",
+        "properties" : [
+          {
+            "isReadonly" : true,
+            "isStatic" : false,
+            "name" : "name",
+            "type" : {
+              "string" : {
+
+              }
+            }
+          },
+          {
+            "isReadonly" : true,
+            "isStatic" : false,
+            "name" : "theme",
+            "type" : {
+              "nullable" : {
+                "_0" : {
+                  "rawValueEnum" : {
+                    "_0" : "Theme",
+                    "_1" : "String"
+                  }
+                },
+                "_1" : "null"
+              }
+            }
+          },
+          {
+            "isReadonly" : true,
+            "isStatic" : false,
+            "name" : "direction",
+            "type" : {
+              "nullable" : {
+                "_0" : {
+                  "caseEnum" : {
+                    "_0" : "Direction"
+                  }
+                },
+                "_1" : "null"
+              }
+            }
+          },
+          {
+            "isReadonly" : true,
+            "isStatic" : false,
+            "name" : "status",
+            "type" : {
+              "caseEnum" : {
+                "_0" : "Status"
+              }
+            }
+          }
+        ],
+        "swiftCallName" : "Config"
+      },
+      {
+        "methods" : [
+
+        ],
+        "name" : "SessionData",
+        "properties" : [
+          {
+            "isReadonly" : true,
+            "isStatic" : false,
+            "name" : "id",
+            "type" : {
+              "integer" : {
+                "_0" : {
+                  "isSigned" : true,
+                  "width" : "word"
+                }
+              }
+            }
+          },
+          {
+            "isReadonly" : true,
+            "isStatic" : false,
+            "name" : "owner",
+            "type" : {
+              "nullable" : {
+                "_0" : {
+                  "swiftHeapObject" : {
+                    "_0" : "Greeter"
+                  }
+                },
+                "_1" : "null"
+              }
+            }
+          }
+        ],
+        "swiftCallName" : "SessionData"
+      },
+      {
+        "methods" : [
+
+        ],
+        "name" : "ValidationReport",
+        "properties" : [
+          {
+            "isReadonly" : true,
+            "isStatic" : false,
+            "name" : "id",
+            "type" : {
+              "integer" : {
+                "_0" : {
+                  "isSigned" : true,
+                  "width" : "word"
+                }
+              }
+            }
+          },
+          {
+            "isReadonly" : true,
+            "isStatic" : false,
+            "name" : "result",
+            "type" : {
+              "associatedValueEnum" : {
+                "_0" : "APIResult"
+              }
+            }
+          },
+          {
+            "isReadonly" : true,
+            "isStatic" : false,
+            "name" : "status",
+            "type" : {
+              "nullable" : {
+                "_0" : {
+                  "caseEnum" : {
+                    "_0" : "Status"
+                  }
+                },
+                "_1" : "null"
+              }
+            }
+          },
+          {
+            "isReadonly" : true,
+            "isStatic" : false,
+            "name" : "outcome",
+            "type" : {
+              "nullable" : {
+                "_0" : {
+                  "associatedValueEnum" : {
+                    "_0" : "APIResult"
+                  }
+                },
+                "_1" : "null"
+              }
+            }
+          }
+        ],
+        "swiftCallName" : "ValidationReport"
+      },
+      {
+        "methods" : [
+
+        ],
+        "name" : "AdvancedConfig",
+        "properties" : [
+          {
+            "isReadonly" : true,
+            "isStatic" : false,
+            "name" : "id",
+            "type" : {
+              "integer" : {
+                "_0" : {
+                  "isSigned" : true,
+                  "width" : "word"
+                }
+              }
+            }
+          },
+          {
+            "isReadonly" : true,
+            "isStatic" : false,
+            "name" : "title",
+            "type" : {
+              "string" : {
+
+              }
+            }
+          },
+          {
+            "isReadonly" : true,
+            "isStatic" : false,
+            "name" : "enabled",
+            "type" : {
+              "bool" : {
+
+              }
+            }
+          },
+          {
+            "isReadonly" : true,
+            "isStatic" : false,
+            "name" : "theme",
+            "type" : {
+              "rawValueEnum" : {
+                "_0" : "Theme",
+                "_1" : "String"
+              }
+            }
+          },
+          {
+            "isReadonly" : true,
+            "isStatic" : false,
+            "name" : "status",
+            "type" : {
+              "caseEnum" : {
+                "_0" : "Status"
+              }
+            }
+          },
+          {
+            "isReadonly" : true,
+            "isStatic" : false,
+            "name" : "result",
+            "type" : {
+              "nullable" : {
+                "_0" : {
+                  "associatedValueEnum" : {
+                    "_0" : "APIResult"
+                  }
+                },
+                "_1" : "null"
+              }
+            }
+          },
+          {
+            "isReadonly" : true,
+            "isStatic" : false,
+            "name" : "metadata",
+            "type" : {
+              "nullable" : {
+                "_0" : {
+                  "jsObject" : {
+
+                  }
+                },
+                "_1" : "null"
+              }
+            }
+          },
+          {
+            "isReadonly" : true,
+            "isStatic" : false,
+            "name" : "location",
+            "type" : {
+              "nullable" : {
+                "_0" : {
+                  "swiftStruct" : {
+                    "_0" : "DataPoint"
+                  }
+                },
+                "_1" : "null"
+              }
+            }
+          },
+          {
+            "isReadonly" : true,
+            "isStatic" : false,
+            "name" : "defaults",
+            "type" : {
+              "swiftStruct" : {
+                "_0" : "ConfigStruct"
+              }
+            }
+          },
+          {
+            "isReadonly" : true,
+            "isStatic" : false,
+            "name" : "overrideDefaults",
+            "type" : {
+              "nullable" : {
+                "_0" : {
+                  "swiftStruct" : {
+                    "_0" : "ConfigStruct"
+                  }
+                },
+                "_1" : "null"
+              }
+            }
+          }
+        ],
+        "swiftCallName" : "AdvancedConfig"
+      },
+      {
+        "methods" : [
+
+        ],
+        "name" : "MeasurementConfig",
+        "properties" : [
+          {
+            "isReadonly" : true,
+            "isStatic" : false,
+            "name" : "precision",
+            "type" : {
+              "rawValueEnum" : {
+                "_0" : "Precision",
+                "_1" : "Float"
+              }
+            }
+          },
+          {
+            "isReadonly" : true,
+            "isStatic" : false,
+            "name" : "ratio",
+            "type" : {
+              "rawValueEnum" : {
+                "_0" : "Ratio",
+                "_1" : "Double"
+              }
+            }
+          },
+          {
+            "isReadonly" : true,
+            "isStatic" : false,
+            "name" : "optionalPrecision",
+            "type" : {
+              "nullable" : {
+                "_0" : {
+                  "rawValueEnum" : {
+                    "_0" : "Precision",
+                    "_1" : "Float"
+                  }
+                },
+                "_1" : "null"
+              }
+            }
+          },
+          {
+            "isReadonly" : true,
+            "isStatic" : false,
+            "name" : "optionalRatio",
+            "type" : {
+              "nullable" : {
+                "_0" : {
+                  "rawValueEnum" : {
+                    "_0" : "Ratio",
+                    "_1" : "Double"
+                  }
+                },
+                "_1" : "null"
+              }
+            }
+          }
+        ],
+        "swiftCallName" : "MeasurementConfig"
+      },
+      {
+        "constructor" : {
+          "abiName" : "bjs_MathOperations_init",
+          "effects" : {
+            "isAsync" : false,
+            "isStatic" : false,
+            "isThrows" : false
+          },
+          "parameters" : [
+            {
+              "defaultValue" : {
+                "double" : {
+                  "_0" : 0
+                }
+              },
+              "label" : "baseValue",
+              "name" : "baseValue",
+              "type" : {
+                "double" : {
+
+                }
+              }
+            }
+          ]
+        },
+        "methods" : [
+          {
+            "abiName" : "bjs_MathOperations_add",
+            "effects" : {
+              "isAsync" : false,
+              "isStatic" : false,
+              "isThrows" : false
+            },
+            "name" : "add",
+            "parameters" : [
+              {
+                "label" : "a",
+                "name" : "a",
+                "type" : {
+                  "double" : {
+
+                  }
+                }
+              },
+              {
+                "defaultValue" : {
+                  "double" : {
+                    "_0" : 10
+                  }
+                },
+                "label" : "b",
+                "name" : "b",
+                "type" : {
+                  "double" : {
+
+                  }
+                }
+              }
+            ],
+            "returnType" : {
+              "double" : {
+
+              }
+            }
+          },
+          {
+            "abiName" : "bjs_MathOperations_multiply",
+            "effects" : {
+              "isAsync" : false,
+              "isStatic" : false,
+              "isThrows" : false
+            },
+            "name" : "multiply",
+            "parameters" : [
+              {
+                "label" : "a",
+                "name" : "a",
+                "type" : {
+                  "double" : {
+
+                  }
+                }
+              },
+              {
+                "label" : "b",
+                "name" : "b",
+                "type" : {
+                  "double" : {
+
+                  }
+                }
+              }
+            ],
+            "returnType" : {
+              "double" : {
+
+              }
+            }
+          },
+          {
+            "abiName" : "bjs_MathOperations_static_subtract",
+            "effects" : {
+              "isAsync" : false,
+              "isStatic" : true,
+              "isThrows" : false
+            },
+            "name" : "subtract",
+            "parameters" : [
+              {
+                "label" : "a",
+                "name" : "a",
+                "type" : {
+                  "double" : {
+
+                  }
+                }
+              },
+              {
+                "defaultValue" : {
+                  "double" : {
+                    "_0" : 5
+                  }
+                },
+                "label" : "b",
+                "name" : "b",
+                "type" : {
+                  "double" : {
+
+                  }
+                }
+              }
+            ],
+            "returnType" : {
+              "double" : {
+
+              }
+            },
+            "staticContext" : {
+              "structName" : {
+                "_0" : "MathOperations"
+              }
+            }
+          }
+        ],
+        "name" : "MathOperations",
+        "properties" : [
+          {
+            "isReadonly" : true,
+            "isStatic" : false,
+            "name" : "baseValue",
+            "type" : {
+              "double" : {
+
+              }
+            }
+          }
+        ],
+        "swiftCallName" : "MathOperations"
+      },
+      {
+        "methods" : [
+          {
+            "abiName" : "bjs_CopyableCart_static_fromJSObject",
+            "effects" : {
+              "isAsync" : false,
+              "isStatic" : true,
+              "isThrows" : false
+            },
+            "name" : "fromJSObject",
+            "parameters" : [
+              {
+                "label" : "_",
+                "name" : "object",
+                "type" : {
+                  "jsObject" : {
+
+                  }
+                }
+              }
+            ],
+            "returnType" : {
+              "swiftStruct" : {
+                "_0" : "CopyableCart"
+              }
+            },
+            "staticContext" : {
+              "structName" : {
+                "_0" : "CopyableCart"
+              }
+            }
+          }
+        ],
+        "name" : "CopyableCart",
+        "properties" : [
+          {
+            "isReadonly" : true,
+            "isStatic" : false,
+            "name" : "x",
+            "type" : {
+              "integer" : {
+                "_0" : {
+                  "isSigned" : true,
+                  "width" : "word"
+                }
+              }
+            }
+          },
+          {
+            "isReadonly" : true,
+            "isStatic" : false,
+            "name" : "note",
+            "type" : {
+              "nullable" : {
+                "_0" : {
+                  "string" : {
+
+                  }
+                },
+                "_1" : "null"
+              }
+            }
+          }
+        ],
+        "swiftCallName" : "CopyableCart"
+      },
+      {
+        "methods" : [
+
+        ],
+        "name" : "CopyableCartItem",
+        "properties" : [
+          {
+            "isReadonly" : true,
+            "isStatic" : false,
+            "name" : "sku",
+            "type" : {
+              "string" : {
+
+              }
+            }
+          },
+          {
+            "isReadonly" : true,
+            "isStatic" : false,
+            "name" : "quantity",
+            "type" : {
+              "integer" : {
+                "_0" : {
+                  "isSigned" : true,
+                  "width" : "word"
+                }
+              }
+            }
+          }
+        ],
+        "swiftCallName" : "CopyableCartItem"
+      },
+      {
+        "methods" : [
+          {
+            "abiName" : "bjs_CopyableNestedCart_static_fromJSObject",
+            "effects" : {
+              "isAsync" : false,
+              "isStatic" : true,
+              "isThrows" : false
+            },
+            "name" : "fromJSObject",
+            "parameters" : [
+              {
+                "label" : "_",
+                "name" : "object",
+                "type" : {
+                  "jsObject" : {
+
+                  }
+                }
+              }
+            ],
+            "returnType" : {
+              "swiftStruct" : {
+                "_0" : "CopyableNestedCart"
+              }
+            },
+            "staticContext" : {
+              "structName" : {
+                "_0" : "CopyableNestedCart"
+              }
+            }
+          }
+        ],
+        "name" : "CopyableNestedCart",
+        "properties" : [
+          {
+            "isReadonly" : true,
+            "isStatic" : false,
+            "name" : "id",
+            "type" : {
+              "integer" : {
+                "_0" : {
+                  "isSigned" : true,
+                  "width" : "word"
+                }
+              }
+            }
+          },
+          {
+            "isReadonly" : true,
+            "isStatic" : false,
+            "name" : "item",
+            "type" : {
+              "swiftStruct" : {
+                "_0" : "CopyableCartItem"
+              }
+            }
+          },
+          {
+            "isReadonly" : true,
+            "isStatic" : false,
+            "name" : "shippingAddress",
+            "type" : {
+              "nullable" : {
+                "_0" : {
+                  "swiftStruct" : {
+                    "_0" : "Address"
+                  }
+                },
+                "_1" : "null"
+              }
+            }
+          }
+        ],
+        "swiftCallName" : "CopyableNestedCart"
+      },
+      {
+        "methods" : [
+
+        ],
+        "name" : "ConfigStruct",
+        "properties" : [
+          {
+            "isReadonly" : true,
+            "isStatic" : false,
+            "name" : "name",
+            "type" : {
+              "string" : {
+
+              }
+            }
+          },
+          {
+            "isReadonly" : true,
+            "isStatic" : false,
+            "name" : "value",
+            "type" : {
+              "integer" : {
+                "_0" : {
+                  "isSigned" : true,
+                  "width" : "word"
+                }
+              }
+            }
+          },
+          {
+            "isReadonly" : false,
+            "isStatic" : true,
+            "name" : "defaultConfig",
+            "staticContext" : {
+              "structName" : {
+                "_0" : "ConfigStruct"
+              }
+            },
+            "type" : {
+              "string" : {
+
+              }
+            }
+          },
+          {
+            "isReadonly" : true,
+            "isStatic" : true,
+            "name" : "maxRetries",
+            "staticContext" : {
+              "structName" : {
+                "_0" : "ConfigStruct"
+              }
+            },
+            "type" : {
+              "integer" : {
+                "_0" : {
+                  "isSigned" : true,
+                  "width" : "word"
+                }
+              }
+            }
+          },
+          {
+            "isReadonly" : false,
+            "isStatic" : true,
+            "name" : "timeout",
+            "staticContext" : {
+              "structName" : {
+                "_0" : "ConfigStruct"
+              }
+            },
+            "type" : {
+              "double" : {
+
+              }
+            }
+          },
+          {
+            "isReadonly" : true,
+            "isStatic" : true,
+            "name" : "computedSetting",
+            "staticContext" : {
+              "structName" : {
+                "_0" : "ConfigStruct"
+              }
+            },
+            "type" : {
+              "string" : {
+
+              }
+            }
+          }
+        ],
+        "swiftCallName" : "ConfigStruct"
+      },
+      {
+        "constructor" : {
+          "abiName" : "bjs_Vector2D_init",
+          "effects" : {
+            "isAsync" : false,
+            "isStatic" : false,
+            "isThrows" : false
+          },
+          "parameters" : [
+            {
+              "label" : "dx",
+              "name" : "dx",
+              "type" : {
+                "double" : {
+
+                }
+              }
+            },
+            {
+              "label" : "dy",
+              "name" : "dy",
+              "type" : {
+                "double" : {
+
+                }
+              }
+            }
+          ]
+        },
+        "methods" : [
+          {
+            "abiName" : "bjs_Vector2D_magnitude",
+            "effects" : {
+              "isAsync" : false,
+              "isStatic" : false,
+              "isThrows" : false
+            },
+            "name" : "magnitude",
+            "parameters" : [
+
+            ],
+            "returnType" : {
+              "double" : {
+
+              }
+            }
+          },
+          {
+            "abiName" : "bjs_Vector2D_scaled",
+            "effects" : {
+              "isAsync" : false,
+              "isStatic" : false,
+              "isThrows" : false
+            },
+            "name" : "scaled",
+            "parameters" : [
+              {
+                "label" : "by",
+                "name" : "factor",
+                "type" : {
+                  "double" : {
+
+                  }
+                }
+              }
+            ],
+            "returnType" : {
+              "swiftStruct" : {
+                "_0" : "Vector2D"
+              }
+            }
+          },
+          {
+            "abiName" : "bjs_Vector2D_describe",
+            "effects" : {
+              "isAsync" : false,
+              "isStatic" : false,
+              "isThrows" : false
+            },
+            "name" : "describe",
+            "parameters" : [
+
+            ],
+            "returnType" : {
+              "string" : {
+
+              }
+            }
+          }
+        ],
+        "name" : "Vector2D",
+        "properties" : [
+          {
+            "isReadonly" : true,
+            "isStatic" : false,
+            "name" : "dx",
+            "type" : {
+              "double" : {
+
+              }
+            }
+          },
+          {
+            "isReadonly" : true,
+            "isStatic" : false,
+            "name" : "dy",
+            "type" : {
+              "double" : {
+
+              }
+            }
+          }
+        ],
+        "swiftCallName" : "Vector2D"
+      },
+      {
+        "methods" : [
+
+        ],
+        "name" : "JSObjectContainer",
+        "properties" : [
+          {
+            "isReadonly" : true,
+            "isStatic" : false,
+            "name" : "object",
+            "type" : {
+              "jsObject" : {
+
+              }
+            }
+          },
+          {
+            "isReadonly" : true,
+            "isStatic" : false,
+            "name" : "optionalObject",
+            "type" : {
+              "nullable" : {
+                "_0" : {
+                  "jsObject" : {
+
+                  }
+                },
+                "_1" : "null"
+              }
+            }
+          }
+        ],
+        "swiftCallName" : "JSObjectContainer"
+      },
+      {
+        "methods" : [
+
+        ],
+        "name" : "FooContainer",
+        "properties" : [
+          {
+            "isReadonly" : true,
+            "isStatic" : false,
+            "name" : "foo",
+            "type" : {
+              "jsObject" : {
+                "_0" : "Foo"
+              }
+            }
+          },
+          {
+            "isReadonly" : true,
+            "isStatic" : false,
+            "name" : "optionalFoo",
+            "type" : {
+              "nullable" : {
+                "_0" : {
+                  "jsObject" : {
+                    "_0" : "Foo"
+                  }
+                },
+                "_1" : "null"
+              }
+            }
+          }
+        ],
+        "swiftCallName" : "FooContainer"
+      },
+      {
+        "methods" : [
+          {
+            "abiName" : "bjs_ArrayMembers_sumValues",
+            "effects" : {
+              "isAsync" : false,
+              "isStatic" : false,
+              "isThrows" : false
+            },
+            "name" : "sumValues",
+            "parameters" : [
+              {
+                "label" : "_",
+                "name" : "values",
+                "type" : {
+                  "array" : {
+                    "_0" : {
+                      "integer" : {
+                        "_0" : {
+                          "isSigned" : true,
+                          "width" : "word"
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            ],
+            "returnType" : {
+              "integer" : {
+                "_0" : {
+                  "isSigned" : true,
+                  "width" : "word"
+                }
+              }
+            }
+          },
+          {
+            "abiName" : "bjs_ArrayMembers_firstString",
+            "effects" : {
+              "isAsync" : false,
+              "isStatic" : false,
+              "isThrows" : false
+            },
+            "name" : "firstString",
+            "parameters" : [
+              {
+                "label" : "_",
+                "name" : "values",
+                "type" : {
+                  "array" : {
+                    "_0" : {
+                      "string" : {
+
+                      }
+                    }
+                  }
+                }
+              }
+            ],
+            "returnType" : {
+              "nullable" : {
+                "_0" : {
+                  "string" : {
+
+                  }
+                },
+                "_1" : "null"
+              }
+            }
+          }
+        ],
+        "name" : "ArrayMembers",
+        "properties" : [
+          {
+            "isReadonly" : true,
+            "isStatic" : false,
+            "name" : "ints",
+            "type" : {
+              "array" : {
+                "_0" : {
+                  "integer" : {
+                    "_0" : {
+                      "isSigned" : true,
+                      "width" : "word"
+                    }
+                  }
+                }
+              }
+            }
+          },
+          {
+            "isReadonly" : true,
+            "isStatic" : false,
+            "name" : "optStrings",
+            "type" : {
+              "nullable" : {
+                "_0" : {
+                  "array" : {
+                    "_0" : {
+                      "string" : {
+
+                      }
+                    }
+                  }
+                },
+                "_1" : "null"
+              }
+            }
+          }
+        ],
+        "swiftCallName" : "ArrayMembers"
+      }
+    ]
+  },
+  "imported" : {
+    "children" : [
+      {
+        "functions" : [
+
+        ],
+        "types" : [
+          {
+            "accessLevel" : "internal",
+            "constructor" : {
+              "accessLevel" : "internal",
+              "parameters" : [
+                {
+                  "name" : "label",
+                  "type" : {
+                    "string" : {
+
+                    }
+                  }
+                }
+              ]
+            },
+            "getters" : [
+              {
+                "accessLevel" : "internal",
+                "name" : "label",
+                "type" : {
+                  "string" : {
+
+                  }
+                }
+              }
+            ],
+            "methods" : [
+
+            ],
+            "name" : "Surface",
+            "setters" : [
+
+            ],
+            "staticMethods" : [
+
+            ]
+          },
+          {
+            "accessLevel" : "internal",
+            "getters" : [
+
+            ],
+            "methods" : [
+
+            ],
+            "name" : "AliasImports",
+            "setters" : [
+
+            ],
+            "staticMethods" : [
+              {
+                "accessLevel" : "internal",
+                "effects" : {
+                  "isAsync" : false,
+                  "isStatic" : false,
+                  "isThrows" : true
+                },
+                "name" : "jsRoundTripTagged",
+                "parameters" : [
+                  {
+                    "name" : "value",
+                    "type" : {
+                      "alias" : {
+                        "name" : "Tagged",
+                        "underlying" : {
+                          "string" : {
+
+                          }
+                        }
+                      }
+                    }
+                  }
+                ],
+                "returnType" : {
+                  "alias" : {
+                    "name" : "Tagged",
+                    "underlying" : {
+                      "string" : {
+
+                      }
+                    }
+                  }
+                }
+              },
+              {
+                "accessLevel" : "internal",
+                "effects" : {
+                  "isAsync" : false,
+                  "isStatic" : false,
+                  "isThrows" : true
+                },
+                "name" : "jsRoundTripOptionalTagged",
+                "parameters" : [
+                  {
+                    "name" : "value",
+                    "type" : {
+                      "nullable" : {
+                        "_0" : {
+                          "alias" : {
+                            "name" : "Tagged",
+                            "underlying" : {
+                              "string" : {
+
+                              }
+                            }
+                          }
+                        },
+                        "_1" : "null"
+                      }
+                    }
+                  }
+                ],
+                "returnType" : {
+                  "nullable" : {
+                    "_0" : {
+                      "alias" : {
+                        "name" : "Tagged",
+                        "underlying" : {
+                          "string" : {
+
+                          }
+                        }
+                      }
+                    },
+                    "_1" : "null"
+                  }
+                }
+              },
+              {
+                "accessLevel" : "internal",
+                "effects" : {
+                  "isAsync" : false,
+                  "isStatic" : false,
+                  "isThrows" : true
+                },
+                "name" : "jsProduceOptionalCanvas",
+                "parameters" : [
+                  {
+                    "name" : "label",
+                    "type" : {
+                      "nullable" : {
+                        "_0" : {
+                          "string" : {
+
+                          }
+                        },
+                        "_1" : "null"
+                      }
+                    }
+                  }
+                ],
+                "returnType" : {
+                  "nullable" : {
+                    "_0" : {
+                      "alias" : {
+                        "name" : "Canvas",
+                        "underlying" : {
+                          "jsObject" : {
+                            "_0" : "Surface"
+                          }
+                        }
+                      }
+                    },
+                    "_1" : "null"
+                  }
+                }
+              },
+              {
+                "accessLevel" : "internal",
+                "effects" : {
+                  "isAsync" : false,
+                  "isStatic" : false,
+                  "isThrows" : true
+                },
+                "name" : "jsRoundTripAliasedTags",
+                "parameters" : [
+                  {
+                    "name" : "values",
+                    "type" : {
+                      "array" : {
+                        "_0" : {
+                          "nullable" : {
+                            "_0" : {
+                              "alias" : {
+                                "name" : "AliasedTag",
+                                "underlying" : {
+                                  "associatedValueEnum" : {
+                                    "_0" : "InnerTag"
+                                  }
+                                }
+                              }
+                            },
+                            "_1" : "null"
+                          }
+                        }
+                      }
+                    }
+                  }
+                ],
+                "returnType" : {
+                  "array" : {
+                    "_0" : {
+                      "nullable" : {
+                        "_0" : {
+                          "alias" : {
+                            "name" : "AliasedTag",
+                            "underlying" : {
+                              "associatedValueEnum" : {
+                                "_0" : "InnerTag"
+                              }
+                            }
+                          }
+                        },
+                        "_1" : "null"
+                      }
+                    }
+                  }
+                }
+              },
+              {
+                "accessLevel" : "internal",
+                "effects" : {
+                  "isAsync" : false,
+                  "isStatic" : false,
+                  "isThrows" : true
+                },
+                "name" : "jsRoundTripPolygon",
+                "parameters" : [
+                  {
+                    "name" : "value",
+                    "type" : {
+                      "alias" : {
+                        "name" : "Polygon",
+                        "underlying" : {
+                          "swiftHeapObject" : {
+                            "_0" : "PolygonReference"
+                          }
+                        }
+                      }
+                    }
+                  }
+                ],
+                "returnType" : {
+                  "alias" : {
+                    "name" : "Polygon",
+                    "underlying" : {
+                      "swiftHeapObject" : {
+                        "_0" : "PolygonReference"
+                      }
+                    }
+                  }
+                }
+              },
+              {
+                "accessLevel" : "internal",
+                "effects" : {
+                  "isAsync" : false,
+                  "isStatic" : false,
+                  "isThrows" : true
+                },
+                "name" : "jsRoundTripCoordinate",
+                "parameters" : [
+                  {
+                    "name" : "value",
+                    "type" : {
+                      "alias" : {
+                        "name" : "Coordinate",
+                        "underlying" : {
+                          "swiftStruct" : {
+                            "_0" : "JSCoordinate"
+                          }
+                        }
+                      }
+                    }
+                  }
+                ],
+                "returnType" : {
+                  "alias" : {
+                    "name" : "Coordinate",
+                    "underlying" : {
+                      "swiftStruct" : {
+                        "_0" : "JSCoordinate"
+                      }
+                    }
+                  }
+                }
+              },
+              {
+                "accessLevel" : "internal",
+                "effects" : {
+                  "isAsync" : false,
+                  "isStatic" : false,
+                  "isThrows" : true
+                },
+                "name" : "jsRoundTripUserId",
+                "parameters" : [
+                  {
+                    "name" : "value",
+                    "type" : {
+                      "alias" : {
+                        "name" : "UserId",
+                        "underlying" : {
+                          "integer" : {
+                            "_0" : {
+                              "isSigned" : true,
+                              "width" : "word"
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                ],
+                "returnType" : {
+                  "alias" : {
+                    "name" : "UserId",
+                    "underlying" : {
+                      "integer" : {
+                        "_0" : {
+                          "isSigned" : true,
+                          "width" : "word"
+                        }
+                      }
+                    }
+                  }
+                }
+              },
+              {
+                "accessLevel" : "internal",
+                "effects" : {
+                  "isAsync" : false,
+                  "isStatic" : false,
+                  "isThrows" : true
+                },
+                "name" : "jsRoundTripOptionalUserId",
+                "parameters" : [
+                  {
+                    "name" : "value",
+                    "type" : {
+                      "nullable" : {
+                        "_0" : {
+                          "alias" : {
+                            "name" : "UserId",
+                            "underlying" : {
+                              "integer" : {
+                                "_0" : {
+                                  "isSigned" : true,
+                                  "width" : "word"
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "_1" : "null"
+                      }
+                    }
+                  }
+                ],
+                "returnType" : {
+                  "nullable" : {
+                    "_0" : {
+                      "alias" : {
+                        "name" : "UserId",
+                        "underlying" : {
+                          "integer" : {
+                            "_0" : {
+                              "isSigned" : true,
+                              "width" : "word"
+                            }
+                          }
+                        }
+                      }
+                    },
+                    "_1" : "null"
+                  }
+                }
+              }
+            ]
+          }
+        ]
+      },
+      {
+        "functions" : [
+
+        ],
+        "types" : [
+          {
+            "accessLevel" : "internal",
+            "constructor" : {
+              "accessLevel" : "internal",
+              "parameters" : [
+                {
+                  "name" : "id",
+                  "type" : {
+                    "string" : {
+
+                    }
+                  }
+                }
+              ]
+            },
+            "getters" : [
+              {
+                "accessLevel" : "internal",
+                "name" : "id",
+                "type" : {
+                  "string" : {
+
+                  }
+                }
+              }
+            ],
+            "methods" : [
+
+            ],
+            "name" : "ArrayElementObject",
+            "setters" : [
+
+            ],
+            "staticMethods" : [
+
+            ]
+          },
+          {
+            "accessLevel" : "internal",
+            "getters" : [
+
+            ],
+            "methods" : [
+
+            ],
+            "name" : "ArraySupportImports",
+            "setters" : [
+
+            ],
+            "staticMethods" : [
+              {
+                "accessLevel" : "internal",
+                "effects" : {
+                  "isAsync" : false,
+                  "isStatic" : false,
+                  "isThrows" : true
+                },
+                "name" : "jsIntArrayLength",
+                "parameters" : [
+                  {
+                    "name" : "items",
+                    "type" : {
+                      "array" : {
+                        "_0" : {
+                          "integer" : {
+                            "_0" : {
+                              "isSigned" : true,
+                              "width" : "word"
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                ],
+                "returnType" : {
+                  "integer" : {
+                    "_0" : {
+                      "isSigned" : true,
+                      "width" : "word"
+                    }
+                  }
+                }
+              },
+              {
+                "accessLevel" : "internal",
+                "effects" : {
+                  "isAsync" : false,
+                  "isStatic" : false,
+                  "isThrows" : true
+                },
+                "name" : "jsRoundTripIntArray",
+                "parameters" : [
+                  {
+                    "name" : "items",
+                    "type" : {
+                      "array" : {
+                        "_0" : {
+                          "integer" : {
+                            "_0" : {
+                              "isSigned" : true,
+                              "width" : "word"
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                ],
+                "returnType" : {
+                  "array" : {
+                    "_0" : {
+                      "integer" : {
+                        "_0" : {
+                          "isSigned" : true,
+                          "width" : "word"
+                        }
+                      }
+                    }
+                  }
+                }
+              },
+              {
+                "accessLevel" : "internal",
+                "effects" : {
+                  "isAsync" : false,
+                  "isStatic" : false,
+                  "isThrows" : true
+                },
+                "name" : "jsRoundTripNumberArray",
+                "parameters" : [
+                  {
+                    "name" : "values",
+                    "type" : {
+                      "array" : {
+                        "_0" : {
+                          "double" : {
+
+                          }
+                        }
+                      }
+                    }
+                  }
+                ],
+                "returnType" : {
+                  "array" : {
+                    "_0" : {
+                      "double" : {
+
+                      }
+                    }
+                  }
+                }
+              },
+              {
+                "accessLevel" : "internal",
+                "effects" : {
+                  "isAsync" : false,
+                  "isStatic" : false,
+                  "isThrows" : true
+                },
+                "name" : "jsRoundTripStringArray",
+                "parameters" : [
+                  {
+                    "name" : "values",
+                    "type" : {
+                      "array" : {
+                        "_0" : {
+                          "string" : {
+
+                          }
+                        }
+                      }
+                    }
+                  }
+                ],
+                "returnType" : {
+                  "array" : {
+                    "_0" : {
+                      "string" : {
+
+                      }
+                    }
+                  }
+                }
+              },
+              {
+                "accessLevel" : "internal",
+                "effects" : {
+                  "isAsync" : false,
+                  "isStatic" : false,
+                  "isThrows" : true
+                },
+                "name" : "jsRoundTripBoolArray",
+                "parameters" : [
+                  {
+                    "name" : "values",
+                    "type" : {
+                      "array" : {
+                        "_0" : {
+                          "bool" : {
+
+                          }
+                        }
+                      }
+                    }
+                  }
+                ],
+                "returnType" : {
+                  "array" : {
+                    "_0" : {
+                      "bool" : {
+
+                      }
+                    }
+                  }
+                }
+              },
+              {
+                "accessLevel" : "internal",
+                "effects" : {
+                  "isAsync" : false,
+                  "isStatic" : false,
+                  "isThrows" : true
+                },
+                "name" : "jsRoundTripJSValueArray",
+                "parameters" : [
+                  {
+                    "name" : "v",
+                    "type" : {
+                      "array" : {
+                        "_0" : {
+                          "jsValue" : {
+
+                          }
+                        }
+                      }
+                    }
+                  }
+                ],
+                "returnType" : {
+                  "array" : {
+                    "_0" : {
+                      "jsValue" : {
+
+                      }
+                    }
+                  }
+                }
+              },
+              {
+                "accessLevel" : "internal",
+                "effects" : {
+                  "isAsync" : false,
+                  "isStatic" : false,
+                  "isThrows" : true
+                },
+                "name" : "jsRoundTripJSObjectArray",
+                "parameters" : [
+                  {
+                    "name" : "values",
+                    "type" : {
+                      "array" : {
+                        "_0" : {
+                          "jsObject" : {
+
+                          }
+                        }
+                      }
+                    }
+                  }
+                ],
+                "returnType" : {
+                  "array" : {
+                    "_0" : {
+                      "jsObject" : {
+
+                      }
+                    }
+                  }
+                }
+              },
+              {
+                "accessLevel" : "internal",
+                "effects" : {
+                  "isAsync" : false,
+                  "isStatic" : false,
+                  "isThrows" : true
+                },
+                "name" : "jsRoundTripJSClassArray",
+                "parameters" : [
+                  {
+                    "name" : "values",
+                    "type" : {
+                      "array" : {
+                        "_0" : {
+                          "jsObject" : {
+                            "_0" : "ArrayElementObject"
+                          }
+                        }
+                      }
+                    }
+                  }
+                ],
+                "returnType" : {
+                  "array" : {
+                    "_0" : {
+                      "jsObject" : {
+                        "_0" : "ArrayElementObject"
+                      }
+                    }
+                  }
+                }
+              },
+              {
+                "accessLevel" : "internal",
+                "effects" : {
+                  "isAsync" : false,
+                  "isStatic" : false,
+                  "isThrows" : true
+                },
+                "name" : "jsRoundTripOptionalIntArray",
+                "parameters" : [
+                  {
+                    "name" : "values",
+                    "type" : {
+                      "array" : {
+                        "_0" : {
+                          "nullable" : {
+                            "_0" : {
+                              "integer" : {
+                                "_0" : {
+                                  "isSigned" : true,
+                                  "width" : "word"
+                                }
+                              }
+                            },
+                            "_1" : "null"
+                          }
+                        }
+                      }
+                    }
+                  }
+                ],
+                "returnType" : {
+                  "array" : {
+                    "_0" : {
+                      "nullable" : {
+                        "_0" : {
+                          "integer" : {
+                            "_0" : {
+                              "isSigned" : true,
+                              "width" : "word"
+                            }
+                          }
+                        },
+                        "_1" : "null"
+                      }
+                    }
+                  }
+                }
+              },
+              {
+                "accessLevel" : "internal",
+                "effects" : {
+                  "isAsync" : false,
+                  "isStatic" : false,
+                  "isThrows" : true
+                },
+                "name" : "jsRoundTripOptionalStringArray",
+                "parameters" : [
+                  {
+                    "name" : "values",
+                    "type" : {
+                      "array" : {
+                        "_0" : {
+                          "nullable" : {
+                            "_0" : {
+                              "string" : {
+
+                              }
+                            },
+                            "_1" : "null"
+                          }
+                        }
+                      }
+                    }
+                  }
+                ],
+                "returnType" : {
+                  "array" : {
+                    "_0" : {
+                      "nullable" : {
+                        "_0" : {
+                          "string" : {
+
+                          }
+                        },
+                        "_1" : "null"
+                      }
+                    }
+                  }
+                }
+              },
+              {
+                "accessLevel" : "internal",
+                "effects" : {
+                  "isAsync" : false,
+                  "isStatic" : false,
+                  "isThrows" : true
+                },
+                "name" : "jsRoundTripOptionalBoolArray",
+                "parameters" : [
+                  {
+                    "name" : "values",
+                    "type" : {
+                      "array" : {
+                        "_0" : {
+                          "nullable" : {
+                            "_0" : {
+                              "bool" : {
+
+                              }
+                            },
+                            "_1" : "null"
+                          }
+                        }
+                      }
+                    }
+                  }
+                ],
+                "returnType" : {
+                  "array" : {
+                    "_0" : {
+                      "nullable" : {
+                        "_0" : {
+                          "bool" : {
+
+                          }
+                        },
+                        "_1" : "null"
+                      }
+                    }
+                  }
+                }
+              },
+              {
+                "accessLevel" : "internal",
+                "effects" : {
+                  "isAsync" : false,
+                  "isStatic" : false,
+                  "isThrows" : true
+                },
+                "name" : "jsRoundTripOptionalJSValueArray",
+                "parameters" : [
+                  {
+                    "name" : "values",
+                    "type" : {
+                      "array" : {
+                        "_0" : {
+                          "nullable" : {
+                            "_0" : {
+                              "jsValue" : {
+
+                              }
+                            },
+                            "_1" : "null"
+                          }
+                        }
+                      }
+                    }
+                  }
+                ],
+                "returnType" : {
+                  "array" : {
+                    "_0" : {
+                      "nullable" : {
+                        "_0" : {
+                          "jsValue" : {
+
+                          }
+                        },
+                        "_1" : "null"
+                      }
+                    }
+                  }
+                }
+              },
+              {
+                "accessLevel" : "internal",
+                "effects" : {
+                  "isAsync" : false,
+                  "isStatic" : false,
+                  "isThrows" : true
+                },
+                "name" : "jsRoundTripOptionalJSObjectArray",
+                "parameters" : [
+                  {
+                    "name" : "values",
+                    "type" : {
+                      "array" : {
+                        "_0" : {
+                          "nullable" : {
+                            "_0" : {
+                              "jsObject" : {
+
+                              }
+                            },
+                            "_1" : "null"
+                          }
+                        }
+                      }
+                    }
+                  }
+                ],
+                "returnType" : {
+                  "array" : {
+                    "_0" : {
+                      "nullable" : {
+                        "_0" : {
+                          "jsObject" : {
+
+                          }
+                        },
+                        "_1" : "null"
+                      }
+                    }
+                  }
+                }
+              },
+              {
+                "accessLevel" : "internal",
+                "effects" : {
+                  "isAsync" : false,
+                  "isStatic" : false,
+                  "isThrows" : true
+                },
+                "name" : "jsRoundTripOptionalJSClassArray",
+                "parameters" : [
+                  {
+                    "name" : "values",
+                    "type" : {
+                      "array" : {
+                        "_0" : {
+                          "nullable" : {
+                            "_0" : {
+                              "jsObject" : {
+                                "_0" : "ArrayElementObject"
+                              }
+                            },
+                            "_1" : "null"
+                          }
+                        }
+                      }
+                    }
+                  }
+                ],
+                "returnType" : {
+                  "array" : {
+                    "_0" : {
+                      "nullable" : {
+                        "_0" : {
+                          "jsObject" : {
+                            "_0" : "ArrayElementObject"
+                          }
+                        },
+                        "_1" : "null"
+                      }
+                    }
+                  }
+                }
+              },
+              {
+                "accessLevel" : "internal",
+                "effects" : {
+                  "isAsync" : false,
+                  "isStatic" : false,
+                  "isThrows" : true
+                },
+                "name" : "jsSumNumberArray",
+                "parameters" : [
+                  {
+                    "name" : "values",
+                    "type" : {
+                      "array" : {
+                        "_0" : {
+                          "double" : {
+
+                          }
+                        }
+                      }
+                    }
+                  }
+                ],
+                "returnType" : {
+                  "double" : {
+
+                  }
+                }
+              },
+              {
+                "accessLevel" : "internal",
+                "effects" : {
+                  "isAsync" : false,
+                  "isStatic" : false,
+                  "isThrows" : true
+                },
+                "name" : "jsCreateNumberArray",
+                "parameters" : [
+
+                ],
+                "returnType" : {
+                  "array" : {
+                    "_0" : {
+                      "double" : {
+
+                      }
+                    }
+                  }
+                }
+              },
+              {
+                "accessLevel" : "internal",
+                "effects" : {
+                  "isAsync" : false,
+                  "isStatic" : false,
+                  "isThrows" : true
+                },
+                "name" : "runJsArraySupportTests",
+                "parameters" : [
+
+                ],
+                "returnType" : {
+                  "void" : {
+
+                  }
+                }
+              }
+            ]
+          }
+        ]
+      },
+      {
+        "functions" : [
+
+        ],
+        "types" : [
+          {
+            "accessLevel" : "internal",
+            "getters" : [
+
+            ],
+            "methods" : [
+
+            ],
+            "name" : "AsyncImportImports",
+            "setters" : [
+
+            ],
+            "staticMethods" : [
+              {
+                "accessLevel" : "internal",
+                "effects" : {
+                  "isAsync" : true,
+                  "isStatic" : false,
+                  "isThrows" : true
+                },
+                "name" : "jsAsyncRoundTripVoid",
+                "parameters" : [
+
+                ],
+                "returnType" : {
+                  "void" : {
+
+                  }
+                }
+              },
+              {
+                "accessLevel" : "internal",
+                "effects" : {
+                  "isAsync" : true,
+                  "isStatic" : false,
+                  "isThrows" : true
+                },
+                "name" : "jsAsyncRoundTripNumber",
+                "parameters" : [
+                  {
+                    "name" : "v",
+                    "type" : {
+                      "double" : {
+
+                      }
+                    }
+                  }
+                ],
+                "returnType" : {
+                  "double" : {
+
+                  }
+                }
+              },
+              {
+                "accessLevel" : "internal",
+                "effects" : {
+                  "isAsync" : true,
+                  "isStatic" : false,
+                  "isThrows" : true
+                },
+                "name" : "jsAsyncRoundTripBool",
+                "parameters" : [
+                  {
+                    "name" : "v",
+                    "type" : {
+                      "bool" : {
+
+                      }
+                    }
+                  }
+                ],
+                "returnType" : {
+                  "bool" : {
+
+                  }
+                }
+              },
+              {
+                "accessLevel" : "internal",
+                "effects" : {
+                  "isAsync" : true,
+                  "isStatic" : false,
+                  "isThrows" : true
+                },
+                "name" : "jsAsyncRoundTripString",
+                "parameters" : [
+                  {
+                    "name" : "v",
+                    "type" : {
+                      "string" : {
+
+                      }
+                    }
+                  }
+                ],
+                "returnType" : {
+                  "string" : {
+
                   }
                 }
               },
               {
                 "accessLevel" : "internal",
                 "effects" : {
-                  "isAsync" : false,
+                  "isAsync" : true,
                   "isStatic" : false,
                   "isThrows" : true
                 },
-                "name" : "jsRoundTripStringArray",
+                "name" : "jsAsyncRoundTripOptionalString",
+                "parameters" : [
+                  {
+                    "name" : "v",
+                    "type" : {
+                      "nullable" : {
+                        "_0" : {
+                          "string" : {
+
+                          }
+                        },
+                        "_1" : "null"
+                      }
+                    }
+                  }
+                ],
+                "returnType" : {
+                  "nullable" : {
+                    "_0" : {
+                      "string" : {
+
+                      }
+                    },
+                    "_1" : "null"
+                  }
+                }
+              },
+              {
+                "accessLevel" : "internal",
+                "effects" : {
+                  "isAsync" : true,
+                  "isStatic" : false,
+                  "isThrows" : true
+                },
+                "name" : "jsAsyncRoundTripOptionalNumber",
+                "parameters" : [
+                  {
+                    "name" : "v",
+                    "type" : {
+                      "nullable" : {
+                        "_0" : {
+                          "double" : {
+
+                          }
+                        },
+                        "_1" : "null"
+                      }
+                    }
+                  }
+                ],
+                "returnType" : {
+                  "nullable" : {
+                    "_0" : {
+                      "double" : {
+
+                      }
+                    },
+                    "_1" : "null"
+                  }
+                }
+              },
+              {
+                "accessLevel" : "internal",
+                "effects" : {
+                  "isAsync" : true,
+                  "isStatic" : false,
+                  "isThrows" : true
+                },
+                "name" : "jsAsyncRoundTripBoolArray",
+                "parameters" : [
+                  {
+                    "name" : "values",
+                    "type" : {
+                      "array" : {
+                        "_0" : {
+                          "bool" : {
+
+                          }
+                        }
+                      }
+                    }
+                  }
+                ],
+                "returnType" : {
+                  "array" : {
+                    "_0" : {
+                      "bool" : {
+
+                      }
+                    }
+                  }
+                }
+              },
+              {
+                "accessLevel" : "internal",
+                "effects" : {
+                  "isAsync" : true,
+                  "isStatic" : false,
+                  "isThrows" : true
+                },
+                "name" : "jsAsyncRoundTripIntArray",
+                "parameters" : [
+                  {
+                    "name" : "values",
+                    "type" : {
+                      "array" : {
+                        "_0" : {
+                          "double" : {
+
+                          }
+                        }
+                      }
+                    }
+                  }
+                ],
+                "returnType" : {
+                  "array" : {
+                    "_0" : {
+                      "double" : {
+
+                      }
+                    }
+                  }
+                }
+              },
+              {
+                "accessLevel" : "internal",
+                "effects" : {
+                  "isAsync" : true,
+                  "isStatic" : false,
+                  "isThrows" : true
+                },
+                "name" : "jsAsyncRoundTripStringArray",
                 "parameters" : [
                   {
                     "name" : "values",
@@ -17002,43 +22100,156 @@
                     "_0" : {
                       "string" : {
 
-                      }
-                    }
-                  }
-                }
-              },
+                      }
+                    }
+                  }
+                }
+              },
+              {
+                "accessLevel" : "internal",
+                "effects" : {
+                  "isAsync" : true,
+                  "isStatic" : false,
+                  "isThrows" : true
+                },
+                "name" : "jsAsyncRoundTripFeatureFlag",
+                "parameters" : [
+                  {
+                    "name" : "v",
+                    "type" : {
+                      "rawValueEnum" : {
+                        "_0" : "FeatureFlag",
+                        "_1" : "String"
+                      }
+                    }
+                  }
+                ],
+                "returnType" : {
+                  "rawValueEnum" : {
+                    "_0" : "FeatureFlag",
+                    "_1" : "String"
+                  }
+                }
+              },
+              {
+                "accessLevel" : "internal",
+                "effects" : {
+                  "isAsync" : true,
+                  "isStatic" : false,
+                  "isThrows" : true
+                },
+                "name" : "jsAsyncRoundTripAssociatedValueEnum",
+                "parameters" : [
+                  {
+                    "name" : "v",
+                    "type" : {
+                      "associatedValueEnum" : {
+                        "_0" : "AsyncImportedPayloadResult"
+                      }
+                    }
+                  }
+                ],
+                "returnType" : {
+                  "associatedValueEnum" : {
+                    "_0" : "AsyncImportedPayloadResult"
+                  }
+                }
+              },
+              {
+                "accessLevel" : "internal",
+                "effects" : {
+                  "isAsync" : true,
+                  "isStatic" : false,
+                  "isThrows" : true
+                },
+                "name" : "jsAsyncRoundTripOptionalAssociatedValueEnum",
+                "parameters" : [
+                  {
+                    "name" : "v",
+                    "type" : {
+                      "nullable" : {
+                        "_0" : {
+                          "associatedValueEnum" : {
+                            "_0" : "AsyncImportedPayloadResult"
+                          }
+                        },
+                        "_1" : "null"
+                      }
+                    }
+                  }
+                ],
+                "returnType" : {
+                  "nullable" : {
+                    "_0" : {
+                      "associatedValueEnum" : {
+                        "_0" : "AsyncImportedPayloadResult"
+                      }
+                    },
+                    "_1" : "null"
+                  }
+                }
+              }
+            ]
+          }
+        ]
+      },
+      {
+        "functions" : [
+
+        ],
+        "types" : [
+          {
+            "accessLevel" : "internal",
+            "getters" : [
+
+            ],
+            "methods" : [
+
+            ],
+            "name" : "ClosureAsyncImports",
+            "setters" : [
+
+            ],
+            "staticMethods" : [
               {
                 "accessLevel" : "internal",
                 "effects" : {
-                  "isAsync" : false,
+                  "isAsync" : true,
                   "isStatic" : false,
                   "isThrows" : true
                 },
-                "name" : "jsRoundTripBoolArray",
+                "name" : "runJsClosureAsyncTests",
                 "parameters" : [
-                  {
-                    "name" : "values",
-                    "type" : {
-                      "array" : {
-                        "_0" : {
-                          "bool" : {
 
-                          }
-                        }
-                      }
-                    }
-                  }
                 ],
                 "returnType" : {
-                  "array" : {
-                    "_0" : {
-                      "bool" : {
+                  "void" : {
 
-                      }
-                    }
                   }
                 }
-              },
+              }
+            ]
+          }
+        ]
+      },
+      {
+        "functions" : [
+
+        ],
+        "types" : [
+          {
+            "accessLevel" : "internal",
+            "getters" : [
+
+            ],
+            "methods" : [
+
+            ],
+            "name" : "ClosureSupportImports",
+            "setters" : [
+
+            ],
+            "staticMethods" : [
               {
                 "accessLevel" : "internal",
                 "effects" : {
@@ -17046,28 +22257,35 @@
                   "isStatic" : false,
                   "isThrows" : true
                 },
-                "name" : "jsRoundTripJSValueArray",
+                "name" : "jsApplyVoid",
                 "parameters" : [
                   {
-                    "name" : "v",
+                    "name" : "callback",
                     "type" : {
-                      "array" : {
+                      "closure" : {
                         "_0" : {
-                          "jsValue" : {
+                          "isAsync" : false,
+                          "isThrows" : false,
+                          "mangleName" : "20BridgeJSRuntimeTestsy_y",
+                          "moduleName" : "BridgeJSRuntimeTests",
+                          "parameters" : [
 
-                          }
-                        }
+                          ],
+                          "returnType" : {
+                            "void" : {
+
+                            }
+                          },
+                          "sendingParameters" : false
+                        },
+                        "useJSTypedClosure" : true
                       }
                     }
                   }
                 ],
                 "returnType" : {
-                  "array" : {
-                    "_0" : {
-                      "jsValue" : {
+                  "void" : {
 
-                      }
-                    }
                   }
                 }
               },
@@ -17078,28 +22296,35 @@
                   "isStatic" : false,
                   "isThrows" : true
                 },
-                "name" : "jsRoundTripJSObjectArray",
+                "name" : "jsApplyBool",
                 "parameters" : [
                   {
-                    "name" : "values",
+                    "name" : "callback",
                     "type" : {
-                      "array" : {
+                      "closure" : {
                         "_0" : {
-                          "jsObject" : {
+                          "isAsync" : false,
+                          "isThrows" : false,
+                          "mangleName" : "20BridgeJSRuntimeTestsy_Sb",
+                          "moduleName" : "BridgeJSRuntimeTests",
+                          "parameters" : [
 
-                          }
-                        }
+                          ],
+                          "returnType" : {
+                            "bool" : {
+
+                            }
+                          },
+                          "sendingParameters" : false
+                        },
+                        "useJSTypedClosure" : true
                       }
                     }
                   }
                 ],
                 "returnType" : {
-                  "array" : {
-                    "_0" : {
-                      "jsObject" : {
+                  "bool" : {
 
-                      }
-                    }
                   }
                 }
               },
@@ -17110,75 +22335,58 @@
                   "isStatic" : false,
                   "isThrows" : true
                 },
-                "name" : "jsRoundTripJSClassArray",
+                "name" : "jsApplyInt",
                 "parameters" : [
                   {
-                    "name" : "values",
+                    "name" : "value",
                     "type" : {
-                      "array" : {
+                      "integer" : {
                         "_0" : {
-                          "jsObject" : {
-                            "_0" : "ArrayElementObject"
-                          }
+                          "isSigned" : true,
+                          "width" : "word"
                         }
                       }
                     }
-                  }
-                ],
-                "returnType" : {
-                  "array" : {
-                    "_0" : {
-                      "jsObject" : {
-                        "_0" : "ArrayElementObject"
-                      }
-                    }
-                  }
-                }
-              },
-              {
-                "accessLevel" : "internal",
-                "effects" : {
-                  "isAsync" : false,
-                  "isStatic" : false,
-                  "isThrows" : true
-                },
-                "name" : "jsRoundTripOptionalIntArray",
-                "parameters" : [
+                  },
                   {
-                    "name" : "values",
+                    "name" : "transform",
                     "type" : {
-                      "array" : {
+                      "closure" : {
                         "_0" : {
-                          "nullable" : {
-                            "_0" : {
+                          "isAsync" : false,
+                          "isThrows" : false,
+                          "mangleName" : "20BridgeJSRuntimeTestsSi_Si",
+                          "moduleName" : "BridgeJSRuntimeTests",
+                          "parameters" : [
+                            {
                               "integer" : {
                                 "_0" : {
                                   "isSigned" : true,
                                   "width" : "word"
                                 }
                               }
-                            },
-                            "_1" : "null"
-                          }
-                        }
+                            }
+                          ],
+                          "returnType" : {
+                            "integer" : {
+                              "_0" : {
+                                "isSigned" : true,
+                                "width" : "word"
+                              }
+                            }
+                          },
+                          "sendingParameters" : false
+                        },
+                        "useJSTypedClosure" : true
                       }
                     }
                   }
                 ],
                 "returnType" : {
-                  "array" : {
+                  "integer" : {
                     "_0" : {
-                      "nullable" : {
-                        "_0" : {
-                          "integer" : {
-                            "_0" : {
-                              "isSigned" : true,
-                              "width" : "word"
-                            }
-                          }
-                        },
-                        "_1" : "null"
-                      }
+                      "isSigned" : true,
+                      "width" : "word"
                     }
                   }
                 }
@@ -17190,80 +22398,47 @@
                   "isStatic" : false,
                   "isThrows" : true
                 },
-                "name" : "jsRoundTripOptionalStringArray",
+                "name" : "jsApplyDouble",
                 "parameters" : [
                   {
-                    "name" : "values",
+                    "name" : "value",
                     "type" : {
-                      "array" : {
-                        "_0" : {
-                          "nullable" : {
-                            "_0" : {
-                              "string" : {
-
-                              }
-                            },
-                            "_1" : "null"
-                          }
-                        }
-                      }
-                    }
-                  }
-                ],
-                "returnType" : {
-                  "array" : {
-                    "_0" : {
-                      "nullable" : {
-                        "_0" : {
-                          "string" : {
+                      "double" : {
 
-                          }
-                        },
-                        "_1" : "null"
                       }
                     }
-                  }
-                }
-              },
-              {
-                "accessLevel" : "internal",
-                "effects" : {
-                  "isAsync" : false,
-                  "isStatic" : false,
-                  "isThrows" : true
-                },
-                "name" : "jsRoundTripOptionalBoolArray",
-                "parameters" : [
+                  },
                   {
-                    "name" : "values",
+                    "name" : "transform",
                     "type" : {
-                      "array" : {
+                      "closure" : {
                         "_0" : {
-                          "nullable" : {
-                            "_0" : {
-                              "bool" : {
+                          "isAsync" : false,
+                          "isThrows" : false,
+                          "mangleName" : "20BridgeJSRuntimeTestsSd_Sd",
+                          "moduleName" : "BridgeJSRuntimeTests",
+                          "parameters" : [
+                            {
+                              "double" : {
 
                               }
-                            },
-                            "_1" : "null"
-                          }
-                        }
+                            }
+                          ],
+                          "returnType" : {
+                            "double" : {
+
+                            }
+                          },
+                          "sendingParameters" : false
+                        },
+                        "useJSTypedClosure" : true
                       }
                     }
                   }
                 ],
                 "returnType" : {
-                  "array" : {
-                    "_0" : {
-                      "nullable" : {
-                        "_0" : {
-                          "bool" : {
+                  "double" : {
 
-                          }
-                        },
-                        "_1" : "null"
-                      }
-                    }
                   }
                 }
               },
@@ -17274,38 +22449,47 @@
                   "isStatic" : false,
                   "isThrows" : true
                 },
-                "name" : "jsRoundTripOptionalJSValueArray",
+                "name" : "jsApplyString",
                 "parameters" : [
                   {
-                    "name" : "values",
+                    "name" : "value",
                     "type" : {
-                      "array" : {
+                      "string" : {
+
+                      }
+                    }
+                  },
+                  {
+                    "name" : "transform",
+                    "type" : {
+                      "closure" : {
                         "_0" : {
-                          "nullable" : {
-                            "_0" : {
-                              "jsValue" : {
+                          "isAsync" : false,
+                          "isThrows" : false,
+                          "mangleName" : "20BridgeJSRuntimeTestsSS_SS",
+                          "moduleName" : "BridgeJSRuntimeTests",
+                          "parameters" : [
+                            {
+                              "string" : {
 
                               }
-                            },
-                            "_1" : "null"
-                          }
-                        }
+                            }
+                          ],
+                          "returnType" : {
+                            "string" : {
+
+                            }
+                          },
+                          "sendingParameters" : false
+                        },
+                        "useJSTypedClosure" : true
                       }
                     }
                   }
                 ],
                 "returnType" : {
-                  "array" : {
-                    "_0" : {
-                      "nullable" : {
-                        "_0" : {
-                          "jsValue" : {
+                  "string" : {
 
-                          }
-                        },
-                        "_1" : "null"
-                      }
-                    }
                   }
                 }
               },
@@ -17316,38 +22500,47 @@
                   "isStatic" : false,
                   "isThrows" : true
                 },
-                "name" : "jsRoundTripOptionalJSObjectArray",
+                "name" : "jsApplyJSObject",
                 "parameters" : [
                   {
-                    "name" : "values",
+                    "name" : "value",
                     "type" : {
-                      "array" : {
+                      "jsObject" : {
+
+                      }
+                    }
+                  },
+                  {
+                    "name" : "transform",
+                    "type" : {
+                      "closure" : {
                         "_0" : {
-                          "nullable" : {
-                            "_0" : {
+                          "isAsync" : false,
+                          "isThrows" : false,
+                          "mangleName" : "20BridgeJSRuntimeTests8JSObjectC_8JSObjectC",
+                          "moduleName" : "BridgeJSRuntimeTests",
+                          "parameters" : [
+                            {
                               "jsObject" : {
 
                               }
-                            },
-                            "_1" : "null"
-                          }
-                        }
+                            }
+                          ],
+                          "returnType" : {
+                            "jsObject" : {
+
+                            }
+                          },
+                          "sendingParameters" : false
+                        },
+                        "useJSTypedClosure" : true
                       }
                     }
                   }
                 ],
                 "returnType" : {
-                  "array" : {
-                    "_0" : {
-                      "nullable" : {
-                        "_0" : {
-                          "jsObject" : {
+                  "jsObject" : {
 
-                          }
-                        },
-                        "_1" : "null"
-                      }
-                    }
                   }
                 }
               },
@@ -17358,38 +22551,48 @@
                   "isStatic" : false,
                   "isThrows" : true
                 },
-                "name" : "jsRoundTripOptionalJSClassArray",
+                "name" : "jsMakeIntToInt",
                 "parameters" : [
                   {
-                    "name" : "values",
+                    "name" : "base",
                     "type" : {
-                      "array" : {
+                      "integer" : {
                         "_0" : {
-                          "nullable" : {
-                            "_0" : {
-                              "jsObject" : {
-                                "_0" : "ArrayElementObject"
-                              }
-                            },
-                            "_1" : "null"
-                          }
+                          "isSigned" : true,
+                          "width" : "word"
                         }
                       }
                     }
                   }
                 ],
                 "returnType" : {
-                  "array" : {
+                  "closure" : {
                     "_0" : {
-                      "nullable" : {
-                        "_0" : {
-                          "jsObject" : {
-                            "_0" : "ArrayElementObject"
+                      "isAsync" : false,
+                      "isThrows" : false,
+                      "mangleName" : "20BridgeJSRuntimeTestsSi_Si",
+                      "moduleName" : "BridgeJSRuntimeTests",
+                      "parameters" : [
+                        {
+                          "integer" : {
+                            "_0" : {
+                              "isSigned" : true,
+                              "width" : "word"
+                            }
                           }
-                        },
-                        "_1" : "null"
-                      }
-                    }
+                        }
+                      ],
+                      "returnType" : {
+                        "integer" : {
+                          "_0" : {
+                            "isSigned" : true,
+                            "width" : "word"
+                          }
+                        }
+                      },
+                      "sendingParameters" : false
+                    },
+                    "useJSTypedClosure" : false
                   }
                 }
               },
@@ -17400,24 +22603,39 @@
                   "isStatic" : false,
                   "isThrows" : true
                 },
-                "name" : "jsSumNumberArray",
+                "name" : "jsMakeDoubleToDouble",
                 "parameters" : [
                   {
-                    "name" : "values",
+                    "name" : "base",
                     "type" : {
-                      "array" : {
-                        "_0" : {
-                          "double" : {
+                      "double" : {
 
-                          }
-                        }
                       }
                     }
                   }
                 ],
                 "returnType" : {
-                  "double" : {
+                  "closure" : {
+                    "_0" : {
+                      "isAsync" : false,
+                      "isThrows" : false,
+                      "mangleName" : "20BridgeJSRuntimeTestsSd_Sd",
+                      "moduleName" : "BridgeJSRuntimeTests",
+                      "parameters" : [
+                        {
+                          "double" : {
+
+                          }
+                        }
+                      ],
+                      "returnType" : {
+                        "double" : {
 
+                        }
+                      },
+                      "sendingParameters" : false
+                    },
+                    "useJSTypedClosure" : false
                   }
                 }
               },
@@ -17428,138 +22646,259 @@
                   "isStatic" : false,
                   "isThrows" : true
                 },
-                "name" : "jsCreateNumberArray",
+                "name" : "jsMakeStringToString",
                 "parameters" : [
-
-                ],
-                "returnType" : {
-                  "array" : {
-                    "_0" : {
-                      "double" : {
+                  {
+                    "name" : "prefix",
+                    "type" : {
+                      "string" : {
 
                       }
                     }
                   }
-                }
-              },
-              {
-                "accessLevel" : "internal",
-                "effects" : {
-                  "isAsync" : false,
-                  "isStatic" : false,
-                  "isThrows" : true
-                },
-                "name" : "runJsArraySupportTests",
-                "parameters" : [
-
                 ],
                 "returnType" : {
-                  "void" : {
+                  "closure" : {
+                    "_0" : {
+                      "isAsync" : false,
+                      "isThrows" : false,
+                      "mangleName" : "20BridgeJSRuntimeTestsSS_SS",
+                      "moduleName" : "BridgeJSRuntimeTests",
+                      "parameters" : [
+                        {
+                          "string" : {
+
+                          }
+                        }
+                      ],
+                      "returnType" : {
+                        "string" : {
 
+                        }
+                      },
+                      "sendingParameters" : false
+                    },
+                    "useJSTypedClosure" : false
                   }
                 }
-              }
-            ]
-          }
-        ]
-      },
-      {
-        "functions" : [
-
-        ],
-        "types" : [
-          {
-            "accessLevel" : "internal",
-            "getters" : [
-
-            ],
-            "methods" : [
-
-            ],
-            "name" : "AsyncImportImports",
-            "setters" : [
-
-            ],
-            "staticMethods" : [
+              },
               {
                 "accessLevel" : "internal",
                 "effects" : {
-                  "isAsync" : true,
+                  "isAsync" : false,
                   "isStatic" : false,
                   "isThrows" : true
                 },
-                "name" : "jsAsyncRoundTripVoid",
+                "name" : "jsCallTwice",
                 "parameters" : [
+                  {
+                    "name" : "value",
+                    "type" : {
+                      "integer" : {
+                        "_0" : {
+                          "isSigned" : true,
+                          "width" : "word"
+                        }
+                      }
+                    }
+                  },
+                  {
+                    "name" : "callback",
+                    "type" : {
+                      "closure" : {
+                        "_0" : {
+                          "isAsync" : false,
+                          "isThrows" : false,
+                          "mangleName" : "20BridgeJSRuntimeTestsSi_y",
+                          "moduleName" : "BridgeJSRuntimeTests",
+                          "parameters" : [
+                            {
+                              "integer" : {
+                                "_0" : {
+                                  "isSigned" : true,
+                                  "width" : "word"
+                                }
+                              }
+                            }
+                          ],
+                          "returnType" : {
+                            "void" : {
 
+                            }
+                          },
+                          "sendingParameters" : false
+                        },
+                        "useJSTypedClosure" : true
+                      }
+                    }
+                  }
                 ],
                 "returnType" : {
-                  "void" : {
-
+                  "integer" : {
+                    "_0" : {
+                      "isSigned" : true,
+                      "width" : "word"
+                    }
                   }
                 }
               },
               {
                 "accessLevel" : "internal",
                 "effects" : {
-                  "isAsync" : true,
+                  "isAsync" : false,
                   "isStatic" : false,
                   "isThrows" : true
                 },
-                "name" : "jsAsyncRoundTripNumber",
+                "name" : "jsCallBinary",
                 "parameters" : [
                   {
-                    "name" : "v",
+                    "name" : "callback",
                     "type" : {
-                      "double" : {
-
+                      "closure" : {
+                        "_0" : {
+                          "isAsync" : false,
+                          "isThrows" : false,
+                          "mangleName" : "20BridgeJSRuntimeTestsSiSi_Si",
+                          "moduleName" : "BridgeJSRuntimeTests",
+                          "parameters" : [
+                            {
+                              "integer" : {
+                                "_0" : {
+                                  "isSigned" : true,
+                                  "width" : "word"
+                                }
+                              }
+                            },
+                            {
+                              "integer" : {
+                                "_0" : {
+                                  "isSigned" : true,
+                                  "width" : "word"
+                                }
+                              }
+                            }
+                          ],
+                          "returnType" : {
+                            "integer" : {
+                              "_0" : {
+                                "isSigned" : true,
+                                "width" : "word"
+                              }
+                            }
+                          },
+                          "sendingParameters" : false
+                        },
+                        "useJSTypedClosure" : true
                       }
                     }
                   }
                 ],
                 "returnType" : {
-                  "double" : {
-
+                  "integer" : {
+                    "_0" : {
+                      "isSigned" : true,
+                      "width" : "word"
+                    }
                   }
                 }
               },
               {
                 "accessLevel" : "internal",
                 "effects" : {
-                  "isAsync" : true,
+                  "isAsync" : false,
                   "isStatic" : false,
                   "isThrows" : true
                 },
-                "name" : "jsAsyncRoundTripBool",
+                "name" : "jsCallTriple",
                 "parameters" : [
                   {
-                    "name" : "v",
+                    "name" : "callback",
                     "type" : {
-                      "bool" : {
-
+                      "closure" : {
+                        "_0" : {
+                          "isAsync" : false,
+                          "isThrows" : false,
+                          "mangleName" : "20BridgeJSRuntimeTestsSiSiSi_Si",
+                          "moduleName" : "BridgeJSRuntimeTests",
+                          "parameters" : [
+                            {
+                              "integer" : {
+                                "_0" : {
+                                  "isSigned" : true,
+                                  "width" : "word"
+                                }
+                              }
+                            },
+                            {
+                              "integer" : {
+                                "_0" : {
+                                  "isSigned" : true,
+                                  "width" : "word"
+                                }
+                              }
+                            },
+                            {
+                              "integer" : {
+                                "_0" : {
+                                  "isSigned" : true,
+                                  "width" : "word"
+                                }
+                              }
+                            }
+                          ],
+                          "returnType" : {
+                            "integer" : {
+                              "_0" : {
+                                "isSigned" : true,
+                                "width" : "word"
+                              }
+                            }
+                          },
+                          "sendingParameters" : false
+                        },
+                        "useJSTypedClosure" : true
                       }
                     }
                   }
                 ],
                 "returnType" : {
-                  "bool" : {
-
+                  "integer" : {
+                    "_0" : {
+                      "isSigned" : true,
+                      "width" : "word"
+                    }
                   }
                 }
               },
               {
                 "accessLevel" : "internal",
                 "effects" : {
-                  "isAsync" : true,
+                  "isAsync" : false,
                   "isStatic" : false,
                   "isThrows" : true
                 },
-                "name" : "jsAsyncRoundTripString",
+                "name" : "jsCallAfterRelease",
                 "parameters" : [
                   {
-                    "name" : "v",
+                    "name" : "callback",
                     "type" : {
-                      "string" : {
+                      "closure" : {
+                        "_0" : {
+                          "isAsync" : false,
+                          "isThrows" : false,
+                          "mangleName" : "20BridgeJSRuntimeTestsy_y",
+                          "moduleName" : "BridgeJSRuntimeTests",
+                          "parameters" : [
+
+                          ],
+                          "returnType" : {
+                            "void" : {
 
+                            }
+                          },
+                          "sendingParameters" : false
+                        },
+                        "useJSTypedClosure" : true
                       }
                     }
                   }
@@ -17573,19 +22912,34 @@
               {
                 "accessLevel" : "internal",
                 "effects" : {
-                  "isAsync" : true,
+                  "isAsync" : false,
                   "isStatic" : false,
                   "isThrows" : true
                 },
-                "name" : "jsAsyncRoundTripOptionalString",
+                "name" : "jsOptionalInvoke",
                 "parameters" : [
                   {
-                    "name" : "v",
+                    "name" : "callback",
                     "type" : {
                       "nullable" : {
                         "_0" : {
-                          "string" : {
+                          "closure" : {
+                            "_0" : {
+                              "isAsync" : false,
+                              "isThrows" : false,
+                              "mangleName" : "20BridgeJSRuntimeTestsy_Sb",
+                              "moduleName" : "BridgeJSRuntimeTests",
+                              "parameters" : [
+
+                              ],
+                              "returnType" : {
+                                "bool" : {
 
+                                }
+                              },
+                              "sendingParameters" : false
+                            },
+                            "useJSTypedClosure" : true
                           }
                         },
                         "_1" : "null"
@@ -17594,78 +22948,83 @@
                   }
                 ],
                 "returnType" : {
-                  "nullable" : {
-                    "_0" : {
-                      "string" : {
+                  "bool" : {
 
-                      }
-                    },
-                    "_1" : "null"
                   }
                 }
               },
               {
                 "accessLevel" : "internal",
                 "effects" : {
-                  "isAsync" : true,
+                  "isAsync" : false,
                   "isStatic" : false,
                   "isThrows" : true
                 },
-                "name" : "jsAsyncRoundTripOptionalNumber",
+                "name" : "jsStoreClosure",
                 "parameters" : [
                   {
-                    "name" : "v",
+                    "name" : "callback",
                     "type" : {
-                      "nullable" : {
+                      "closure" : {
                         "_0" : {
-                          "double" : {
+                          "isAsync" : false,
+                          "isThrows" : false,
+                          "mangleName" : "20BridgeJSRuntimeTestsy_y",
+                          "moduleName" : "BridgeJSRuntimeTests",
+                          "parameters" : [
 
-                          }
+                          ],
+                          "returnType" : {
+                            "void" : {
+
+                            }
+                          },
+                          "sendingParameters" : false
                         },
-                        "_1" : "null"
+                        "useJSTypedClosure" : true
                       }
                     }
                   }
                 ],
                 "returnType" : {
-                  "nullable" : {
-                    "_0" : {
-                      "double" : {
+                  "void" : {
+
+                  }
+                }
+              },
+              {
+                "accessLevel" : "internal",
+                "effects" : {
+                  "isAsync" : false,
+                  "isStatic" : false,
+                  "isThrows" : true
+                },
+                "name" : "jsCallStoredClosure",
+                "parameters" : [
+
+                ],
+                "returnType" : {
+                  "void" : {
 
-                      }
-                    },
-                    "_1" : "null"
                   }
                 }
               },
               {
                 "accessLevel" : "internal",
                 "effects" : {
-                  "isAsync" : true,
+                  "isAsync" : false,
                   "isStatic" : false,
                   "isThrows" : true
                 },
-                "name" : "jsAsyncRoundTripBoolArray",
+                "name" : "jsHeapCount",
                 "parameters" : [
-                  {
-                    "name" : "values",
-                    "type" : {
-                      "array" : {
-                        "_0" : {
-                          "bool" : {
 
-                          }
-                        }
-                      }
-                    }
-                  }
                 ],
                 "returnType" : {
-                  "array" : {
+                  "integer" : {
                     "_0" : {
-                      "bool" : {
-
-                      }
+                      "isSigned" : true,
+                      "width" : "word"
                     }
                   }
                 }
@@ -17673,90 +23032,95 @@
               {
                 "accessLevel" : "internal",
                 "effects" : {
-                  "isAsync" : true,
+                  "isAsync" : false,
                   "isStatic" : false,
                   "isThrows" : true
                 },
-                "name" : "jsAsyncRoundTripIntArray",
+                "name" : "runJsClosureSupportTests",
                 "parameters" : [
-                  {
-                    "name" : "values",
-                    "type" : {
-                      "array" : {
-                        "_0" : {
-                          "double" : {
 
-                          }
-                        }
-                      }
-                    }
-                  }
                 ],
                 "returnType" : {
-                  "array" : {
-                    "_0" : {
-                      "double" : {
+                  "void" : {
 
-                      }
-                    }
                   }
                 }
-              },
+              }
+            ]
+          }
+        ]
+      },
+      {
+        "functions" : [
+
+        ],
+        "types" : [
+          {
+            "accessLevel" : "internal",
+            "getters" : [
+
+            ],
+            "methods" : [
+
+            ],
+            "name" : "ClosureThrowsImports",
+            "setters" : [
+
+            ],
+            "staticMethods" : [
               {
                 "accessLevel" : "internal",
                 "effects" : {
-                  "isAsync" : true,
+                  "isAsync" : false,
                   "isStatic" : false,
                   "isThrows" : true
                 },
-                "name" : "jsAsyncRoundTripStringArray",
+                "name" : "runJsClosureThrowsTests",
                 "parameters" : [
-                  {
-                    "name" : "values",
-                    "type" : {
-                      "array" : {
-                        "_0" : {
-                          "string" : {
 
-                          }
-                        }
-                      }
-                    }
-                  }
                 ],
                 "returnType" : {
-                  "array" : {
-                    "_0" : {
-                      "string" : {
+                  "void" : {
 
-                      }
-                    }
                   }
                 }
-              },
+              }
+            ]
+          }
+        ]
+      },
+      {
+        "functions" : [
+
+        ],
+        "types" : [
+          {
+            "accessLevel" : "internal",
+            "getters" : [
+
+            ],
+            "methods" : [
+
+            ],
+            "name" : "DefaultArgumentImports",
+            "setters" : [
+
+            ],
+            "staticMethods" : [
               {
                 "accessLevel" : "internal",
                 "effects" : {
-                  "isAsync" : true,
+                  "isAsync" : false,
                   "isStatic" : false,
                   "isThrows" : true
                 },
-                "name" : "jsAsyncRoundTripFeatureFlag",
+                "name" : "runJsDefaultArgumentTests",
                 "parameters" : [
-                  {
-                    "name" : "v",
-                    "type" : {
-                      "rawValueEnum" : {
-                        "_0" : "FeatureFlag",
-                        "_1" : "String"
-                      }
-                    }
-                  }
+
                 ],
                 "returnType" : {
-                  "rawValueEnum" : {
-                    "_0" : "FeatureFlag",
-                    "_1" : "String"
+                  "void" : {
+
                   }
                 }
               }
@@ -17777,7 +23141,7 @@
             "methods" : [
 
             ],
-            "name" : "ClosureSupportImports",
+            "name" : "DictionarySupportImports",
             "setters" : [
 
             ],
@@ -17789,35 +23153,34 @@
                   "isStatic" : false,
                   "isThrows" : true
                 },
-                "name" : "jsApplyVoid",
+                "name" : "jsRoundTripDictionaryInt",
                 "parameters" : [
                   {
-                    "name" : "callback",
+                    "name" : "values",
                     "type" : {
-                      "closure" : {
+                      "dictionary" : {
                         "_0" : {
-                          "isAsync" : false,
-                          "isThrows" : false,
-                          "mangleName" : "20BridgeJSRuntimeTestsy_y",
-                          "moduleName" : "BridgeJSRuntimeTests",
-                          "parameters" : [
-
-                          ],
-                          "returnType" : {
-                            "void" : {
-
+                          "integer" : {
+                            "_0" : {
+                              "isSigned" : true,
+                              "width" : "word"
                             }
-                          },
-                          "sendingParameters" : false
-                        },
-                        "useJSTypedClosure" : true
+                          }
+                        }
                       }
                     }
                   }
                 ],
                 "returnType" : {
-                  "void" : {
-
+                  "dictionary" : {
+                    "_0" : {
+                      "integer" : {
+                        "_0" : {
+                          "isSigned" : true,
+                          "width" : "word"
+                        }
+                      }
+                    }
                   }
                 }
               },
@@ -17828,35 +23191,28 @@
                   "isStatic" : false,
                   "isThrows" : true
                 },
-                "name" : "jsApplyBool",
+                "name" : "jsRoundTripDictionaryBool",
                 "parameters" : [
                   {
-                    "name" : "callback",
+                    "name" : "values",
                     "type" : {
-                      "closure" : {
+                      "dictionary" : {
                         "_0" : {
-                          "isAsync" : false,
-                          "isThrows" : false,
-                          "mangleName" : "20BridgeJSRuntimeTestsy_Sb",
-                          "moduleName" : "BridgeJSRuntimeTests",
-                          "parameters" : [
-
-                          ],
-                          "returnType" : {
-                            "bool" : {
+                          "bool" : {
 
-                            }
-                          },
-                          "sendingParameters" : false
-                        },
-                        "useJSTypedClosure" : true
+                          }
+                        }
                       }
                     }
                   }
                 ],
                 "returnType" : {
-                  "bool" : {
+                  "dictionary" : {
+                    "_0" : {
+                      "bool" : {
 
+                      }
+                    }
                   }
                 }
               },
@@ -17867,58 +23223,59 @@
                   "isStatic" : false,
                   "isThrows" : true
                 },
-                "name" : "jsApplyInt",
+                "name" : "jsRoundTripDictionaryDouble",
                 "parameters" : [
                   {
-                    "name" : "value",
+                    "name" : "values",
                     "type" : {
-                      "integer" : {
+                      "dictionary" : {
                         "_0" : {
-                          "isSigned" : true,
-                          "width" : "word"
+                          "double" : {
+
+                          }
                         }
                       }
                     }
-                  },
-                  {
-                    "name" : "transform",
-                    "type" : {
-                      "closure" : {
-                        "_0" : {
-                          "isAsync" : false,
-                          "isThrows" : false,
-                          "mangleName" : "20BridgeJSRuntimeTestsSi_Si",
-                          "moduleName" : "BridgeJSRuntimeTests",
-                          "parameters" : [
-                            {
-                              "integer" : {
-                                "_0" : {
-                                  "isSigned" : true,
-                                  "width" : "word"
-                                }
-                              }
-                            }
-                          ],
-                          "returnType" : {
-                            "integer" : {
-                              "_0" : {
-                                "isSigned" : true,
-                                "width" : "word"
-                              }
-                            }
-                          },
-                          "sendingParameters" : false
-                        },
-                        "useJSTypedClosure" : true
+                  }
+                ],
+                "returnType" : {
+                  "dictionary" : {
+                    "_0" : {
+                      "double" : {
+
+                      }
+                    }
+                  }
+                }
+              },
+              {
+                "accessLevel" : "internal",
+                "effects" : {
+                  "isAsync" : false,
+                  "isStatic" : false,
+                  "isThrows" : true
+                },
+                "name" : "jsRoundTripDictionaryJSObject",
+                "parameters" : [
+                  {
+                    "name" : "values",
+                    "type" : {
+                      "dictionary" : {
+                        "_0" : {
+                          "jsObject" : {
+
+                          }
+                        }
                       }
                     }
                   }
                 ],
                 "returnType" : {
-                  "integer" : {
+                  "dictionary" : {
                     "_0" : {
-                      "isSigned" : true,
-                      "width" : "word"
+                      "jsObject" : {
+
+                      }
                     }
                   }
                 }
@@ -17930,47 +23287,28 @@
                   "isStatic" : false,
                   "isThrows" : true
                 },
-                "name" : "jsApplyDouble",
+                "name" : "jsRoundTripDictionaryJSValue",
                 "parameters" : [
                   {
-                    "name" : "value",
-                    "type" : {
-                      "double" : {
-
-                      }
-                    }
-                  },
-                  {
-                    "name" : "transform",
+                    "name" : "values",
                     "type" : {
-                      "closure" : {
+                      "dictionary" : {
                         "_0" : {
-                          "isAsync" : false,
-                          "isThrows" : false,
-                          "mangleName" : "20BridgeJSRuntimeTestsSd_Sd",
-                          "moduleName" : "BridgeJSRuntimeTests",
-                          "parameters" : [
-                            {
-                              "double" : {
-
-                              }
-                            }
-                          ],
-                          "returnType" : {
-                            "double" : {
+                          "jsValue" : {
 
-                            }
-                          },
-                          "sendingParameters" : false
-                        },
-                        "useJSTypedClosure" : true
+                          }
+                        }
                       }
                     }
                   }
                 ],
                 "returnType" : {
-                  "double" : {
+                  "dictionary" : {
+                    "_0" : {
+                      "jsValue" : {
 
+                      }
+                    }
                   }
                 }
               },
@@ -17981,427 +23319,466 @@
                   "isStatic" : false,
                   "isThrows" : true
                 },
-                "name" : "jsApplyString",
+                "name" : "jsRoundTripDictionaryDoubleArray",
                 "parameters" : [
                   {
-                    "name" : "value",
-                    "type" : {
-                      "string" : {
-
-                      }
-                    }
-                  },
-                  {
-                    "name" : "transform",
+                    "name" : "values",
                     "type" : {
-                      "closure" : {
+                      "dictionary" : {
                         "_0" : {
-                          "isAsync" : false,
-                          "isThrows" : false,
-                          "mangleName" : "20BridgeJSRuntimeTestsSS_SS",
-                          "moduleName" : "BridgeJSRuntimeTests",
-                          "parameters" : [
-                            {
-                              "string" : {
+                          "array" : {
+                            "_0" : {
+                              "double" : {
 
                               }
                             }
-                          ],
-                          "returnType" : {
-                            "string" : {
-
-                            }
-                          },
-                          "sendingParameters" : false
-                        },
-                        "useJSTypedClosure" : true
+                          }
+                        }
                       }
                     }
                   }
                 ],
                 "returnType" : {
+                  "dictionary" : {
+                    "_0" : {
+                      "array" : {
+                        "_0" : {
+                          "double" : {
+
+                          }
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            ]
+          }
+        ]
+      },
+      {
+        "functions" : [
+
+        ],
+        "types" : [
+          {
+            "accessLevel" : "internal",
+            "constructor" : {
+              "accessLevel" : "internal",
+              "parameters" : [
+                {
+                  "name" : "value",
+                  "type" : {
+                    "string" : {
+
+                    }
+                  }
+                }
+              ]
+            },
+            "getters" : [
+              {
+                "accessLevel" : "internal",
+                "name" : "value",
+                "type" : {
+                  "string" : {
+
+                  }
+                }
+              }
+            ],
+            "methods" : [
+
+            ],
+            "name" : "Foo",
+            "setters" : [
+
+            ],
+            "staticMethods" : [
+
+            ]
+          }
+        ]
+      },
+      {
+        "functions" : [
+          {
+            "accessLevel" : "internal",
+            "effects" : {
+              "isAsync" : false,
+              "isStatic" : false,
+              "isThrows" : true
+            },
+            "name" : "jsRoundTripVoid",
+            "parameters" : [
+
+            ],
+            "returnType" : {
+              "void" : {
+
+              }
+            }
+          },
+          {
+            "accessLevel" : "internal",
+            "effects" : {
+              "isAsync" : false,
+              "isStatic" : false,
+              "isThrows" : true
+            },
+            "name" : "jsRoundTripNumber",
+            "parameters" : [
+              {
+                "name" : "v",
+                "type" : {
+                  "double" : {
+
+                  }
+                }
+              }
+            ],
+            "returnType" : {
+              "double" : {
+
+              }
+            }
+          },
+          {
+            "accessLevel" : "internal",
+            "effects" : {
+              "isAsync" : false,
+              "isStatic" : false,
+              "isThrows" : true
+            },
+            "name" : "jsRoundTripBool",
+            "parameters" : [
+              {
+                "name" : "v",
+                "type" : {
+                  "bool" : {
+
+                  }
+                }
+              }
+            ],
+            "returnType" : {
+              "bool" : {
+
+              }
+            }
+          },
+          {
+            "accessLevel" : "internal",
+            "effects" : {
+              "isAsync" : false,
+              "isStatic" : false,
+              "isThrows" : true
+            },
+            "name" : "jsRoundTripString",
+            "parameters" : [
+              {
+                "name" : "v",
+                "type" : {
                   "string" : {
 
                   }
                 }
-              },
+              }
+            ],
+            "returnType" : {
+              "string" : {
+
+              }
+            }
+          },
+          {
+            "accessLevel" : "internal",
+            "effects" : {
+              "isAsync" : false,
+              "isStatic" : false,
+              "isThrows" : true
+            },
+            "name" : "jsRoundTripJSValue",
+            "parameters" : [
+              {
+                "name" : "v",
+                "type" : {
+                  "jsValue" : {
+
+                  }
+                }
+              }
+            ],
+            "returnType" : {
+              "jsValue" : {
+
+              }
+            }
+          },
+          {
+            "accessLevel" : "internal",
+            "effects" : {
+              "isAsync" : false,
+              "isStatic" : false,
+              "isThrows" : true
+            },
+            "name" : "jsThrowOrVoid",
+            "parameters" : [
               {
-                "accessLevel" : "internal",
-                "effects" : {
-                  "isAsync" : false,
-                  "isStatic" : false,
-                  "isThrows" : true
-                },
-                "name" : "jsApplyJSObject",
-                "parameters" : [
-                  {
-                    "name" : "value",
-                    "type" : {
-                      "jsObject" : {
+                "name" : "shouldThrow",
+                "type" : {
+                  "bool" : {
 
-                      }
-                    }
-                  },
-                  {
-                    "name" : "transform",
-                    "type" : {
-                      "closure" : {
-                        "_0" : {
-                          "isAsync" : false,
-                          "isThrows" : false,
-                          "mangleName" : "20BridgeJSRuntimeTests8JSObjectC_8JSObjectC",
-                          "moduleName" : "BridgeJSRuntimeTests",
-                          "parameters" : [
-                            {
-                              "jsObject" : {
+                  }
+                }
+              }
+            ],
+            "returnType" : {
+              "void" : {
 
-                              }
-                            }
-                          ],
-                          "returnType" : {
-                            "jsObject" : {
+              }
+            }
+          },
+          {
+            "accessLevel" : "internal",
+            "effects" : {
+              "isAsync" : false,
+              "isStatic" : false,
+              "isThrows" : true
+            },
+            "name" : "jsThrowOrNumber",
+            "parameters" : [
+              {
+                "name" : "shouldThrow",
+                "type" : {
+                  "bool" : {
 
-                            }
-                          },
-                          "sendingParameters" : false
-                        },
-                        "useJSTypedClosure" : true
-                      }
-                    }
                   }
-                ],
-                "returnType" : {
-                  "jsObject" : {
+                }
+              }
+            ],
+            "returnType" : {
+              "double" : {
+
+              }
+            }
+          },
+          {
+            "accessLevel" : "internal",
+            "effects" : {
+              "isAsync" : false,
+              "isStatic" : false,
+              "isThrows" : true
+            },
+            "name" : "jsThrowOrBool",
+            "parameters" : [
+              {
+                "name" : "shouldThrow",
+                "type" : {
+                  "bool" : {
 
                   }
                 }
-              },
+              }
+            ],
+            "returnType" : {
+              "bool" : {
+
+              }
+            }
+          },
+          {
+            "accessLevel" : "internal",
+            "effects" : {
+              "isAsync" : false,
+              "isStatic" : false,
+              "isThrows" : true
+            },
+            "name" : "jsThrowOrString",
+            "parameters" : [
               {
-                "accessLevel" : "internal",
-                "effects" : {
-                  "isAsync" : false,
-                  "isStatic" : false,
-                  "isThrows" : true
-                },
-                "name" : "jsMakeIntToInt",
-                "parameters" : [
-                  {
-                    "name" : "base",
-                    "type" : {
-                      "integer" : {
-                        "_0" : {
-                          "isSigned" : true,
-                          "width" : "word"
-                        }
-                      }
-                    }
-                  }
-                ],
-                "returnType" : {
-                  "closure" : {
-                    "_0" : {
-                      "isAsync" : false,
-                      "isThrows" : false,
-                      "mangleName" : "20BridgeJSRuntimeTestsSi_Si",
-                      "moduleName" : "BridgeJSRuntimeTests",
-                      "parameters" : [
-                        {
-                          "integer" : {
-                            "_0" : {
-                              "isSigned" : true,
-                              "width" : "word"
-                            }
-                          }
-                        }
-                      ],
-                      "returnType" : {
-                        "integer" : {
-                          "_0" : {
-                            "isSigned" : true,
-                            "width" : "word"
-                          }
-                        }
-                      },
-                      "sendingParameters" : false
-                    },
-                    "useJSTypedClosure" : false
+                "name" : "shouldThrow",
+                "type" : {
+                  "bool" : {
+
                   }
                 }
-              },
-              {
-                "accessLevel" : "internal",
-                "effects" : {
-                  "isAsync" : false,
-                  "isStatic" : false,
-                  "isThrows" : true
-                },
-                "name" : "jsMakeDoubleToDouble",
-                "parameters" : [
-                  {
-                    "name" : "base",
-                    "type" : {
-                      "double" : {
+              }
+            ],
+            "returnType" : {
+              "string" : {
 
-                      }
-                    }
+              }
+            }
+          },
+          {
+            "accessLevel" : "internal",
+            "effects" : {
+              "isAsync" : false,
+              "isStatic" : false,
+              "isThrows" : true
+            },
+            "name" : "jsRoundTripFeatureFlag",
+            "parameters" : [
+              {
+                "name" : "flag",
+                "type" : {
+                  "rawValueEnum" : {
+                    "_0" : "FeatureFlag",
+                    "_1" : "String"
                   }
-                ],
-                "returnType" : {
-                  "closure" : {
-                    "_0" : {
-                      "isAsync" : false,
-                      "isThrows" : false,
-                      "mangleName" : "20BridgeJSRuntimeTestsSd_Sd",
-                      "moduleName" : "BridgeJSRuntimeTests",
-                      "parameters" : [
-                        {
-                          "double" : {
+                }
+              }
+            ],
+            "returnType" : {
+              "rawValueEnum" : {
+                "_0" : "FeatureFlag",
+                "_1" : "String"
+              }
+            }
+          },
+          {
+            "accessLevel" : "internal",
+            "effects" : {
+              "isAsync" : true,
+              "isStatic" : false,
+              "isThrows" : true
+            },
+            "name" : "runAsyncWorks",
+            "parameters" : [
+
+            ],
+            "returnType" : {
+              "void" : {
 
-                          }
-                        }
-                      ],
-                      "returnType" : {
-                        "double" : {
+              }
+            }
+          },
+          {
+            "accessLevel" : "internal",
+            "effects" : {
+              "isAsync" : true,
+              "isStatic" : false,
+              "isThrows" : true
+            },
+            "name" : "fetchWeatherData",
+            "parameters" : [
+              {
+                "name" : "city",
+                "type" : {
+                  "string" : {
 
-                        }
-                      },
-                      "sendingParameters" : false
-                    },
-                    "useJSTypedClosure" : false
                   }
                 }
-              },
-              {
-                "accessLevel" : "internal",
-                "effects" : {
-                  "isAsync" : false,
-                  "isStatic" : false,
-                  "isThrows" : true
-                },
-                "name" : "jsMakeStringToString",
-                "parameters" : [
-                  {
-                    "name" : "prefix",
-                    "type" : {
-                      "string" : {
+              }
+            ],
+            "returnType" : {
+              "jsObject" : {
+                "_0" : "WeatherData"
+              }
+            }
+          },
+          {
+            "accessLevel" : "internal",
+            "effects" : {
+              "isAsync" : false,
+              "isStatic" : false,
+              "isThrows" : true
+            },
+            "jsName" : "$jsWeirdFunction",
+            "name" : "_jsWeirdFunction",
+            "parameters" : [
 
-                      }
-                    }
-                  }
-                ],
-                "returnType" : {
-                  "closure" : {
-                    "_0" : {
-                      "isAsync" : false,
-                      "isThrows" : false,
-                      "mangleName" : "20BridgeJSRuntimeTestsSS_SS",
-                      "moduleName" : "BridgeJSRuntimeTests",
-                      "parameters" : [
-                        {
-                          "string" : {
+            ],
+            "returnType" : {
+              "double" : {
 
-                          }
-                        }
-                      ],
-                      "returnType" : {
-                        "string" : {
+              }
+            }
+          },
+          {
+            "accessLevel" : "internal",
+            "effects" : {
+              "isAsync" : false,
+              "isStatic" : false,
+              "isThrows" : true
+            },
+            "from" : "global",
+            "name" : "parseInt",
+            "parameters" : [
+              {
+                "name" : "string",
+                "type" : {
+                  "string" : {
 
-                        }
-                      },
-                      "sendingParameters" : false
-                    },
-                    "useJSTypedClosure" : false
                   }
                 }
-              },
-              {
-                "accessLevel" : "internal",
-                "effects" : {
-                  "isAsync" : false,
-                  "isStatic" : false,
-                  "isThrows" : true
-                },
-                "name" : "jsCallTwice",
-                "parameters" : [
-                  {
-                    "name" : "value",
-                    "type" : {
-                      "integer" : {
-                        "_0" : {
-                          "isSigned" : true,
-                          "width" : "word"
-                        }
-                      }
-                    }
-                  },
-                  {
-                    "name" : "callback",
-                    "type" : {
-                      "closure" : {
-                        "_0" : {
-                          "isAsync" : false,
-                          "isThrows" : false,
-                          "mangleName" : "20BridgeJSRuntimeTestsSi_y",
-                          "moduleName" : "BridgeJSRuntimeTests",
-                          "parameters" : [
-                            {
-                              "integer" : {
-                                "_0" : {
-                                  "isSigned" : true,
-                                  "width" : "word"
-                                }
-                              }
-                            }
-                          ],
-                          "returnType" : {
-                            "void" : {
+              }
+            ],
+            "returnType" : {
+              "double" : {
+
+              }
+            }
+          }
+        ],
+        "globalGetters" : [
+          {
+            "accessLevel" : "internal",
+            "from" : "global",
+            "name" : "globalObject1",
+            "type" : {
+              "jsValue" : {
+
+              }
+            }
+          }
+        ],
+        "types" : [
+          {
+            "accessLevel" : "internal",
+            "constructor" : {
+              "accessLevel" : "internal",
+              "parameters" : [
+                {
+                  "name" : "name",
+                  "type" : {
+                    "string" : {
 
-                            }
-                          },
-                          "sendingParameters" : false
-                        },
-                        "useJSTypedClosure" : true
-                      }
-                    }
-                  }
-                ],
-                "returnType" : {
-                  "integer" : {
-                    "_0" : {
-                      "isSigned" : true,
-                      "width" : "word"
                     }
                   }
-                }
-              },
-              {
-                "accessLevel" : "internal",
-                "effects" : {
-                  "isAsync" : false,
-                  "isStatic" : false,
-                  "isThrows" : true
                 },
-                "name" : "jsCallBinary",
-                "parameters" : [
-                  {
-                    "name" : "callback",
-                    "type" : {
-                      "closure" : {
-                        "_0" : {
-                          "isAsync" : false,
-                          "isThrows" : false,
-                          "mangleName" : "20BridgeJSRuntimeTestsSiSi_Si",
-                          "moduleName" : "BridgeJSRuntimeTests",
-                          "parameters" : [
-                            {
-                              "integer" : {
-                                "_0" : {
-                                  "isSigned" : true,
-                                  "width" : "word"
-                                }
-                              }
-                            },
-                            {
-                              "integer" : {
-                                "_0" : {
-                                  "isSigned" : true,
-                                  "width" : "word"
-                                }
-                              }
-                            }
-                          ],
-                          "returnType" : {
-                            "integer" : {
-                              "_0" : {
-                                "isSigned" : true,
-                                "width" : "word"
-                              }
-                            }
-                          },
-                          "sendingParameters" : false
-                        },
-                        "useJSTypedClosure" : true
-                      }
+                {
+                  "name" : "prefix",
+                  "type" : {
+                    "string" : {
+
                     }
                   }
-                ],
-                "returnType" : {
-                  "integer" : {
-                    "_0" : {
-                      "isSigned" : true,
-                      "width" : "word"
-                    }
+                }
+              ]
+            },
+            "getters" : [
+              {
+                "accessLevel" : "internal",
+                "name" : "name",
+                "type" : {
+                  "string" : {
+
                   }
                 }
               },
               {
                 "accessLevel" : "internal",
-                "effects" : {
-                  "isAsync" : false,
-                  "isStatic" : false,
-                  "isThrows" : true
-                },
-                "name" : "jsCallTriple",
-                "parameters" : [
-                  {
-                    "name" : "callback",
-                    "type" : {
-                      "closure" : {
-                        "_0" : {
-                          "isAsync" : false,
-                          "isThrows" : false,
-                          "mangleName" : "20BridgeJSRuntimeTestsSiSiSi_Si",
-                          "moduleName" : "BridgeJSRuntimeTests",
-                          "parameters" : [
-                            {
-                              "integer" : {
-                                "_0" : {
-                                  "isSigned" : true,
-                                  "width" : "word"
-                                }
-                              }
-                            },
-                            {
-                              "integer" : {
-                                "_0" : {
-                                  "isSigned" : true,
-                                  "width" : "word"
-                                }
-                              }
-                            },
-                            {
-                              "integer" : {
-                                "_0" : {
-                                  "isSigned" : true,
-                                  "width" : "word"
-                                }
-                              }
-                            }
-                          ],
-                          "returnType" : {
-                            "integer" : {
-                              "_0" : {
-                                "isSigned" : true,
-                                "width" : "word"
-                              }
-                            }
-                          },
-                          "sendingParameters" : false
-                        },
-                        "useJSTypedClosure" : true
-                      }
-                    }
-                  }
-                ],
-                "returnType" : {
-                  "integer" : {
-                    "_0" : {
-                      "isSigned" : true,
-                      "width" : "word"
-                    }
+                "name" : "prefix",
+                "type" : {
+                  "string" : {
+
                   }
                 }
-              },
+              }
+            ],
+            "methods" : [
               {
                 "accessLevel" : "internal",
                 "effects" : {
@@ -18409,31 +23786,9 @@
                   "isStatic" : false,
                   "isThrows" : true
                 },
-                "name" : "jsCallAfterRelease",
+                "name" : "greet",
                 "parameters" : [
-                  {
-                    "name" : "callback",
-                    "type" : {
-                      "closure" : {
-                        "_0" : {
-                          "isAsync" : false,
-                          "isThrows" : false,
-                          "mangleName" : "20BridgeJSRuntimeTestsy_y",
-                          "moduleName" : "BridgeJSRuntimeTests",
-                          "parameters" : [
-
-                          ],
-                          "returnType" : {
-                            "void" : {
 
-                            }
-                          },
-                          "sendingParameters" : false
-                        },
-                        "useJSTypedClosure" : true
-                      }
-                    }
-                  }
                 ],
                 "returnType" : {
                   "string" : {
@@ -18448,119 +23803,125 @@
                   "isStatic" : false,
                   "isThrows" : true
                 },
-                "name" : "jsOptionalInvoke",
+                "name" : "changeName",
                 "parameters" : [
                   {
-                    "name" : "callback",
+                    "name" : "name",
                     "type" : {
-                      "nullable" : {
-                        "_0" : {
-                          "closure" : {
-                            "_0" : {
-                              "isAsync" : false,
-                              "isThrows" : false,
-                              "mangleName" : "20BridgeJSRuntimeTestsy_Sb",
-                              "moduleName" : "BridgeJSRuntimeTests",
-                              "parameters" : [
-
-                              ],
-                              "returnType" : {
-                                "bool" : {
+                      "string" : {
 
-                                }
-                              },
-                              "sendingParameters" : false
-                            },
-                            "useJSTypedClosure" : true
-                          }
-                        },
-                        "_1" : "null"
                       }
                     }
                   }
                 ],
                 "returnType" : {
-                  "bool" : {
+                  "void" : {
 
                   }
                 }
-              },
+              }
+            ],
+            "name" : "JsGreeter",
+            "setters" : [
               {
                 "accessLevel" : "internal",
-                "effects" : {
-                  "isAsync" : false,
-                  "isStatic" : false,
-                  "isThrows" : true
-                },
-                "name" : "jsStoreClosure",
-                "parameters" : [
-                  {
-                    "name" : "callback",
-                    "type" : {
-                      "closure" : {
-                        "_0" : {
-                          "isAsync" : false,
-                          "isThrows" : false,
-                          "mangleName" : "20BridgeJSRuntimeTestsy_y",
-                          "moduleName" : "BridgeJSRuntimeTests",
-                          "parameters" : [
+                "functionName" : "name_set",
+                "name" : "name",
+                "type" : {
+                  "string" : {
 
-                          ],
-                          "returnType" : {
-                            "void" : {
+                  }
+                }
+              }
+            ],
+            "staticMethods" : [
+
+            ]
+          },
+          {
+            "accessLevel" : "internal",
+            "getters" : [
+              {
+                "accessLevel" : "internal",
+                "name" : "temperature",
+                "type" : {
+                  "double" : {
 
-                            }
-                          },
-                          "sendingParameters" : false
-                        },
-                        "useJSTypedClosure" : true
-                      }
-                    }
                   }
-                ],
-                "returnType" : {
-                  "void" : {
+                }
+              },
+              {
+                "accessLevel" : "internal",
+                "name" : "description",
+                "type" : {
+                  "string" : {
 
                   }
                 }
               },
               {
                 "accessLevel" : "internal",
-                "effects" : {
-                  "isAsync" : false,
-                  "isStatic" : false,
-                  "isThrows" : true
-                },
-                "name" : "jsCallStoredClosure",
-                "parameters" : [
+                "name" : "humidity",
+                "type" : {
+                  "double" : {
 
-                ],
-                "returnType" : {
-                  "void" : {
+                  }
+                }
+              }
+            ],
+            "methods" : [
+
+            ],
+            "name" : "WeatherData",
+            "setters" : [
+              {
+                "accessLevel" : "internal",
+                "functionName" : "temperature_set",
+                "name" : "temperature",
+                "type" : {
+                  "double" : {
 
                   }
                 }
               },
               {
                 "accessLevel" : "internal",
-                "effects" : {
-                  "isAsync" : false,
-                  "isStatic" : false,
-                  "isThrows" : true
-                },
-                "name" : "jsHeapCount",
-                "parameters" : [
+                "functionName" : "description_set",
+                "name" : "description",
+                "type" : {
+                  "string" : {
 
-                ],
-                "returnType" : {
-                  "integer" : {
-                    "_0" : {
-                      "isSigned" : true,
-                      "width" : "word"
-                    }
                   }
                 }
               },
+              {
+                "accessLevel" : "internal",
+                "functionName" : "humidity_set",
+                "name" : "humidity",
+                "type" : {
+                  "double" : {
+
+                  }
+                }
+              }
+            ],
+            "staticMethods" : [
+
+            ]
+          },
+          {
+            "accessLevel" : "internal",
+            "constructor" : {
+              "accessLevel" : "internal",
+              "parameters" : [
+
+              ]
+            },
+            "getters" : [
+
+            ],
+            "jsName" : "$WeirdClass",
+            "methods" : [
               {
                 "accessLevel" : "internal",
                 "effects" : {
@@ -18568,38 +23929,45 @@
                   "isStatic" : false,
                   "isThrows" : true
                 },
-                "name" : "runJsClosureSupportTests",
+                "jsName" : "method-with-dashes",
+                "name" : "method_with_dashes",
                 "parameters" : [
 
                 ],
                 "returnType" : {
-                  "void" : {
+                  "string" : {
 
                   }
                 }
               }
-            ]
-          }
-        ]
-      },
-      {
-        "functions" : [
+            ],
+            "name" : "_WeirdClass",
+            "setters" : [
 
-        ],
-        "types" : [
+            ],
+            "staticMethods" : [
+
+            ]
+          },
           {
             "accessLevel" : "internal",
+            "constructor" : {
+              "accessLevel" : "internal",
+              "parameters" : [
+                {
+                  "name" : "value",
+                  "type" : {
+                    "double" : {
+
+                    }
+                  }
+                }
+              ]
+            },
             "getters" : [
 
             ],
             "methods" : [
-
-            ],
-            "name" : "DefaultArgumentImports",
-            "setters" : [
-
-            ],
-            "staticMethods" : [
               {
                 "accessLevel" : "internal",
                 "effects" : {
@@ -18607,34 +23975,18 @@
                   "isStatic" : false,
                   "isThrows" : true
                 },
-                "name" : "runJsDefaultArgumentTests",
+                "name" : "value",
                 "parameters" : [
 
                 ],
                 "returnType" : {
-                  "void" : {
+                  "double" : {
 
                   }
                 }
               }
-            ]
-          }
-        ]
-      },
-      {
-        "functions" : [
-
-        ],
-        "types" : [
-          {
-            "accessLevel" : "internal",
-            "getters" : [
-
-            ],
-            "methods" : [
-
             ],
-            "name" : "DictionarySupportImports",
+            "name" : "StaticBox",
             "setters" : [
 
             ],
@@ -18646,34 +23998,20 @@
                   "isStatic" : false,
                   "isThrows" : true
                 },
-                "name" : "jsRoundTripDictionaryInt",
+                "name" : "create",
                 "parameters" : [
                   {
-                    "name" : "values",
+                    "name" : "value",
                     "type" : {
-                      "dictionary" : {
-                        "_0" : {
-                          "integer" : {
-                            "_0" : {
-                              "isSigned" : true,
-                              "width" : "word"
-                            }
-                          }
-                        }
+                      "double" : {
+
                       }
                     }
                   }
                 ],
                 "returnType" : {
-                  "dictionary" : {
-                    "_0" : {
-                      "integer" : {
-                        "_0" : {
-                          "isSigned" : true,
-                          "width" : "word"
-                        }
-                      }
-                    }
+                  "jsObject" : {
+                    "_0" : "StaticBox"
                   }
                 }
               },
@@ -18684,28 +24022,13 @@
                   "isStatic" : false,
                   "isThrows" : true
                 },
-                "name" : "jsRoundTripDictionaryBool",
+                "name" : "value",
                 "parameters" : [
-                  {
-                    "name" : "values",
-                    "type" : {
-                      "dictionary" : {
-                        "_0" : {
-                          "bool" : {
 
-                          }
-                        }
-                      }
-                    }
-                  }
                 ],
                 "returnType" : {
-                  "dictionary" : {
-                    "_0" : {
-                      "bool" : {
+                  "double" : {
 
-                      }
-                    }
                   }
                 }
               },
@@ -18716,28 +24039,13 @@
                   "isStatic" : false,
                   "isThrows" : true
                 },
-                "name" : "jsRoundTripDictionaryDouble",
+                "name" : "makeDefault",
                 "parameters" : [
-                  {
-                    "name" : "values",
-                    "type" : {
-                      "dictionary" : {
-                        "_0" : {
-                          "double" : {
 
-                          }
-                        }
-                      }
-                    }
-                  }
                 ],
                 "returnType" : {
-                  "dictionary" : {
-                    "_0" : {
-                      "double" : {
-
-                      }
-                    }
+                  "jsObject" : {
+                    "_0" : "StaticBox"
                   }
                 }
               },
@@ -18748,63 +24056,81 @@
                   "isStatic" : false,
                   "isThrows" : true
                 },
-                "name" : "jsRoundTripDictionaryJSObject",
+                "jsName" : "with-dashes",
+                "name" : "with_dashes",
                 "parameters" : [
-                  {
-                    "name" : "values",
-                    "type" : {
-                      "dictionary" : {
-                        "_0" : {
-                          "jsObject" : {
 
-                          }
-                        }
-                      }
-                    }
-                  }
                 ],
                 "returnType" : {
-                  "dictionary" : {
-                    "_0" : {
-                      "jsObject" : {
+                  "jsObject" : {
+                    "_0" : "StaticBox"
+                  }
+                }
+              }
+            ]
+          },
+          {
+            "accessLevel" : "internal",
+            "constructor" : {
+              "accessLevel" : "internal",
+              "parameters" : [
+                {
+                  "name" : "name",
+                  "type" : {
+                    "string" : {
 
-                      }
                     }
                   }
-                }
-              },
-              {
-                "accessLevel" : "internal",
-                "effects" : {
-                  "isAsync" : false,
-                  "isStatic" : false,
-                  "isThrows" : true
                 },
-                "name" : "jsRoundTripDictionaryJSValue",
-                "parameters" : [
-                  {
-                    "name" : "values",
-                    "type" : {
-                      "dictionary" : {
-                        "_0" : {
-                          "jsValue" : {
+                {
+                  "name" : "age",
+                  "type" : {
+                    "double" : {
 
-                          }
-                        }
-                      }
                     }
                   }
-                ],
-                "returnType" : {
-                  "dictionary" : {
-                    "_0" : {
-                      "jsValue" : {
+                },
+                {
+                  "name" : "isCat",
+                  "type" : {
+                    "bool" : {
 
-                      }
                     }
                   }
                 }
+              ]
+            },
+            "from" : "global",
+            "getters" : [
+              {
+                "accessLevel" : "internal",
+                "name" : "name",
+                "type" : {
+                  "string" : {
+
+                  }
+                }
+              },
+              {
+                "accessLevel" : "internal",
+                "name" : "age",
+                "type" : {
+                  "double" : {
+
+                  }
+                }
               },
+              {
+                "accessLevel" : "internal",
+                "name" : "isCat",
+                "type" : {
+                  "bool" : {
+
+                  }
+                }
+              }
+            ],
+            "methods" : [
               {
                 "accessLevel" : "internal",
                 "effects" : {
@@ -18812,80 +24138,66 @@
                   "isStatic" : false,
                   "isThrows" : true
                 },
-                "name" : "jsRoundTripDictionaryDoubleArray",
+                "name" : "bark",
                 "parameters" : [
-                  {
-                    "name" : "values",
-                    "type" : {
-                      "dictionary" : {
-                        "_0" : {
-                          "array" : {
-                            "_0" : {
-                              "double" : {
 
-                              }
-                            }
-                          }
-                        }
-                      }
-                    }
+                ],
+                "returnType" : {
+                  "string" : {
+
                   }
+                }
+              },
+              {
+                "accessLevel" : "internal",
+                "effects" : {
+                  "isAsync" : false,
+                  "isStatic" : false,
+                  "isThrows" : true
+                },
+                "name" : "getIsCat",
+                "parameters" : [
+
                 ],
                 "returnType" : {
-                  "dictionary" : {
-                    "_0" : {
-                      "array" : {
-                        "_0" : {
-                          "double" : {
+                  "bool" : {
 
-                          }
-                        }
-                      }
-                    }
                   }
                 }
               }
-            ]
-          }
-        ]
-      },
-      {
-        "functions" : [
+            ],
+            "name" : "Animal",
+            "setters" : [
+              {
+                "accessLevel" : "internal",
+                "functionName" : "name_set",
+                "name" : "name",
+                "type" : {
+                  "string" : {
 
-        ],
-        "types" : [
-          {
-            "accessLevel" : "internal",
-            "constructor" : {
-              "accessLevel" : "internal",
-              "parameters" : [
-                {
-                  "name" : "value",
-                  "type" : {
-                    "string" : {
+                  }
+                }
+              },
+              {
+                "accessLevel" : "internal",
+                "functionName" : "age_set",
+                "name" : "age",
+                "type" : {
+                  "double" : {
 
-                    }
                   }
                 }
-              ]
-            },
-            "getters" : [
+              },
               {
                 "accessLevel" : "internal",
-                "name" : "value",
+                "functionName" : "isCat_set",
+                "name" : "isCat",
                 "type" : {
-                  "string" : {
+                  "bool" : {
 
                   }
                 }
               }
-            ],
-            "methods" : [
-
-            ],
-            "name" : "Foo",
-            "setters" : [
-
             ],
             "staticMethods" : [
 
@@ -18902,37 +24214,20 @@
               "isStatic" : false,
               "isThrows" : true
             },
-            "name" : "jsRoundTripVoid",
-            "parameters" : [
-
-            ],
-            "returnType" : {
-              "void" : {
-
-              }
-            }
-          },
-          {
-            "accessLevel" : "internal",
-            "effects" : {
-              "isAsync" : false,
-              "isStatic" : false,
-              "isThrows" : true
-            },
-            "name" : "jsRoundTripNumber",
+            "name" : "jsRoundTripLightColor",
             "parameters" : [
               {
-                "name" : "v",
+                "name" : "value",
                 "type" : {
-                  "double" : {
-
+                  "caseEnum" : {
+                    "_0" : "LightColor"
                   }
                 }
               }
             ],
             "returnType" : {
-              "double" : {
-
+              "caseEnum" : {
+                "_0" : "LightColor"
               }
             }
           },
@@ -18943,20 +24238,20 @@
               "isStatic" : false,
               "isThrows" : true
             },
-            "name" : "jsRoundTripBool",
+            "name" : "jsRoundTripImportedPayloadSignal",
             "parameters" : [
               {
-                "name" : "v",
+                "name" : "value",
                 "type" : {
-                  "bool" : {
-
+                  "associatedValueEnum" : {
+                    "_0" : "ImportedPayloadSignal"
                   }
                 }
               }
             ],
             "returnType" : {
-              "bool" : {
-
+              "associatedValueEnum" : {
+                "_0" : "ImportedPayloadSignal"
               }
             }
           },
@@ -18967,20 +24262,30 @@
               "isStatic" : false,
               "isThrows" : true
             },
-            "name" : "jsRoundTripString",
+            "name" : "jsRoundTripOptionalImportedPayloadSignal",
             "parameters" : [
               {
-                "name" : "v",
+                "name" : "value",
                 "type" : {
-                  "string" : {
-
+                  "nullable" : {
+                    "_0" : {
+                      "associatedValueEnum" : {
+                        "_0" : "ImportedPayloadSignal"
+                      }
+                    },
+                    "_1" : "null"
                   }
                 }
               }
             ],
             "returnType" : {
-              "string" : {
-
+              "nullable" : {
+                "_0" : {
+                  "associatedValueEnum" : {
+                    "_0" : "ImportedPayloadSignal"
+                  }
+                },
+                "_1" : "null"
               }
             }
           },
@@ -18991,19 +24296,46 @@
               "isStatic" : false,
               "isThrows" : true
             },
-            "name" : "jsRoundTripJSValue",
+            "name" : "jsJoinOptionalArrayThenArray",
             "parameters" : [
               {
-                "name" : "v",
+                "name" : "a",
                 "type" : {
-                  "jsValue" : {
-
+                  "nullable" : {
+                    "_0" : {
+                      "array" : {
+                        "_0" : {
+                          "integer" : {
+                            "_0" : {
+                              "isSigned" : true,
+                              "width" : "word"
+                            }
+                          }
+                        }
+                      }
+                    },
+                    "_1" : "null"
+                  }
+                }
+              },
+              {
+                "name" : "b",
+                "type" : {
+                  "array" : {
+                    "_0" : {
+                      "integer" : {
+                        "_0" : {
+                          "isSigned" : true,
+                          "width" : "word"
+                        }
+                      }
+                    }
                   }
                 }
               }
             ],
             "returnType" : {
-              "jsValue" : {
+              "string" : {
 
               }
             }
@@ -19015,19 +24347,39 @@
               "isStatic" : false,
               "isThrows" : true
             },
-            "name" : "jsThrowOrVoid",
+            "name" : "jsJoinOptionalStructThenArray",
             "parameters" : [
               {
-                "name" : "shouldThrow",
+                "name" : "a",
                 "type" : {
-                  "bool" : {
-
+                  "nullable" : {
+                    "_0" : {
+                      "swiftStruct" : {
+                        "_0" : "Point"
+                      }
+                    },
+                    "_1" : "null"
+                  }
+                }
+              },
+              {
+                "name" : "b",
+                "type" : {
+                  "array" : {
+                    "_0" : {
+                      "integer" : {
+                        "_0" : {
+                          "isSigned" : true,
+                          "width" : "word"
+                        }
+                      }
+                    }
                   }
                 }
               }
             ],
             "returnType" : {
-              "void" : {
+              "string" : {
 
               }
             }
@@ -19039,19 +24391,34 @@
               "isStatic" : false,
               "isThrows" : true
             },
-            "name" : "jsThrowOrNumber",
+            "name" : "jsJoinEnumThenArray",
             "parameters" : [
               {
-                "name" : "shouldThrow",
+                "name" : "a",
                 "type" : {
-                  "bool" : {
-
+                  "associatedValueEnum" : {
+                    "_0" : "ImportedPayloadSignal"
+                  }
+                }
+              },
+              {
+                "name" : "b",
+                "type" : {
+                  "array" : {
+                    "_0" : {
+                      "integer" : {
+                        "_0" : {
+                          "isSigned" : true,
+                          "width" : "word"
+                        }
+                      }
+                    }
                   }
                 }
               }
             ],
             "returnType" : {
-              "double" : {
+              "string" : {
 
               }
             }
@@ -19063,23 +24430,65 @@
               "isStatic" : false,
               "isThrows" : true
             },
-            "name" : "jsThrowOrBool",
+            "name" : "jsJoinStringThenStackParams",
             "parameters" : [
               {
-                "name" : "shouldThrow",
+                "name" : "s",
                 "type" : {
-                  "bool" : {
+                  "string" : {
 
                   }
                 }
+              },
+              {
+                "name" : "a",
+                "type" : {
+                  "nullable" : {
+                    "_0" : {
+                      "array" : {
+                        "_0" : {
+                          "integer" : {
+                            "_0" : {
+                              "isSigned" : true,
+                              "width" : "word"
+                            }
+                          }
+                        }
+                      }
+                    },
+                    "_1" : "null"
+                  }
+                }
+              },
+              {
+                "name" : "b",
+                "type" : {
+                  "array" : {
+                    "_0" : {
+                      "integer" : {
+                        "_0" : {
+                          "isSigned" : true,
+                          "width" : "word"
+                        }
+                      }
+                    }
+                  }
+                }
               }
             ],
             "returnType" : {
-              "bool" : {
+              "string" : {
 
               }
             }
-          },
+          }
+        ],
+        "types" : [
+
+        ]
+      },
+      {
+        "functions" : [
           {
             "accessLevel" : "internal",
             "effects" : {
@@ -19087,20 +24496,23 @@
               "isStatic" : false,
               "isThrows" : true
             },
-            "name" : "jsThrowOrString",
+            "genericParameters" : [
+              "T"
+            ],
+            "name" : "jsGenericRoundTrip",
             "parameters" : [
               {
-                "name" : "shouldThrow",
+                "name" : "value",
                 "type" : {
-                  "bool" : {
-
+                  "generic" : {
+                    "_0" : "T"
                   }
                 }
               }
             ],
             "returnType" : {
-              "string" : {
-
+              "generic" : {
+                "_0" : "T"
               }
             }
           },
@@ -19111,63 +24523,85 @@
               "isStatic" : false,
               "isThrows" : true
             },
-            "name" : "jsRoundTripFeatureFlag",
+            "genericParameters" : [
+              "T"
+            ],
+            "name" : "jsGenericRoundTripClass",
             "parameters" : [
               {
-                "name" : "flag",
+                "name" : "value",
                 "type" : {
-                  "rawValueEnum" : {
-                    "_0" : "FeatureFlag",
-                    "_1" : "String"
+                  "generic" : {
+                    "_0" : "T"
                   }
                 }
               }
             ],
             "returnType" : {
-              "rawValueEnum" : {
-                "_0" : "FeatureFlag",
-                "_1" : "String"
+              "generic" : {
+                "_0" : "T"
               }
             }
           },
           {
             "accessLevel" : "internal",
             "effects" : {
-              "isAsync" : true,
+              "isAsync" : false,
               "isStatic" : false,
               "isThrows" : true
             },
-            "name" : "runAsyncWorks",
+            "genericParameters" : [
+              "T"
+            ],
+            "name" : "jsGenericParsePoint",
             "parameters" : [
+              {
+                "name" : "json",
+                "type" : {
+                  "string" : {
 
+                  }
+                }
+              }
             ],
             "returnType" : {
-              "void" : {
-
+              "generic" : {
+                "_0" : "T"
               }
             }
           },
           {
             "accessLevel" : "internal",
             "effects" : {
-              "isAsync" : true,
+              "isAsync" : false,
               "isStatic" : false,
               "isThrows" : true
             },
-            "name" : "fetchWeatherData",
+            "genericParameters" : [
+              "T"
+            ],
+            "name" : "jsImportPickFirst",
             "parameters" : [
               {
-                "name" : "city",
+                "name" : "a",
                 "type" : {
-                  "string" : {
-
+                  "generic" : {
+                    "_0" : "T"
+                  }
+                }
+              },
+              {
+                "name" : "b",
+                "type" : {
+                  "generic" : {
+                    "_0" : "T"
                   }
                 }
               }
             ],
             "returnType" : {
-              "jsObject" : {
-                "_0" : "WeatherData"
+              "generic" : {
+                "_0" : "T"
               }
             }
           },
@@ -19178,14 +24612,16 @@
               "isStatic" : false,
               "isThrows" : true
             },
-            "jsName" : "$jsWeirdFunction",
-            "name" : "_jsWeirdFunction",
+            "genericParameters" : [
+              "T"
+            ],
+            "name" : "jsImportMakeInt",
             "parameters" : [
 
             ],
             "returnType" : {
-              "double" : {
-
+              "generic" : {
+                "_0" : "T"
               }
             }
           },
@@ -19196,432 +24632,236 @@
               "isStatic" : false,
               "isThrows" : true
             },
-            "from" : "global",
-            "name" : "parseInt",
-            "parameters" : [
-              {
-                "name" : "string",
-                "type" : {
-                  "string" : {
-
-                  }
-                }
-              }
+            "genericParameters" : [
+              "T",
+              "U"
             ],
-            "returnType" : {
-              "double" : {
-
-              }
-            }
-          }
-        ],
-        "globalGetters" : [
-          {
-            "accessLevel" : "internal",
-            "from" : "global",
-            "name" : "globalObject1",
-            "type" : {
-              "jsValue" : {
-
-              }
-            }
-          }
-        ],
-        "types" : [
-          {
-            "accessLevel" : "internal",
-            "constructor" : {
-              "accessLevel" : "internal",
-              "parameters" : [
-                {
-                  "name" : "name",
-                  "type" : {
-                    "string" : {
-
-                    }
-                  }
-                },
-                {
-                  "name" : "prefix",
-                  "type" : {
-                    "string" : {
-
-                    }
-                  }
-                }
-              ]
-            },
-            "getters" : [
+            "name" : "jsImportCombineSecond",
+            "parameters" : [
               {
-                "accessLevel" : "internal",
-                "name" : "name",
+                "name" : "a",
                 "type" : {
-                  "string" : {
-
+                  "generic" : {
+                    "_0" : "T"
                   }
                 }
               },
               {
-                "accessLevel" : "internal",
-                "name" : "prefix",
+                "name" : "b",
                 "type" : {
-                  "string" : {
-
+                  "generic" : {
+                    "_0" : "U"
                   }
                 }
               }
             ],
-            "methods" : [
-              {
-                "accessLevel" : "internal",
-                "effects" : {
-                  "isAsync" : false,
-                  "isStatic" : false,
-                  "isThrows" : true
-                },
-                "name" : "greet",
-                "parameters" : [
-
-                ],
-                "returnType" : {
-                  "string" : {
-
-                  }
-                }
-              },
-              {
-                "accessLevel" : "internal",
-                "effects" : {
-                  "isAsync" : false,
-                  "isStatic" : false,
-                  "isThrows" : true
-                },
-                "name" : "changeName",
-                "parameters" : [
-                  {
-                    "name" : "name",
-                    "type" : {
-                      "string" : {
-
-                      }
-                    }
-                  }
-                ],
-                "returnType" : {
-                  "void" : {
-
-                  }
-                }
-              }
-            ],
-            "name" : "JsGreeter",
-            "setters" : [
-              {
-                "accessLevel" : "internal",
-                "functionName" : "name_set",
-                "name" : "name",
-                "type" : {
-                  "string" : {
-
-                  }
-                }
+            "returnType" : {
+              "generic" : {
+                "_0" : "U"
               }
-            ],
-            "staticMethods" : [
-
-            ]
+            }
           },
           {
             "accessLevel" : "internal",
-            "getters" : [
-              {
-                "accessLevel" : "internal",
-                "name" : "temperature",
-                "type" : {
-                  "double" : {
-
-                  }
-                }
-              },
-              {
-                "accessLevel" : "internal",
-                "name" : "description",
-                "type" : {
-                  "string" : {
-
-                  }
-                }
-              },
-              {
-                "accessLevel" : "internal",
-                "name" : "humidity",
-                "type" : {
-                  "double" : {
-
-                  }
-                }
-              }
-            ],
-            "methods" : [
-
+            "effects" : {
+              "isAsync" : false,
+              "isStatic" : false,
+              "isThrows" : true
+            },
+            "genericParameters" : [
+              "T"
             ],
-            "name" : "WeatherData",
-            "setters" : [
-              {
-                "accessLevel" : "internal",
-                "functionName" : "temperature_set",
-                "name" : "temperature",
-                "type" : {
-                  "double" : {
-
-                  }
-                }
-              },
-              {
-                "accessLevel" : "internal",
-                "functionName" : "description_set",
-                "name" : "description",
-                "type" : {
-                  "string" : {
-
-                  }
-                }
-              },
+            "name" : "jsGenericArrayRoundTrip",
+            "parameters" : [
               {
-                "accessLevel" : "internal",
-                "functionName" : "humidity_set",
-                "name" : "humidity",
+                "name" : "values",
                 "type" : {
-                  "double" : {
-
+                  "array" : {
+                    "_0" : {
+                      "generic" : {
+                        "_0" : "T"
+                      }
+                    }
                   }
                 }
               }
             ],
-            "staticMethods" : [
-
-            ]
+            "returnType" : {
+              "array" : {
+                "_0" : {
+                  "generic" : {
+                    "_0" : "T"
+                  }
+                }
+              }
+            }
           },
           {
             "accessLevel" : "internal",
-            "constructor" : {
-              "accessLevel" : "internal",
-              "parameters" : [
-
-              ]
+            "effects" : {
+              "isAsync" : false,
+              "isStatic" : false,
+              "isThrows" : true
             },
-            "getters" : [
-
+            "genericParameters" : [
+              "T"
             ],
-            "jsName" : "$WeirdClass",
-            "methods" : [
+            "name" : "jsGenericOptionalRoundTrip",
+            "parameters" : [
               {
-                "accessLevel" : "internal",
-                "effects" : {
-                  "isAsync" : false,
-                  "isStatic" : false,
-                  "isThrows" : true
-                },
-                "jsName" : "method-with-dashes",
-                "name" : "method_with_dashes",
-                "parameters" : [
-
-                ],
-                "returnType" : {
-                  "string" : {
-
+                "name" : "value",
+                "type" : {
+                  "nullable" : {
+                    "_0" : {
+                      "generic" : {
+                        "_0" : "T"
+                      }
+                    },
+                    "_1" : "null"
                   }
                 }
               }
             ],
-            "name" : "_WeirdClass",
-            "setters" : [
-
-            ],
-            "staticMethods" : [
-
-            ]
+            "returnType" : {
+              "nullable" : {
+                "_0" : {
+                  "generic" : {
+                    "_0" : "T"
+                  }
+                },
+                "_1" : "null"
+              }
+            }
           },
           {
             "accessLevel" : "internal",
-            "constructor" : {
-              "accessLevel" : "internal",
-              "parameters" : [
-                {
-                  "name" : "value",
-                  "type" : {
-                    "double" : {
-
-                    }
-                  }
-                }
-              ]
+            "effects" : {
+              "isAsync" : false,
+              "isStatic" : false,
+              "isThrows" : true
             },
-            "getters" : [
-
+            "genericParameters" : [
+              "T"
             ],
-            "methods" : [
+            "name" : "jsGenericDictRoundTrip",
+            "parameters" : [
               {
-                "accessLevel" : "internal",
-                "effects" : {
-                  "isAsync" : false,
-                  "isStatic" : false,
-                  "isThrows" : true
-                },
-                "name" : "value",
-                "parameters" : [
-
-                ],
-                "returnType" : {
-                  "double" : {
-
+                "name" : "values",
+                "type" : {
+                  "dictionary" : {
+                    "_0" : {
+                      "generic" : {
+                        "_0" : "T"
+                      }
+                    }
                   }
                 }
               }
             ],
-            "name" : "StaticBox",
-            "setters" : [
-
+            "returnType" : {
+              "dictionary" : {
+                "_0" : {
+                  "generic" : {
+                    "_0" : "T"
+                  }
+                }
+              }
+            }
+          },
+          {
+            "accessLevel" : "internal",
+            "effects" : {
+              "isAsync" : false,
+              "isStatic" : false,
+              "isThrows" : true
+            },
+            "genericParameters" : [
+              "T"
             ],
-            "staticMethods" : [
+            "name" : "jsGenericAfterOptionalArray",
+            "parameters" : [
               {
-                "accessLevel" : "internal",
-                "effects" : {
-                  "isAsync" : false,
-                  "isStatic" : false,
-                  "isThrows" : true
-                },
-                "name" : "create",
-                "parameters" : [
-                  {
-                    "name" : "value",
-                    "type" : {
-                      "double" : {
-
+                "name" : "values",
+                "type" : {
+                  "nullable" : {
+                    "_0" : {
+                      "array" : {
+                        "_0" : {
+                          "integer" : {
+                            "_0" : {
+                              "isSigned" : true,
+                              "width" : "word"
+                            }
+                          }
+                        }
                       }
-                    }
-                  }
-                ],
-                "returnType" : {
-                  "jsObject" : {
-                    "_0" : "StaticBox"
+                    },
+                    "_1" : "null"
                   }
                 }
               },
               {
-                "accessLevel" : "internal",
-                "effects" : {
-                  "isAsync" : false,
-                  "isStatic" : false,
-                  "isThrows" : true
-                },
                 "name" : "value",
-                "parameters" : [
-
-                ],
-                "returnType" : {
-                  "double" : {
-
-                  }
-                }
-              },
-              {
-                "accessLevel" : "internal",
-                "effects" : {
-                  "isAsync" : false,
-                  "isStatic" : false,
-                  "isThrows" : true
-                },
-                "name" : "makeDefault",
-                "parameters" : [
-
-                ],
-                "returnType" : {
-                  "jsObject" : {
-                    "_0" : "StaticBox"
+                "type" : {
+                  "generic" : {
+                    "_0" : "T"
                   }
                 }
-              },
-              {
-                "accessLevel" : "internal",
-                "effects" : {
-                  "isAsync" : false,
-                  "isStatic" : false,
-                  "isThrows" : true
-                },
-                "jsName" : "with-dashes",
-                "name" : "with_dashes",
-                "parameters" : [
+              }
+            ],
+            "returnType" : {
+              "string" : {
 
-                ],
-                "returnType" : {
-                  "jsObject" : {
-                    "_0" : "StaticBox"
-                  }
-                }
               }
-            ]
+            }
           },
           {
             "accessLevel" : "internal",
-            "constructor" : {
-              "accessLevel" : "internal",
-              "parameters" : [
-                {
-                  "name" : "name",
-                  "type" : {
-                    "string" : {
-
-                    }
-                  }
-                },
-                {
-                  "name" : "age",
-                  "type" : {
-                    "double" : {
-
-                    }
-                  }
-                },
-                {
-                  "name" : "isCat",
-                  "type" : {
-                    "bool" : {
-
-                    }
-                  }
-                }
-              ]
+            "effects" : {
+              "isAsync" : false,
+              "isStatic" : false,
+              "isThrows" : true
             },
-            "from" : "global",
-            "getters" : [
-              {
-                "accessLevel" : "internal",
-                "name" : "name",
-                "type" : {
-                  "string" : {
-
-                  }
-                }
-              },
+            "genericParameters" : [
+              "T"
+            ],
+            "name" : "jsGenericThrowOrRoundTrip",
+            "parameters" : [
               {
-                "accessLevel" : "internal",
-                "name" : "age",
+                "name" : "shouldThrow",
                 "type" : {
-                  "double" : {
+                  "bool" : {
 
                   }
                 }
               },
               {
-                "accessLevel" : "internal",
-                "name" : "isCat",
+                "name" : "value",
                 "type" : {
-                  "bool" : {
-
+                  "generic" : {
+                    "_0" : "T"
                   }
                 }
               }
+            ],
+            "returnType" : {
+              "generic" : {
+                "_0" : "T"
+              }
+            }
+          }
+        ],
+        "types" : [
+          {
+            "accessLevel" : "internal",
+            "constructor" : {
+              "accessLevel" : "internal",
+              "parameters" : [
+
+              ]
+            },
+            "getters" : [
+
             ],
             "methods" : [
               {
@@ -19631,16 +24871,32 @@
                   "isStatic" : false,
                   "isThrows" : true
                 },
-                "name" : "bark",
+                "genericParameters" : [
+                  "T"
+                ],
+                "name" : "identity",
                 "parameters" : [
-
+                  {
+                    "name" : "value",
+                    "type" : {
+                      "generic" : {
+                        "_0" : "T"
+                      }
+                    }
+                  }
                 ],
                 "returnType" : {
-                  "string" : {
-
+                  "generic" : {
+                    "_0" : "T"
                   }
                 }
-              },
+              }
+            ],
+            "name" : "ImportGenericConsumer",
+            "setters" : [
+
+            ],
+            "staticMethods" : [
               {
                 "accessLevel" : "internal",
                 "effects" : {
@@ -19648,49 +24904,74 @@
                   "isStatic" : false,
                   "isThrows" : true
                 },
-                "name" : "getIsCat",
+                "genericParameters" : [
+                  "T"
+                ],
+                "name" : "box",
                 "parameters" : [
-
+                  {
+                    "name" : "value",
+                    "type" : {
+                      "generic" : {
+                        "_0" : "T"
+                      }
+                    }
+                  }
                 ],
                 "returnType" : {
-                  "bool" : {
-
+                  "generic" : {
+                    "_0" : "T"
                   }
                 }
               }
-            ],
-            "name" : "Animal",
-            "setters" : [
-              {
-                "accessLevel" : "internal",
-                "functionName" : "name_set",
-                "name" : "name",
-                "type" : {
-                  "string" : {
-
+            ]
+          },
+          {
+            "accessLevel" : "internal",
+            "constructor" : {
+              "accessLevel" : "internal",
+              "genericParameters" : [
+                "T"
+              ],
+              "parameters" : [
+                {
+                  "name" : "value",
+                  "type" : {
+                    "generic" : {
+                      "_0" : "T"
+                    }
                   }
                 }
-              },
-              {
-                "accessLevel" : "internal",
-                "functionName" : "age_set",
-                "name" : "age",
-                "type" : {
-                  "double" : {
+              ]
+            },
+            "getters" : [
 
-                  }
-                }
-              },
+            ],
+            "methods" : [
               {
                 "accessLevel" : "internal",
-                "functionName" : "isCat_set",
-                "name" : "isCat",
-                "type" : {
-                  "bool" : {
+                "effects" : {
+                  "isAsync" : false,
+                  "isStatic" : false,
+                  "isThrows" : true
+                },
+                "genericParameters" : [
+                  "T"
+                ],
+                "name" : "unwrap",
+                "parameters" : [
 
+                ],
+                "returnType" : {
+                  "generic" : {
+                    "_0" : "T"
                   }
                 }
               }
+            ],
+            "name" : "ImportGenericBoxed",
+            "setters" : [
+
             ],
             "staticMethods" : [
 
@@ -19745,6 +25026,40 @@
                 "_0" : "Point"
               }
             }
+          },
+          {
+            "accessLevel" : "internal",
+            "effects" : {
+              "isAsync" : false,
+              "isStatic" : false,
+              "isThrows" : true
+            },
+            "name" : "jsRoundTripOptionalPoint",
+            "parameters" : [
+              {
+                "name" : "point",
+                "type" : {
+                  "nullable" : {
+                    "_0" : {
+                      "swiftStruct" : {
+                        "_0" : "Point"
+                      }
+                    },
+                    "_1" : "null"
+                  }
+                }
+              }
+            ],
+            "returnType" : {
+              "nullable" : {
+                "_0" : {
+                  "swiftStruct" : {
+                    "_0" : "Point"
+                  }
+                },
+                "_1" : "null"
+              }
+            }
           }
         ],
         "types" : [
@@ -19776,7 +25091,127 @@
                   "isStatic" : false,
                   "isThrows" : true
                 },
-                "name" : "jsRoundTripInt",
+                "name" : "jsRoundTripInt",
+                "parameters" : [
+                  {
+                    "name" : "v",
+                    "type" : {
+                      "integer" : {
+                        "_0" : {
+                          "isSigned" : true,
+                          "width" : "word"
+                        }
+                      }
+                    }
+                  }
+                ],
+                "returnType" : {
+                  "integer" : {
+                    "_0" : {
+                      "isSigned" : true,
+                      "width" : "word"
+                    }
+                  }
+                }
+              },
+              {
+                "accessLevel" : "internal",
+                "effects" : {
+                  "isAsync" : false,
+                  "isStatic" : false,
+                  "isThrows" : true
+                },
+                "name" : "jsRoundTripUInt",
+                "parameters" : [
+                  {
+                    "name" : "v",
+                    "type" : {
+                      "integer" : {
+                        "_0" : {
+                          "isSigned" : false,
+                          "width" : "word"
+                        }
+                      }
+                    }
+                  }
+                ],
+                "returnType" : {
+                  "integer" : {
+                    "_0" : {
+                      "isSigned" : false,
+                      "width" : "word"
+                    }
+                  }
+                }
+              },
+              {
+                "accessLevel" : "internal",
+                "effects" : {
+                  "isAsync" : false,
+                  "isStatic" : false,
+                  "isThrows" : true
+                },
+                "name" : "jsRoundTripInt8",
+                "parameters" : [
+                  {
+                    "name" : "v",
+                    "type" : {
+                      "integer" : {
+                        "_0" : {
+                          "isSigned" : true,
+                          "width" : "w8"
+                        }
+                      }
+                    }
+                  }
+                ],
+                "returnType" : {
+                  "integer" : {
+                    "_0" : {
+                      "isSigned" : true,
+                      "width" : "w8"
+                    }
+                  }
+                }
+              },
+              {
+                "accessLevel" : "internal",
+                "effects" : {
+                  "isAsync" : false,
+                  "isStatic" : false,
+                  "isThrows" : true
+                },
+                "name" : "jsRoundTripUInt8",
+                "parameters" : [
+                  {
+                    "name" : "v",
+                    "type" : {
+                      "integer" : {
+                        "_0" : {
+                          "isSigned" : false,
+                          "width" : "w8"
+                        }
+                      }
+                    }
+                  }
+                ],
+                "returnType" : {
+                  "integer" : {
+                    "_0" : {
+                      "isSigned" : false,
+                      "width" : "w8"
+                    }
+                  }
+                }
+              },
+              {
+                "accessLevel" : "internal",
+                "effects" : {
+                  "isAsync" : false,
+                  "isStatic" : false,
+                  "isThrows" : true
+                },
+                "name" : "jsRoundTripInt16",
                 "parameters" : [
                   {
                     "name" : "v",
@@ -19784,7 +25219,7 @@
                       "integer" : {
                         "_0" : {
                           "isSigned" : true,
-                          "width" : "word"
+                          "width" : "w16"
                         }
                       }
                     }
@@ -19794,7 +25229,7 @@
                   "integer" : {
                     "_0" : {
                       "isSigned" : true,
-                      "width" : "word"
+                      "width" : "w16"
                     }
                   }
                 }
@@ -19806,7 +25241,7 @@
                   "isStatic" : false,
                   "isThrows" : true
                 },
-                "name" : "jsRoundTripUInt",
+                "name" : "jsRoundTripUInt16",
                 "parameters" : [
                   {
                     "name" : "v",
@@ -19814,7 +25249,7 @@
                       "integer" : {
                         "_0" : {
                           "isSigned" : false,
-                          "width" : "word"
+                          "width" : "w16"
                         }
                       }
                     }
@@ -19824,7 +25259,7 @@
                   "integer" : {
                     "_0" : {
                       "isSigned" : false,
-                      "width" : "word"
+                      "width" : "w16"
                     }
                   }
                 }
@@ -19836,7 +25271,7 @@
                   "isStatic" : false,
                   "isThrows" : true
                 },
-                "name" : "jsRoundTripInt8",
+                "name" : "jsRoundTripInt32",
                 "parameters" : [
                   {
                     "name" : "v",
@@ -19844,7 +25279,7 @@
                       "integer" : {
                         "_0" : {
                           "isSigned" : true,
-                          "width" : "w8"
+                          "width" : "w32"
                         }
                       }
                     }
@@ -19854,7 +25289,7 @@
                   "integer" : {
                     "_0" : {
                       "isSigned" : true,
-                      "width" : "w8"
+                      "width" : "w32"
                     }
                   }
                 }
@@ -19866,7 +25301,7 @@
                   "isStatic" : false,
                   "isThrows" : true
                 },
-                "name" : "jsRoundTripUInt8",
+                "name" : "jsRoundTripUInt32",
                 "parameters" : [
                   {
                     "name" : "v",
@@ -19874,7 +25309,7 @@
                       "integer" : {
                         "_0" : {
                           "isSigned" : false,
-                          "width" : "w8"
+                          "width" : "w32"
                         }
                       }
                     }
@@ -19884,7 +25319,7 @@
                   "integer" : {
                     "_0" : {
                       "isSigned" : false,
-                      "width" : "w8"
+                      "width" : "w32"
                     }
                   }
                 }
@@ -19896,7 +25331,7 @@
                   "isStatic" : false,
                   "isThrows" : true
                 },
-                "name" : "jsRoundTripInt16",
+                "name" : "jsRoundTripInt64",
                 "parameters" : [
                   {
                     "name" : "v",
@@ -19904,7 +25339,7 @@
                       "integer" : {
                         "_0" : {
                           "isSigned" : true,
-                          "width" : "w16"
+                          "width" : "w64"
                         }
                       }
                     }
@@ -19914,7 +25349,7 @@
                   "integer" : {
                     "_0" : {
                       "isSigned" : true,
-                      "width" : "w16"
+                      "width" : "w64"
                     }
                   }
                 }
@@ -19926,7 +25361,7 @@
                   "isStatic" : false,
                   "isThrows" : true
                 },
-                "name" : "jsRoundTripUInt16",
+                "name" : "jsRoundTripUInt64",
                 "parameters" : [
                   {
                     "name" : "v",
@@ -19934,7 +25369,7 @@
                       "integer" : {
                         "_0" : {
                           "isSigned" : false,
-                          "width" : "w16"
+                          "width" : "w64"
                         }
                       }
                     }
@@ -19944,7 +25379,7 @@
                   "integer" : {
                     "_0" : {
                       "isSigned" : false,
-                      "width" : "w16"
+                      "width" : "w64"
                     }
                   }
                 }
@@ -19956,29 +25391,241 @@
                   "isStatic" : false,
                   "isThrows" : true
                 },
-                "name" : "jsRoundTripInt32",
+                "name" : "runJsIntegerTypesSupportTests",
+                "parameters" : [
+
+                ],
+                "returnType" : {
+                  "void" : {
+
+                  }
+                }
+              }
+            ]
+          }
+        ]
+      },
+      {
+        "functions" : [
+
+        ],
+        "types" : [
+          {
+            "accessLevel" : "internal",
+            "constructor" : {
+              "accessLevel" : "internal",
+              "parameters" : [
+                {
+                  "name" : "numbers",
+                  "type" : {
+                    "array" : {
+                      "_0" : {
+                        "integer" : {
+                          "_0" : {
+                            "isSigned" : true,
+                            "width" : "word"
+                          }
+                        }
+                      }
+                    }
+                  }
+                },
+                {
+                  "name" : "labels",
+                  "type" : {
+                    "array" : {
+                      "_0" : {
+                        "string" : {
+
+                        }
+                      }
+                    }
+                  }
+                }
+              ]
+            },
+            "getters" : [
+              {
+                "accessLevel" : "internal",
+                "name" : "numbers",
+                "type" : {
+                  "array" : {
+                    "_0" : {
+                      "integer" : {
+                        "_0" : {
+                          "isSigned" : true,
+                          "width" : "word"
+                        }
+                      }
+                    }
+                  }
+                }
+              },
+              {
+                "accessLevel" : "internal",
+                "name" : "labels",
+                "type" : {
+                  "array" : {
+                    "_0" : {
+                      "string" : {
+
+                      }
+                    }
+                  }
+                }
+              }
+            ],
+            "methods" : [
+              {
+                "accessLevel" : "internal",
+                "effects" : {
+                  "isAsync" : false,
+                  "isStatic" : false,
+                  "isThrows" : true
+                },
+                "name" : "concatNumbers",
                 "parameters" : [
                   {
-                    "name" : "v",
+                    "name" : "values",
                     "type" : {
+                      "array" : {
+                        "_0" : {
+                          "integer" : {
+                            "_0" : {
+                              "isSigned" : true,
+                              "width" : "word"
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                ],
+                "returnType" : {
+                  "array" : {
+                    "_0" : {
                       "integer" : {
                         "_0" : {
                           "isSigned" : true,
-                          "width" : "w32"
+                          "width" : "word"
+                        }
+                      }
+                    }
+                  }
+                }
+              },
+              {
+                "accessLevel" : "internal",
+                "effects" : {
+                  "isAsync" : false,
+                  "isStatic" : false,
+                  "isThrows" : true
+                },
+                "name" : "concatLabels",
+                "parameters" : [
+                  {
+                    "name" : "values",
+                    "type" : {
+                      "array" : {
+                        "_0" : {
+                          "string" : {
+
+                          }
                         }
                       }
                     }
                   }
                 ],
                 "returnType" : {
-                  "integer" : {
+                  "array" : {
                     "_0" : {
-                      "isSigned" : true,
-                      "width" : "w32"
+                      "string" : {
+
+                      }
+                    }
+                  }
+                }
+              },
+              {
+                "accessLevel" : "internal",
+                "effects" : {
+                  "isAsync" : false,
+                  "isStatic" : false,
+                  "isThrows" : true
+                },
+                "name" : "firstLabel",
+                "parameters" : [
+                  {
+                    "name" : "values",
+                    "type" : {
+                      "array" : {
+                        "_0" : {
+                          "string" : {
+
+                          }
+                        }
+                      }
+                    }
+                  }
+                ],
+                "returnType" : {
+                  "string" : {
+
+                  }
+                }
+              }
+            ],
+            "name" : "JSClassWithArrayMembers",
+            "setters" : [
+              {
+                "accessLevel" : "internal",
+                "functionName" : "numbers_set",
+                "name" : "numbers",
+                "type" : {
+                  "array" : {
+                    "_0" : {
+                      "integer" : {
+                        "_0" : {
+                          "isSigned" : true,
+                          "width" : "word"
+                        }
+                      }
                     }
                   }
                 }
               },
+              {
+                "accessLevel" : "internal",
+                "functionName" : "labels_set",
+                "name" : "labels",
+                "type" : {
+                  "array" : {
+                    "_0" : {
+                      "string" : {
+
+                      }
+                    }
+                  }
+                }
+              }
+            ],
+            "staticMethods" : [
+
+            ]
+          },
+          {
+            "accessLevel" : "internal",
+            "getters" : [
+
+            ],
+            "methods" : [
+
+            ],
+            "name" : "JSClassSupportImports",
+            "setters" : [
+
+            ],
+            "staticMethods" : [
               {
                 "accessLevel" : "internal",
                 "effects" : {
@@ -19986,51 +25633,156 @@
                   "isStatic" : false,
                   "isThrows" : true
                 },
-                "name" : "jsRoundTripUInt32",
+                "name" : "makeJSClassWithArrayMembers",
                 "parameters" : [
                   {
-                    "name" : "v",
+                    "name" : "numbers",
                     "type" : {
-                      "integer" : {
+                      "array" : {
                         "_0" : {
-                          "isSigned" : false,
-                          "width" : "w32"
+                          "integer" : {
+                            "_0" : {
+                              "isSigned" : true,
+                              "width" : "word"
+                            }
+                          }
                         }
                       }
                     }
-                  }
-                ],
-                "returnType" : {
-                  "integer" : {
-                    "_0" : {
-                      "isSigned" : false,
-                      "width" : "w32"
-                    }
-                  }
-                }
-              },
-              {
-                "accessLevel" : "internal",
-                "effects" : {
-                  "isAsync" : false,
-                  "isStatic" : false,
-                  "isThrows" : true
-                },
-                "name" : "jsRoundTripInt64",
-                "parameters" : [
+                  },
                   {
-                    "name" : "v",
+                    "name" : "labels",
                     "type" : {
-                      "integer" : {
+                      "array" : {
                         "_0" : {
-                          "isSigned" : true,
-                          "width" : "w64"
+                          "string" : {
+
+                          }
                         }
                       }
                     }
                   }
                 ],
                 "returnType" : {
+                  "jsObject" : {
+                    "_0" : "JSClassWithArrayMembers"
+                  }
+                }
+              }
+            ]
+          }
+        ]
+      },
+      {
+        "functions" : [
+          {
+            "accessLevel" : "internal",
+            "effects" : {
+              "isAsync" : false,
+              "isStatic" : false,
+              "isThrows" : true
+            },
+            "from" : {
+              "kind" : "module",
+              "specifier" : "node:path"
+            },
+            "jsName" : "basename",
+            "name" : "nodeBasename",
+            "parameters" : [
+              {
+                "name" : "path",
+                "type" : {
+                  "string" : {
+
+                  }
+                }
+              }
+            ],
+            "returnType" : {
+              "string" : {
+
+              }
+            }
+          },
+          {
+            "accessLevel" : "internal",
+            "effects" : {
+              "isAsync" : false,
+              "isStatic" : false,
+              "isThrows" : true
+            },
+            "from" : {
+              "kind" : "module",
+              "specifier" : "node:path"
+            },
+            "jsName" : "join",
+            "name" : "nodeJoin",
+            "parameters" : [
+              {
+                "name" : "lhs",
+                "type" : {
+                  "string" : {
+
+                  }
+                }
+              },
+              {
+                "name" : "rhs",
+                "type" : {
+                  "string" : {
+
+                  }
+                }
+              }
+            ],
+            "returnType" : {
+              "string" : {
+
+              }
+            }
+          }
+        ],
+        "globalGetters" : [
+          {
+            "accessLevel" : "internal",
+            "from" : {
+              "kind" : "snippet",
+              "path" : "\/Modules\/DefaultExport.mjs"
+            },
+            "jsName" : "default",
+            "name" : "defaultExport",
+            "type" : {
+              "jsObject" : {
+
+              }
+            }
+          }
+        ],
+        "types" : [
+          {
+            "accessLevel" : "internal",
+            "constructor" : {
+              "accessLevel" : "internal",
+              "parameters" : [
+                {
+                  "name" : "data",
+                  "type" : {
+                    "jsObject" : {
+
+                    }
+                  }
+                }
+              ]
+            },
+            "from" : {
+              "kind" : "module",
+              "specifier" : "@bjorn3\/browser_wasi_shim"
+            },
+            "getters" : [
+              {
+                "accessLevel" : "internal",
+                "name" : "size",
+                "type" : {
                   "integer" : {
                     "_0" : {
                       "isSigned" : true,
@@ -20038,61 +25790,128 @@
                     }
                   }
                 }
-              },
+              }
+            ],
+            "jsName" : "File",
+            "methods" : [
+
+            ],
+            "name" : "WasiFile",
+            "setters" : [
+
+            ],
+            "staticMethods" : [
+
+            ]
+          }
+        ]
+      },
+      {
+        "functions" : [
+          {
+            "accessLevel" : "internal",
+            "effects" : {
+              "isAsync" : false,
+              "isStatic" : false,
+              "isThrows" : true
+            },
+            "from" : {
+              "kind" : "snippet",
+              "path" : "\/Modules\/JSImportModule.mjs"
+            },
+            "name" : "moduleAdd",
+            "parameters" : [
               {
-                "accessLevel" : "internal",
-                "effects" : {
-                  "isAsync" : false,
-                  "isStatic" : false,
-                  "isThrows" : true
-                },
-                "name" : "jsRoundTripUInt64",
-                "parameters" : [
-                  {
-                    "name" : "v",
-                    "type" : {
-                      "integer" : {
-                        "_0" : {
-                          "isSigned" : false,
-                          "width" : "w64"
-                        }
-                      }
-                    }
-                  }
-                ],
-                "returnType" : {
+                "name" : "lhs",
+                "type" : {
                   "integer" : {
                     "_0" : {
-                      "isSigned" : false,
-                      "width" : "w64"
+                      "isSigned" : true,
+                      "width" : "word"
                     }
                   }
                 }
               },
               {
-                "accessLevel" : "internal",
-                "effects" : {
-                  "isAsync" : false,
-                  "isStatic" : false,
-                  "isThrows" : true
-                },
-                "name" : "runJsIntegerTypesSupportTests",
-                "parameters" : [
-
-                ],
-                "returnType" : {
-                  "void" : {
-
+                "name" : "rhs",
+                "type" : {
+                  "integer" : {
+                    "_0" : {
+                      "isSigned" : true,
+                      "width" : "word"
+                    }
                   }
                 }
               }
-            ]
+            ],
+            "returnType" : {
+              "integer" : {
+                "_0" : {
+                  "isSigned" : true,
+                  "width" : "word"
+                }
+              }
+            }
+          },
+          {
+            "accessLevel" : "internal",
+            "effects" : {
+              "isAsync" : false,
+              "isStatic" : false,
+              "isThrows" : true
+            },
+            "from" : {
+              "kind" : "snippet",
+              "path" : "\/Modules\/JSImportModule.mjs"
+            },
+            "jsName" : "renamedFunction",
+            "name" : "moduleRenamed",
+            "parameters" : [
+
+            ],
+            "returnType" : {
+              "string" : {
+
+              }
+            }
+          },
+          {
+            "accessLevel" : "internal",
+            "effects" : {
+              "isAsync" : false,
+              "isStatic" : false,
+              "isThrows" : true
+            },
+            "from" : {
+              "kind" : "snippet",
+              "path" : "\/Modules\/JSImportModule.mjs"
+            },
+            "name" : "moduleThrow",
+            "parameters" : [
+
+            ],
+            "returnType" : {
+              "void" : {
+
+              }
+            }
           }
-        ]
-      },
-      {
-        "functions" : [
+        ],
+        "globalGetters" : [
+          {
+            "accessLevel" : "internal",
+            "from" : {
+              "kind" : "snippet",
+              "path" : "\/Modules\/JSImportModule.mjs"
+            },
+            "jsName" : "version",
+            "name" : "moduleVersion",
+            "type" : {
+              "string" : {
 
+              }
+            }
+          }
         ],
         "types" : [
           {
@@ -20101,60 +25920,31 @@
               "accessLevel" : "internal",
               "parameters" : [
                 {
-                  "name" : "numbers",
-                  "type" : {
-                    "array" : {
-                      "_0" : {
-                        "integer" : {
-                          "_0" : {
-                            "isSigned" : true,
-                            "width" : "word"
-                          }
-                        }
-                      }
-                    }
-                  }
-                },
-                {
-                  "name" : "labels",
+                  "name" : "value",
                   "type" : {
-                    "array" : {
+                    "integer" : {
                       "_0" : {
-                        "string" : {
-
-                        }
+                        "isSigned" : true,
+                        "width" : "word"
                       }
                     }
                   }
                 }
               ]
             },
+            "from" : {
+              "kind" : "snippet",
+              "path" : "\/Modules\/ModuleCounter.mjs"
+            },
             "getters" : [
               {
                 "accessLevel" : "internal",
-                "name" : "numbers",
-                "type" : {
-                  "array" : {
-                    "_0" : {
-                      "integer" : {
-                        "_0" : {
-                          "isSigned" : true,
-                          "width" : "word"
-                        }
-                      }
-                    }
-                  }
-                }
-              },
-              {
-                "accessLevel" : "internal",
-                "name" : "labels",
+                "name" : "value",
                 "type" : {
-                  "array" : {
+                  "integer" : {
                     "_0" : {
-                      "string" : {
-
-                      }
+                      "isSigned" : true,
+                      "width" : "word"
                     }
                   }
                 }
@@ -20168,147 +25958,35 @@
                   "isStatic" : false,
                   "isThrows" : true
                 },
-                "name" : "concatNumbers",
-                "parameters" : [
-                  {
-                    "name" : "values",
-                    "type" : {
-                      "array" : {
-                        "_0" : {
-                          "integer" : {
-                            "_0" : {
-                              "isSigned" : true,
-                              "width" : "word"
-                            }
-                          }
-                        }
-                      }
-                    }
-                  }
-                ],
-                "returnType" : {
-                  "array" : {
-                    "_0" : {
-                      "integer" : {
-                        "_0" : {
-                          "isSigned" : true,
-                          "width" : "word"
-                        }
-                      }
-                    }
-                  }
-                }
-              },
-              {
-                "accessLevel" : "internal",
-                "effects" : {
-                  "isAsync" : false,
-                  "isStatic" : false,
-                  "isThrows" : true
-                },
-                "name" : "concatLabels",
+                "name" : "increment",
                 "parameters" : [
-                  {
-                    "name" : "values",
-                    "type" : {
-                      "array" : {
-                        "_0" : {
-                          "string" : {
 
-                          }
-                        }
-                      }
-                    }
-                  }
                 ],
                 "returnType" : {
-                  "array" : {
+                  "integer" : {
                     "_0" : {
-                      "string" : {
-
-                      }
-                    }
-                  }
-                }
-              },
-              {
-                "accessLevel" : "internal",
-                "effects" : {
-                  "isAsync" : false,
-                  "isStatic" : false,
-                  "isThrows" : true
-                },
-                "name" : "firstLabel",
-                "parameters" : [
-                  {
-                    "name" : "values",
-                    "type" : {
-                      "array" : {
-                        "_0" : {
-                          "string" : {
-
-                          }
-                        }
-                      }
+                      "isSigned" : true,
+                      "width" : "word"
                     }
                   }
-                ],
-                "returnType" : {
-                  "string" : {
-
-                  }
                 }
               }
             ],
-            "name" : "JSClassWithArrayMembers",
+            "name" : "ModuleCounter",
             "setters" : [
               {
                 "accessLevel" : "internal",
-                "functionName" : "numbers_set",
-                "name" : "numbers",
-                "type" : {
-                  "array" : {
-                    "_0" : {
-                      "integer" : {
-                        "_0" : {
-                          "isSigned" : true,
-                          "width" : "word"
-                        }
-                      }
-                    }
-                  }
-                }
-              },
-              {
-                "accessLevel" : "internal",
-                "functionName" : "labels_set",
-                "name" : "labels",
+                "functionName" : "value_set",
+                "name" : "value",
                 "type" : {
-                  "array" : {
+                  "integer" : {
                     "_0" : {
-                      "string" : {
-
-                      }
+                      "isSigned" : true,
+                      "width" : "word"
                     }
                   }
                 }
               }
-            ],
-            "staticMethods" : [
-
-            ]
-          },
-          {
-            "accessLevel" : "internal",
-            "getters" : [
-
-            ],
-            "methods" : [
-
-            ],
-            "name" : "JSClassSupportImports",
-            "setters" : [
-
             ],
             "staticMethods" : [
               {
@@ -20318,31 +25996,15 @@
                   "isStatic" : false,
                   "isThrows" : true
                 },
-                "name" : "makeJSClassWithArrayMembers",
+                "name" : "create",
                 "parameters" : [
                   {
-                    "name" : "numbers",
-                    "type" : {
-                      "array" : {
-                        "_0" : {
-                          "integer" : {
-                            "_0" : {
-                              "isSigned" : true,
-                              "width" : "word"
-                            }
-                          }
-                        }
-                      }
-                    }
-                  },
-                  {
-                    "name" : "labels",
+                    "name" : "value",
                     "type" : {
-                      "array" : {
+                      "integer" : {
                         "_0" : {
-                          "string" : {
-
-                          }
+                          "isSigned" : true,
+                          "width" : "word"
                         }
                       }
                     }
@@ -20350,7 +26012,7 @@
                 ],
                 "returnType" : {
                   "jsObject" : {
-                    "_0" : "JSClassWithArrayMembers"
+                    "_0" : "ModuleCounter"
                   }
                 }
               }
@@ -21012,6 +26674,40 @@
                   }
                 }
               },
+              {
+                "accessLevel" : "internal",
+                "effects" : {
+                  "isAsync" : false,
+                  "isStatic" : false,
+                  "isThrows" : true
+                },
+                "name" : "jsRoundTripOptionalJSObjectNull",
+                "parameters" : [
+                  {
+                    "name" : "value",
+                    "type" : {
+                      "nullable" : {
+                        "_0" : {
+                          "jsObject" : {
+
+                          }
+                        },
+                        "_1" : "null"
+                      }
+                    }
+                  }
+                ],
+                "returnType" : {
+                  "nullable" : {
+                    "_0" : {
+                      "jsObject" : {
+
+                      }
+                    },
+                    "_1" : "null"
+                  }
+                }
+              },
               {
                 "accessLevel" : "internal",
                 "effects" : {
diff --git a/Tests/BridgeJSRuntimeTests/ImportAPITests.swift b/Tests/BridgeJSRuntimeTests/ImportAPITests.swift
index 8f02af2ef..c98ab3e61 100644
--- a/Tests/BridgeJSRuntimeTests/ImportAPITests.swift
+++ b/Tests/BridgeJSRuntimeTests/ImportAPITests.swift
@@ -1,6 +1,36 @@
 import XCTest
 import JavaScriptKit
 
+@JS enum LightColor {
+    case red
+    case yellow
+    case green
+}
+
+@JS enum ImportedPayloadSignal: Equatable {
+    case start(String)
+    case stop(Int)
+    case idle
+}
+
+@JSFunction func jsRoundTripLightColor(_ value: LightColor) throws(JSException) -> LightColor
+@JSFunction func jsRoundTripImportedPayloadSignal(
+    _ value: ImportedPayloadSignal
+) throws(JSException) -> ImportedPayloadSignal
+@JSFunction func jsRoundTripOptionalImportedPayloadSignal(
+    _ value: ImportedPayloadSignal?
+) throws(JSException) -> ImportedPayloadSignal?
+
+// Parameters that push onto the shared stacks must arrive in declaration order.
+@JSFunction func jsJoinOptionalArrayThenArray(_ a: [Int]?, _ b: [Int]) throws(JSException) -> String
+@JSFunction func jsJoinOptionalStructThenArray(_ a: Point?, _ b: [Int]) throws(JSException) -> String
+@JSFunction func jsJoinEnumThenArray(_ a: ImportedPayloadSignal, _ b: [Int]) throws(JSException) -> String
+@JSFunction func jsJoinStringThenStackParams(
+    _ s: String,
+    _ a: [Int]?,
+    _ b: [Int]
+) throws(JSException) -> String
+
 class ImportAPITests: XCTestCase {
     func testRoundTripVoid() throws {
         try jsRoundTripVoid()
@@ -59,6 +89,42 @@ class ImportAPITests: XCTestCase {
         }
     }
 
+    func testRoundTripOptionalStruct() throws {
+        let p = try jsRoundTripOptionalPoint(Point(x: 3, y: 4))
+        XCTAssertEqual(p?.x, 3)
+        XCTAssertEqual(p?.y, 4)
+        XCTAssertNil(try jsRoundTripOptionalPoint(nil))
+    }
+
+    func testRoundTripCaseEnum() throws {
+        for v in [LightColor.red, .yellow, .green] {
+            try XCTAssertEqual(jsRoundTripLightColor(v), v)
+        }
+    }
+
+    func testRoundTripAssociatedValueEnum() throws {
+        let values: [ImportedPayloadSignal] = [
+            .start("go"),
+            .stop(42),
+            .idle,
+        ]
+        for value in values {
+            try XCTAssertEqual(jsRoundTripImportedPayloadSignal(value), value)
+        }
+    }
+
+    func testRoundTripOptionalAssociatedValueEnum() throws {
+        let values: [ImportedPayloadSignal?] = [
+            .some(.start("go")),
+            .some(.stop(42)),
+            .some(.idle),
+            nil,
+        ]
+        for value in values {
+            try XCTAssertEqual(jsRoundTripOptionalImportedPayloadSignal(value), value)
+        }
+    }
+
     func ensureThrows<T>(_ f: (Bool) throws(JSException) -> T) throws {
         do {
             _ = try f(true)
@@ -128,4 +194,21 @@ class ImportAPITests: XCTestCase {
         let dashed = try StaticBox.with_dashes()
         XCTAssertEqual(try dashed.value(), 7)
     }
+
+    func testStackLoweredParameterOrder() throws {
+        XCTAssertEqual(try jsJoinOptionalArrayThenArray([1, 2], [7, 8, 9]), "[1,2]|[7,8,9]")
+        XCTAssertEqual(try jsJoinOptionalArrayThenArray(nil, [7, 8, 9]), "null|[7,8,9]")
+        XCTAssertEqual(
+            try jsJoinOptionalStructThenArray(Point(x: 1, y: 2), [7, 8, 9]),
+            #"{"x":1,"y":2}|[7,8,9]"#
+        )
+        XCTAssertEqual(
+            try jsJoinEnumThenArray(.stop(5), [7, 8, 9]),
+            #"{"tag":1,"param0":5}|[7,8,9]"#
+        )
+        XCTAssertEqual(
+            try jsJoinStringThenStackParams("s", [1, 2], [7, 8, 9]),
+            #""s"|[1,2]|[7,8,9]"#
+        )
+    }
 }
diff --git a/Tests/BridgeJSRuntimeTests/ImportGenericAPIs.swift b/Tests/BridgeJSRuntimeTests/ImportGenericAPIs.swift
new file mode 100644
index 000000000..bfd63839f
--- /dev/null
+++ b/Tests/BridgeJSRuntimeTests/ImportGenericAPIs.swift
@@ -0,0 +1,280 @@
+import Testing
+import JavaScriptKit
+
+@JS struct GenericRTPoint {
+    var x: Int
+    var y: Int
+}
+
+@JS enum GenericRTNamespace {
+    @JS struct Metadata {
+        var label: String
+        var count: Int
+    }
+}
+
+@JS enum GenericRTColor {
+    case red
+    case green
+    case blue
+}
+
+@JS enum GenericRTMode: String {
+    case light
+    case dark
+}
+
+@JS enum GenericRTLevel: Int {
+    case low = 1
+    case high = 9
+}
+
+@JS enum GenericRTOutcome {
+    case ok(code: Int)
+    case fail(message: String)
+}
+
+@JS final class ImportGenericBox {
+    @JS var value: Int
+    @JS init(value: Int) {
+        self.value = value
+    }
+    @JS func get() -> Int {
+        value
+    }
+}
+
+@JSFunction func jsGenericRoundTrip<T: BridgedSwiftGenericBridgeable>(_ value: T) throws(JSException) -> T
+@JSFunction func jsGenericRoundTripClass<T: BridgedSwiftGenericBridgeable>(_ value: T) throws(JSException) -> T
+@JSFunction func jsGenericParsePoint<T: BridgedSwiftGenericBridgeable>(_ json: String) throws(JSException) -> T
+@JSFunction func jsImportPickFirst<T: BridgedSwiftGenericBridgeable>(_ a: T, _ b: T) throws(JSException) -> T
+@JSFunction func jsImportMakeInt<T: BridgedSwiftGenericBridgeable>() throws(JSException) -> T
+@JSFunction func jsImportCombineSecond<T: BridgedSwiftGenericBridgeable, U: BridgedSwiftGenericBridgeable>(
+    _ a: T,
+    _ b: U
+) throws(JSException) -> U
+@JSFunction func jsGenericArrayRoundTrip<T: BridgedSwiftGenericBridgeable>(_ values: [T]) throws(JSException) -> [T]
+@JSFunction func jsGenericOptionalRoundTrip<T: BridgedSwiftGenericBridgeable>(_ value: T?) throws(JSException) -> T?
+@JSFunction func jsGenericDictRoundTrip<T: BridgedSwiftGenericBridgeable>(
+    _ values: [String: T]
+) throws(JSException) -> [String: T]
+@JSFunction func jsGenericAfterOptionalArray<T: BridgedSwiftGenericBridgeable>(
+    _ values: [Int]?,
+    _ value: T
+) throws(JSException) -> String
+
+@JSClass struct ImportGenericConsumer {
+    @JSFunction init() throws(JSException)
+    @JSFunction func identity<T: BridgedSwiftGenericBridgeable>(_ value: T) throws(JSException) -> T
+    @JSFunction static func box<T: BridgedSwiftGenericBridgeable>(_ value: T) throws(JSException) -> T
+}
+
+@JSFunction func jsGenericThrowOrRoundTrip<T: BridgedSwiftGenericBridgeable>(
+    _ shouldThrow: Bool,
+    _ value: T
+) throws(JSException) -> T
+
+@JSClass struct ImportGenericBoxed {
+    @JSFunction init<T: BridgedSwiftGenericBridgeable>(_ value: T) throws(JSException)
+    @JSFunction func unwrap<T: BridgedSwiftGenericBridgeable>() throws(JSException) -> T
+}
+
+@Suite struct ImportGenericAPITests {
+    @Test func genericRoundTripScalars() throws {
+        #expect(try jsGenericRoundTrip(42) == 42)
+        #expect(try jsGenericRoundTrip(-7) == -7)
+        #expect(try jsGenericRoundTrip(3.5) == 3.5)
+        #expect(try jsGenericRoundTrip(Float(1.25)) == Float(1.25))
+        #expect(try jsGenericRoundTrip(true) == true)
+        #expect(try jsGenericRoundTrip(false) == false)
+        #expect(try jsGenericRoundTrip("hello") == "hello")
+        #expect(try jsGenericRoundTrip("") == "")
+    }
+
+    @Test func genericRoundTripNumerics() throws {
+        #expect(try jsGenericRoundTrip(Int8(-5)) == Int8(-5))
+        #expect(try jsGenericRoundTrip(Int8.min) == Int8.min)
+        #expect(try jsGenericRoundTrip(Int8.max) == Int8.max)
+        #expect(try jsGenericRoundTrip(UInt8(200)) == UInt8(200))
+        #expect(try jsGenericRoundTrip(UInt8.max) == UInt8.max)
+        #expect(try jsGenericRoundTrip(Int16(-1000)) == Int16(-1000))
+        #expect(try jsGenericRoundTrip(UInt16(60000)) == UInt16(60000))
+        #expect(try jsGenericRoundTrip(Int32(-123456)) == Int32(-123456))
+        #expect(try jsGenericRoundTrip(UInt32(3_000_000_000)) == UInt32(3_000_000_000))
+        #expect(try jsGenericRoundTrip(UInt32.max) == UInt32.max)
+        #expect(try jsGenericRoundTrip(UInt(42)) == UInt(42))
+        #expect(try jsGenericRoundTrip(UInt(4_000_000_000)) == UInt(4_000_000_000))
+        #expect(try jsGenericRoundTrip(Int64(-9_000_000_000)) == Int64(-9_000_000_000))
+        #expect(try jsGenericRoundTrip(Int64.min) == Int64.min)
+        #expect(try jsGenericRoundTrip(Int64.max) == Int64.max)
+        #expect(try jsGenericRoundTrip(UInt64(18_000_000_000_000_000_000)) == UInt64(18_000_000_000_000_000_000))
+        #expect(try jsGenericRoundTrip(UInt64.max) == UInt64.max)
+    }
+
+    @Test func genericRoundTripJSValue() throws {
+        let number = try jsGenericRoundTrip(JSValue.number(3.5))
+        #expect(number.number == 3.5)
+        let string = try jsGenericRoundTrip(JSValue.string("hi"))
+        #expect(string.string == "hi")
+        let boolean = try jsGenericRoundTrip(JSValue.boolean(true))
+        #expect(boolean.boolean == true)
+        #expect(try jsGenericRoundTrip(JSValue.null).isNull)
+        #expect(try jsGenericRoundTrip(JSValue.undefined).isUndefined)
+        let object = JSObject.global.Object.function!.new()
+        object.tag = 7
+        let roundTripped = try jsGenericRoundTrip(JSValue.object(object))
+        #expect(roundTripped.object?.tag.number == 7)
+    }
+
+    @Test func genericWrappedRoundTrip() throws {
+        #expect(try jsGenericArrayRoundTrip([1, 2, 3]) == [1, 2, 3])
+        #expect(try jsGenericArrayRoundTrip(["a", "b"]) == ["a", "b"])
+        #expect(try jsGenericArrayRoundTrip([Int]()) == [])
+        #expect(try jsGenericOptionalRoundTrip(Optional<Int>.some(7)) == 7)
+        #expect(try jsGenericOptionalRoundTrip(Optional<Int>.none) == nil)
+        #expect(try jsGenericOptionalRoundTrip(Optional<String>.some("hi")) == "hi")
+        let outcome = try jsGenericOptionalRoundTrip(Optional<GenericRTOutcome>.some(.ok(code: 5)))
+        guard case .some(.ok(let code)) = outcome else {
+            Issue.record("expected .ok")
+            return
+        }
+        #expect(code == 5)
+        #expect(try jsGenericOptionalRoundTrip(Optional<GenericRTOutcome>.none) == nil)
+        #expect(try jsGenericDictRoundTrip(["x": 1, "y": 2]) == ["x": 1, "y": 2])
+        #expect(try jsGenericDictRoundTrip([String: String]()) == [:])
+    }
+
+    @Test func genericRoundTripEnums() throws {
+        #expect(try jsGenericRoundTrip(GenericRTColor.red) == .red)
+        #expect(try jsGenericRoundTrip(GenericRTColor.blue) == .blue)
+        #expect(try jsGenericRoundTrip(GenericRTMode.dark) == .dark)
+        #expect(try jsGenericRoundTrip(GenericRTMode.light).rawValue == "light")
+        #expect(try jsGenericRoundTrip(GenericRTLevel.high) == .high)
+        let outcome = try jsGenericRoundTrip(GenericRTOutcome.ok(code: 42))
+        guard case .ok(let code) = outcome else {
+            Issue.record("expected .ok")
+            return
+        }
+        #expect(code == 42)
+        let failure = try jsGenericRoundTrip(GenericRTOutcome.fail(message: "boom"))
+        guard case .fail(let message) = failure else {
+            Issue.record("expected .fail")
+            return
+        }
+        #expect(message == "boom")
+    }
+
+    @Test func genericRoundTripStruct() throws {
+        let point = try jsGenericRoundTrip(GenericRTPoint(x: 1, y: 2))
+        #expect(point.x == 1)
+        #expect(point.y == 2)
+    }
+
+    @Test func genericRoundTripNestedStruct() throws {
+        let metadata = try jsGenericRoundTrip(GenericRTNamespace.Metadata(label: "alpha", count: 7))
+        #expect(metadata.label == "alpha")
+        #expect(metadata.count == 7)
+    }
+
+    @Test func genericParse() throws {
+        let point: GenericRTPoint = try jsGenericParsePoint("{\"x\": 10, \"y\": 20}")
+        #expect(point.x == 10)
+        #expect(point.y == 20)
+        let n: Int = try jsGenericParsePoint("42")
+        #expect(n == 42)
+        let string: String = try jsGenericParsePoint("\"hi\"")
+        #expect(string == "hi")
+    }
+
+    @Test func genericPickFirstMultiUse() throws {
+        #expect(try jsImportPickFirst(10, 20) as Int == 10)
+        #expect(try jsImportPickFirst("a", "b") as String == "a")
+        let firstPoint = try jsImportPickFirst(GenericRTPoint(x: 1, y: 2), GenericRTPoint(x: 3, y: 4))
+        #expect(firstPoint.x == 1)
+        #expect(firstPoint.y == 2)
+    }
+
+    @Test func genericMakeReturnOnly() throws {
+        let made: Int = try jsImportMakeInt()
+        #expect(made == 123)
+    }
+
+    @Test func genericCombineSecondMultiParameter() throws {
+        #expect(try jsImportCombineSecond(7, "hello") as String == "hello")
+        #expect(try jsImportCombineSecond("x", 9) as Int == 9)
+        let point = try jsImportCombineSecond(42, GenericRTPoint(x: 5, y: 6))
+        #expect(point.x == 5)
+        #expect(point.y == 6)
+    }
+
+    @Test func genericRoundTripHeapObjectClass() throws {
+        let box = ImportGenericBox(value: 314)
+        #expect(box.get() == 314)
+        let sameBox = try jsGenericRoundTripClass(box)
+        #expect(sameBox.get() == 314)
+        sameBox.value = 271
+        #expect(box.get() == 271)
+    }
+
+    @Test func genericMixedConsecutiveCalls() throws {
+        #expect(try jsGenericRoundTrip(1) == 1)
+        #expect(try jsGenericRoundTrip("two") == "two")
+        #expect(try jsGenericRoundTrip(3.0) == 3.0)
+        let p = try jsGenericRoundTrip(GenericRTPoint(x: 4, y: 5))
+        #expect(p.x == 4)
+        #expect(p.y == 5)
+    }
+
+    @Test func importGenericInstanceMethod() throws {
+        let consumer = try ImportGenericConsumer()
+        #expect(try consumer.identity(42) == 42)
+        #expect(try consumer.identity(-7) == -7)
+        #expect(try consumer.identity("hi") == "hi")
+        #expect(try consumer.identity(true) == true)
+        #expect(try consumer.identity(false) == false)
+        let point = try consumer.identity(GenericRTPoint(x: 3, y: 4))
+        #expect(point.x == 3)
+        #expect(point.y == 4)
+    }
+
+    /// A generic parameter shares the stacks with any other stack-lowered
+    /// parameter, so both have to arrive in declaration order.
+    @Test func genericAlongsideOptionalArray() throws {
+        #expect(try jsGenericAfterOptionalArray([1, 2], 42) == "[1,2]|42")
+        #expect(try jsGenericAfterOptionalArray([1, 2], GenericRTPoint(x: 3, y: 4)) == #"[1,2]|{"x":3,"y":4}"#)
+        #expect(try jsGenericAfterOptionalArray(nil, "x") == #"null|"x""#)
+    }
+
+    @Test func genericImportPropagatesJSException() throws {
+        #expect(try jsGenericThrowOrRoundTrip(false, 42) == 42)
+        #expect(try jsGenericThrowOrRoundTrip(false, GenericRTPoint(x: 1, y: 2)).x == 1)
+        do {
+            let _: Int = try jsGenericThrowOrRoundTrip(true, 0)
+            Issue.record("Expected exception")
+        } catch {
+            #expect(error.description.contains("TestError"))
+        }
+        // A throwing generic call must not strand its argument on the shared
+        // stack: the next call has to read its own value back.
+        #expect(try jsGenericThrowOrRoundTrip(false, GenericRTPoint(x: 7, y: 8)).y == 8)
+    }
+
+    @Test func importGenericConstructor() throws {
+        let boxedInt = try ImportGenericBoxed(42)
+        #expect(try boxedInt.unwrap() == 42)
+        let boxedText = try ImportGenericBoxed("boxed")
+        #expect(try boxedText.unwrap() == "boxed")
+        let boxedPoint = try ImportGenericBoxed(GenericRTPoint(x: 1, y: 2))
+        let point: GenericRTPoint = try boxedPoint.unwrap()
+        #expect(point.x == 1)
+        #expect(point.y == 2)
+    }
+
+    @Test func importGenericStaticMethod() throws {
+        #expect(try ImportGenericConsumer.box(7) == 7)
+        #expect(try ImportGenericConsumer.box("s") == "s")
+        #expect(try ImportGenericConsumer.box(true) == true)
+        let color = try ImportGenericConsumer.box(GenericRTColor.green)
+        #expect(color == .green)
+    }
+}
diff --git a/Tests/BridgeJSRuntimeTests/ImportStructAPIs.swift b/Tests/BridgeJSRuntimeTests/ImportStructAPIs.swift
index 41929772e..f981a5e01 100644
--- a/Tests/BridgeJSRuntimeTests/ImportStructAPIs.swift
+++ b/Tests/BridgeJSRuntimeTests/ImportStructAPIs.swift
@@ -7,3 +7,5 @@ struct Point {
 }
 
 @JSFunction func jsTranslatePoint(_ point: Point, dx: Int, dy: Int) throws(JSException) -> Point
+
+@JSFunction func jsRoundTripOptionalPoint(_ point: Point?) throws(JSException) -> Point?
diff --git a/Tests/BridgeJSRuntimeTests/JSImportBareModuleTests.swift b/Tests/BridgeJSRuntimeTests/JSImportBareModuleTests.swift
new file mode 100644
index 000000000..36c22913f
--- /dev/null
+++ b/Tests/BridgeJSRuntimeTests/JSImportBareModuleTests.swift
@@ -0,0 +1,40 @@
+import JavaScriptKit
+import XCTest
+
+// A Node built-in module. Nothing is copied into the generated package for this;
+// the generated JavaScript imports "node:path" directly and Node resolves it.
+@JSFunction(jsName: "basename", from: .module("node:path"))
+func nodeBasename(_ path: String) throws(JSException) -> String
+
+@JSFunction(jsName: "join", from: .module("node:path"))
+func nodeJoin(_ lhs: String, _ rhs: String) throws(JSException) -> String
+
+// An npm package, resolved through node_modules rather than being built into the runtime.
+@JSClass(jsName: "File", from: .module("@bjorn3/browser_wasi_shim"))
+struct WasiFile {
+    @JSFunction init(_ data: JSObject) throws(JSException)
+    @JSGetter var size: Int64
+}
+
+// The default export of a module, reached with `jsName: .default`.
+@JSGetter(jsName: .default, from: .snippet("/Modules/DefaultExport.mjs"))
+var defaultExport: JSObject
+
+final class JSImportBareModuleTests: XCTestCase {
+    func testNodeBuiltinModule() throws {
+        XCTAssertEqual(try nodeBasename("/a/b/c.txt"), "c.txt")
+        XCTAssertEqual(try nodeJoin("a", "b"), "a/b")
+    }
+
+    func testNpmPackageClass() throws {
+        let bytes = JSObject.global.Uint8Array.function!.new(3)
+        let file = try WasiFile(bytes)
+        XCTAssertEqual(try file.size, 3)
+    }
+
+    func testDefaultExport() throws {
+        let module = try defaultExport
+        XCTAssertEqual(module.label.string, "from the default export")
+        XCTAssertEqual(module.triple!(7).number, 21)
+    }
+}
diff --git a/Tests/BridgeJSRuntimeTests/JSImportModuleTests.swift b/Tests/BridgeJSRuntimeTests/JSImportModuleTests.swift
new file mode 100644
index 000000000..9efb64161
--- /dev/null
+++ b/Tests/BridgeJSRuntimeTests/JSImportModuleTests.swift
@@ -0,0 +1,47 @@
+import JavaScriptKit
+import XCTest
+
+@JSFunction(from: .snippet("/Modules/JSImportModule.mjs"))
+func moduleAdd(_ lhs: Int, _ rhs: Int) throws(JSException) -> Int
+
+@JSFunction(jsName: "renamedFunction", from: .snippet("/Modules/JSImportModule.mjs"))
+func moduleRenamed() throws(JSException) -> String
+
+@JSFunction(from: .snippet("/Modules/JSImportModule.mjs"))
+func moduleThrow() throws(JSException)
+
+@JSGetter(jsName: "version", from: .snippet("/Modules/JSImportModule.mjs"))
+var moduleVersion: String
+
+@JSClass(from: .snippet("/Modules/ModuleCounter.mjs"))
+struct ModuleCounter {
+    @JSFunction init(_ value: Int) throws(JSException)
+    @JSFunction static func create(_ value: Int) throws(JSException) -> ModuleCounter
+    @JSFunction func increment() throws(JSException) -> Int
+    @JSGetter var value: Int
+    @JSSetter func setValue(_ value: Int) throws(JSException)
+}
+
+final class JSImportModuleTests: XCTestCase {
+    func testModuleFunctionAndGetter() throws {
+        XCTAssertEqual(try moduleAdd(20, 22), 42)
+        XCTAssertEqual(try moduleRenamed(), "loaded from a module")
+        XCTAssertEqual(try moduleVersion, "module-v1")
+    }
+
+    func testModuleFunctionPropagatesJavaScriptException() {
+        XCTAssertThrowsError(try moduleThrow()) { error in
+            XCTAssertTrue(error is JSException)
+        }
+    }
+
+    func testModuleClassStaticAndInstanceAPIs() throws {
+        let constructed = try ModuleCounter(3)
+        XCTAssertEqual(try constructed.increment(), 4)
+        try constructed.setValue(9)
+        XCTAssertEqual(try constructed.value, 9)
+
+        let created = try ModuleCounter.create(40)
+        XCTAssertEqual(try created.increment(), 41)
+    }
+}
diff --git a/Tests/BridgeJSRuntimeTests/JSNameAPIs.swift b/Tests/BridgeJSRuntimeTests/JSNameAPIs.swift
new file mode 100644
index 000000000..48efcff59
--- /dev/null
+++ b/Tests/BridgeJSRuntimeTests/JSNameAPIs.swift
@@ -0,0 +1,34 @@
+import JavaScriptKit
+
+@JS("renamedEcho") func jsNameEcho(_ value: String) -> String {
+    return "echo: \(value)"
+}
+
+@JS("greetName") func greet(_ name: String) -> String {
+    return "Hello, \(name)!"
+}
+
+@JS("greetCount") func greet(_ count: Int) -> String {
+    return "Hello, \(count) people!"
+}
+
+@JS class JSNameRenamedClass {
+    private var storage: Int
+
+    @JS init(value: Int) {
+        self.storage = value
+    }
+
+    @JS("current") var value: Int {
+        get { storage }
+        set { storage = newValue }
+    }
+
+    @JS("doubled") func timesTwo() -> Int {
+        return storage * 2
+    }
+
+    @JS("makeWithValue") static func create(value: Int) -> JSNameRenamedClass {
+        return JSNameRenamedClass(value: value)
+    }
+}
diff --git a/Tests/BridgeJSRuntimeTests/JavaScript/AliasTests.mjs b/Tests/BridgeJSRuntimeTests/JavaScript/AliasTests.mjs
new file mode 100644
index 000000000..af5fe8cc8
--- /dev/null
+++ b/Tests/BridgeJSRuntimeTests/JavaScript/AliasTests.mjs
@@ -0,0 +1,351 @@
+// @ts-check
+import assert from "node:assert";
+
+export class Surface {
+    constructor(label) {
+        this.label = label;
+    }
+};
+
+/**
+ * @returns {import('../../../.build/plugins/PackageToJS/outputs/PackageTests/bridge-js.d.ts').Imports["AliasImports"]}
+ */
+export function getImports(importsContext) {
+    return {
+        jsRoundTripTagged: (value) => {
+            return value;
+        },
+        jsRoundTripOptionalTagged: (value) => {
+            return value ?? null;
+        },
+        jsProduceOptionalCanvas: (label) => {
+            if (label === null || label === undefined) return null;
+            return new Surface(label);
+        },
+        jsRoundTripAliasedTags: (values) => {
+            return values.map((tag) => tag ?? null);
+        },
+        jsRoundTripPolygon: (value) => {
+            return value;
+        },
+        jsRoundTripCoordinate: (value) => {
+            return { ...value };
+        },
+        jsRoundTripUserId: (value) => {
+            return value;
+        },
+        jsRoundTripOptionalUserId: (value) => {
+            return value ?? null;
+        },
+    };
+}
+
+/**
+ * @param {import('../../../.build/plugins/PackageToJS/outputs/PackageTests/bridge-js.d.ts').Exports} exports
+ */
+export function runAliasWorks(exports) {
+    runBasicRoundTrip(exports);
+    runOptional(exports);
+    runMethodsOnTarget(exports);
+    runStaticReturn(exports);
+    runMultipleAliases(exports);
+    runArrays(exports);
+    runThrows(exports);
+    runJSValueAlias(exports);
+    runScalarAlias(exports);
+    runClosureWithAliasParameter(exports);
+    runOptionalInArray(exports);
+    runClassPropertyAndInitWithAlias(exports);
+    runAssociatedValueEnumPayload(exports);
+    runStructToStructAlias(exports);
+    runStructToEnumAlias(exports);
+    runEnumToClassAlias(exports);
+}
+
+/**
+ * @param {import('../../../.build/plugins/PackageToJS/outputs/PackageTests/bridge-js.d.ts').Exports} exports
+ */
+function runBasicRoundTrip(exports) {
+    const seed = new exports.PolygonReference([1, 2, 3], "seed");
+    assert.equal(seed.vertexCount(), 3);
+    assert.equal(seed.summary(), "seed(3)");
+
+    const roundtrip = exports.roundTripPolygon(seed);
+    assert.equal(roundtrip.vertexCount(), 3);
+    assert.equal(roundtrip.summary(), "seed(3)");
+
+    assert.equal(exports.polygonVertexCount(seed), 3);
+
+    const appended = exports.appendVertex(seed, 4);
+    assert.equal(appended.vertexCount(), 4);
+    assert.equal(appended.summary(), "seed(4)");
+
+    seed.release();
+    roundtrip.release();
+    appended.release();
+}
+
+/**
+ * @param {import('../../../.build/plugins/PackageToJS/outputs/PackageTests/bridge-js.d.ts').Exports} exports
+ */
+function runOptional(exports) {
+    assert.equal(exports.optionalRoundTripPolygon(null), null);
+
+    const original = new exports.PolygonReference([7, 8, 9], "opt");
+    const echoed = exports.optionalRoundTripPolygon(original);
+    assert.notEqual(echoed, null);
+    if (echoed) {
+        assert.equal(echoed.vertexCount(), 3);
+        echoed.release();
+    }
+    original.release();
+}
+
+/**
+ * @param {import('../../../.build/plugins/PackageToJS/outputs/PackageTests/bridge-js.d.ts').Exports} exports
+ */
+function runMethodsOnTarget(exports) {
+    const a = new exports.PolygonReference([1, 2], "a");
+
+    const snap = a.snapshot();
+    assert.equal(snap.summary(), "a(2)");
+
+    const b = new exports.PolygonReference([3, 4, 5], "b");
+    const merged = a.merge(b);
+    assert.equal(merged.vertexCount(), 5);
+    assert.equal(merged.summary(), "a(5)");
+
+    a.release();
+    b.release();
+    snap.release();
+    merged.release();
+}
+
+/**
+ * @param {import('../../../.build/plugins/PackageToJS/outputs/PackageTests/bridge-js.d.ts').Exports} exports
+ */
+function runStaticReturn(exports) {
+    const o = exports.PolygonReference.origin("o");
+    assert.equal(o.vertexCount(), 0);
+    assert.equal(o.summary(), "o(0)");
+    o.release();
+}
+
+/**
+ * @param {import('../../../.build/plugins/PackageToJS/outputs/PackageTests/bridge-js.d.ts').Exports} exports
+ */
+function runMultipleAliases(exports) {
+    const tag = exports.makeTag("hello");
+    assert.equal(tag.describe(), "tag:hello");
+    tag.release();
+}
+
+/**
+ * @param {import('../../../.build/plugins/PackageToJS/outputs/PackageTests/bridge-js.d.ts').Exports} exports
+ */
+function runArrays(exports) {
+    const a = new exports.PolygonReference([1], "a");
+    const b = new exports.PolygonReference([2, 3], "b");
+    const c = new exports.PolygonReference([4, 5, 6], "c");
+
+    const roundtripped = exports.roundTripPolygonArray([a, b, c]);
+    assert.equal(roundtripped.length, 3);
+    assert.equal(roundtripped[0].vertexCount(), 1);
+    assert.equal(roundtripped[1].vertexCount(), 2);
+    assert.equal(roundtripped[2].vertexCount(), 3);
+    assert.equal(roundtripped[0].summary(), "a(1)");
+    assert.equal(roundtripped[1].summary(), "b(2)");
+    assert.equal(roundtripped[2].summary(), "c(3)");
+
+    const combined = exports.concatPolygons([a, b, c]);
+    assert.equal(combined.vertexCount(), 6);
+    assert.equal(combined.summary(), "concat(6)");
+
+    const empty = exports.roundTripPolygonArray([]);
+    assert.equal(empty.length, 0);
+
+    const split = exports.splitPolygon(combined);
+    assert.equal(split.length, 6);
+    for (const piece of split) {
+        assert.equal(piece.vertexCount(), 1);
+        piece.release();
+    }
+
+    a.release();
+    b.release();
+    c.release();
+    combined.release();
+    for (const r of roundtripped) r.release();
+}
+
+/**
+ * @param {import('../../../.build/plugins/PackageToJS/outputs/PackageTests/bridge-js.d.ts').Exports} exports
+ */
+function runThrows(exports) {
+    const valid = new exports.PolygonReference([1, 2], "v");
+    const echoed = exports.validatePolygon(valid);
+    assert.equal(echoed.summary(), "v(2)");
+    echoed.release();
+    valid.release();
+
+    const empty = new exports.PolygonReference([], "empty");
+    assert.throws(() => exports.validatePolygon(empty), /empty polygon/);
+    empty.release();
+}
+
+/**
+ * @param {import('../../../.build/plugins/PackageToJS/outputs/PackageTests/bridge-js.d.ts').Exports} exports
+ */
+function runJSValueAlias(exports) {
+    assert.equal(exports.roundTripBoxed(42), 42);
+    assert.equal(exports.roundTripBoxed("hello"), "hello");
+    assert.deepStrictEqual(exports.roundTripBoxed({ a: 1 }), { a: 1 });
+
+    assert.equal(exports.roundTripOptionalBoxed(null), null);
+    assert.equal(exports.roundTripOptionalBoxed("present"), "present");
+}
+
+/**
+ * @param {import('../../../.build/plugins/PackageToJS/outputs/PackageTests/bridge-js.d.ts').Exports} exports
+ */
+function runScalarAlias(exports) {
+    assert.equal(exports.roundTripUserId(42), 42);
+    assert.equal(exports.roundTripUserId(-1), -1);
+
+    assert.equal(exports.roundTripOptionalUserId(null), null);
+    assert.equal(exports.roundTripOptionalUserId(0), 0);
+    assert.equal(exports.roundTripOptionalUserId(7), 7);
+
+    assert.deepStrictEqual(exports.roundTripUserIdArray([]), []);
+    assert.deepStrictEqual(exports.roundTripUserIdArray([1, 2, 3]), [1, 2, 3]);
+}
+
+/**
+ * @param {import('../../../.build/plugins/PackageToJS/outputs/PackageTests/bridge-js.d.ts').Exports} exports
+ */
+function runClosureWithAliasParameter(exports) {
+    const inspector = exports.makePolygonInspector();
+    const poly = new exports.PolygonReference([10, 20, 30, 40], "inspect");
+    assert.equal(inspector(poly), 4);
+    poly.release();
+}
+
+/**
+ * @param {import('../../../.build/plugins/PackageToJS/outputs/PackageTests/bridge-js.d.ts').Exports} exports
+ */
+function runOptionalInArray(exports) {
+    const a = new exports.PolygonReference([1], "a");
+    const b = new exports.PolygonReference([2, 3], "b");
+
+    const echoed = exports.roundTripOptionalPolygonArray([a, null, b, null]);
+    assert.equal(echoed.length, 4);
+    assert.notEqual(echoed[0], null);
+    assert.equal(echoed[1], null);
+    assert.notEqual(echoed[2], null);
+    assert.equal(echoed[3], null);
+    if (echoed[0]) {
+        assert.equal(echoed[0].vertexCount(), 1);
+    }
+    if (echoed[2]) {
+        assert.equal(echoed[2].vertexCount(), 2);
+    }
+
+    a.release();
+    b.release();
+    for (const e of echoed) {
+        if (e) {
+            e.release();
+        }
+    }
+}
+
+/**
+ * @param {import('../../../.build/plugins/PackageToJS/outputs/PackageTests/bridge-js.d.ts').Exports} exports
+ */
+function runClassPropertyAndInitWithAlias(exports) {
+    const made = exports.makeTagHolder("origin", 1);
+    assert.equal(made.describe(), "holder(origin, v1)");
+    const initial = made.tag;
+    assert.equal(initial.describe(), "tag:origin");
+
+    const replacement = exports.makeTag("renamed");
+    made.tag = replacement;
+    assert.equal(made.describe(), "holder(renamed, v1)");
+    made.version = 7;
+    assert.equal(made.describe(), "holder(renamed, v7)");
+
+    const fresh = exports.makeTag("constructed");
+    const ctor = new exports.TagHolderReference(fresh, 99);
+    assert.equal(ctor.describe(), "holder(constructed, v99)");
+
+    initial.release();
+    replacement.release();
+    fresh.release();
+    made.release();
+    ctor.release();
+}
+
+/**
+ * @param {import('../../../.build/plugins/PackageToJS/outputs/PackageTests/bridge-js.d.ts').Exports} exports
+ */
+function runAssociatedValueEnumPayload(exports) {
+    const poly = new exports.PolygonReference([1, 2, 3], "shape");
+    const wrapped = exports.makeShapePolygon(poly);
+    assert.equal(wrapped.tag, exports.Shape.Tag.Polygon);
+    if (wrapped.tag === exports.Shape.Tag.Polygon) {
+        assert.equal(wrapped.param0.vertexCount(), 3);
+    }
+
+    const echoed = exports.roundTripShape(wrapped);
+    assert.equal(echoed.tag, exports.Shape.Tag.Polygon);
+    if (echoed.tag === exports.Shape.Tag.Polygon) {
+        assert.equal(echoed.param0.vertexCount(), 3);
+        echoed.param0.release();
+    }
+
+    const empty = exports.makeShapeEmpty();
+    assert.equal(empty.tag, exports.Shape.Tag.Empty);
+    const emptyEcho = exports.roundTripShape(empty);
+    assert.equal(emptyEcho.tag, exports.Shape.Tag.Empty);
+
+    if (wrapped.tag === exports.Shape.Tag.Polygon) {
+        wrapped.param0.release();
+    }
+    poly.release();
+}
+
+/**
+ * @param {import('../../../.build/plugins/PackageToJS/outputs/PackageTests/bridge-js.d.ts').Exports} exports
+ */
+function runStructToStructAlias(exports) {
+    const seed = { latitude: 45.5, longitude: -73.5 };
+    const echoed = exports.roundTripCoordinate(seed);
+    assert.deepStrictEqual(echoed, seed);
+}
+
+/**
+ * @param {import('../../../.build/plugins/PackageToJS/outputs/PackageTests/bridge-js.d.ts').Exports} exports
+ */
+function runStructToEnumAlias(exports) {
+    const made = exports.makeAlert(exports.Severity.Warning);
+    assert.equal(made, exports.Severity.Warning);
+
+    const echoed = exports.roundTripAlert(exports.Severity.Error);
+    assert.equal(echoed, exports.Severity.Error);
+}
+
+/**
+ * @param {import('../../../.build/plugins/PackageToJS/outputs/PackageTests/bridge-js.d.ts').Exports} exports
+ */
+function runEnumToClassAlias(exports) {
+    const seed = exports.PriorityReference.medium();
+    assert.equal(seed.describe(), "medium");
+    assert.equal(seed.weight(), 5);
+
+    const echoed = exports.roundTripPriority(seed);
+    assert.equal(echoed.describe(), "medium");
+    assert.equal(echoed.weight(), 5);
+
+    seed.release();
+    echoed.release();
+}
diff --git a/Tests/BridgeJSRuntimeTests/JavaScript/AsyncImportTests.mjs b/Tests/BridgeJSRuntimeTests/JavaScript/AsyncImportTests.mjs
index f64531d4a..9be7af1be 100644
--- a/Tests/BridgeJSRuntimeTests/JavaScript/AsyncImportTests.mjs
+++ b/Tests/BridgeJSRuntimeTests/JavaScript/AsyncImportTests.mjs
@@ -1,6 +1,7 @@
 // @ts-check
 
 import assert from 'node:assert';
+import { ThemeValues, DirectionValues, FileSizeValues, AsyncPayloadResultValues } from '../../../.build/plugins/PackageToJS/outputs/PackageTests/bridge-js.js';
 
 /**
  * @returns {import('../../../.build/plugins/PackageToJS/outputs/PackageTests/bridge-js.d.ts').Imports["AsyncImportImports"]}
@@ -37,10 +38,107 @@ export function getImports(importsContext) {
         jsAsyncRoundTripFeatureFlag: (v) => {
             return Promise.resolve(v);
         },
+        jsAsyncRoundTripAssociatedValueEnum: (v) => {
+            return Promise.resolve(v);
+        },
+        jsAsyncRoundTripOptionalAssociatedValueEnum: (v) => {
+            return Promise.resolve(v);
+        },
     };
 }
 
 /** @param {import('../../../.build/plugins/PackageToJS/outputs/PackageTests/bridge-js.d.ts').Exports} exports */
 export async function runAsyncWorksTests(exports) {
     await exports.asyncRoundTripVoid();
+
+    const asyncPoint = { x: 7, y: 11 };
+    assert.deepEqual(await exports.asyncRoundTripPublicPoint(asyncPoint), asyncPoint);
+    assert.deepEqual(await exports.asyncRoundTripPublicPointThrows(asyncPoint), asyncPoint);
+
+    const [c1, c2] = await Promise.all([
+        exports.asyncRoundTripPublicPoint({ x: 1, y: 2 }),
+        exports.asyncRoundTripPublicPoint({ x: 3, y: 4 }),
+    ]);
+    assert.deepEqual(c1, { x: 1, y: 2 });
+    assert.deepEqual(c2, { x: 3, y: 4 });
+
+    assert.deepEqual(await exports.asyncCombinePublicPoints({ x: 1, y: 2 }, { x: 10, y: 20 }), { x: 11, y: 22 });
+
+    assert.deepEqual(await exports.asyncStructOrThrow(false), { x: 1, y: 2 });
+    await assert.rejects(
+        () => exports.asyncStructOrThrow(true),
+        (error) => error instanceof Error && error.message === "async struct failure"
+    );
+
+    await assert.rejects(
+        () => exports.zeroArgAsyncThrows(),
+        (error) => error instanceof Error && error.message === "ZeroArgAsyncThrowsError"
+    );
+
+    const richContact = {
+        name: "Alice",
+        age: 30,
+        address: { street: "123 Main St", city: "NYC", zipCode: 10001 },
+        email: "alice@test.com",
+        secondaryAddress: { street: "456 Oak Ave", city: "LA", zipCode: null },
+    };
+    assert.deepEqual(await exports.asyncRoundTripContact(richContact), richContact);
+
+    const calc = exports.createCalculator();
+    assert.deepEqual(await calc.asyncMakePoint(3, 4), { x: 3, y: 4 });
+    calc.release();
+
+    assert.equal(await exports.asyncRoundTripTheme(ThemeValues.Dark), ThemeValues.Dark);
+    assert.equal(await exports.asyncRoundTripDirection(DirectionValues.East), DirectionValues.East);
+
+    assert.deepEqual(
+        await exports.asyncRoundTripPublicPointArray([{ x: 1, y: 2 }, { x: 3, y: 4 }]),
+        [{ x: 1, y: 2 }, { x: 3, y: 4 }]
+    );
+
+    assert.equal(await exports.asyncRoundTripOptionalTheme(ThemeValues.Light), ThemeValues.Light);
+    assert.equal(await exports.asyncRoundTripOptionalTheme(null), null);
+    assert.equal(await exports.asyncRoundTripOptionalDirection(DirectionValues.South), DirectionValues.South);
+    assert.equal(await exports.asyncRoundTripOptionalDirection(null), null);
+
+    assert.deepEqual(await exports.asyncRoundTripOptionalPublicPoint({ x: 5, y: 6 }), { x: 5, y: 6 });
+    assert.equal(await exports.asyncRoundTripOptionalPublicPoint(null), null);
+
+    assert.deepEqual(
+        await exports.asyncRoundTripPublicPointDict({ a: { x: 1, y: 2 }, b: { x: 3, y: 4 } }),
+        { a: { x: 1, y: 2 }, b: { x: 3, y: 4 } }
+    );
+
+    assert.deepEqual(
+        await exports.asyncRoundTripDirectionArray([DirectionValues.North, DirectionValues.East]),
+        [DirectionValues.North, DirectionValues.East]
+    );
+    assert.deepEqual(
+        await exports.asyncRoundTripDirectionDict({ a: DirectionValues.North, b: DirectionValues.South }),
+        { a: DirectionValues.North, b: DirectionValues.South }
+    );
+
+    assert.deepEqual(
+        await exports.asyncRoundTripThemeArray([ThemeValues.Light, ThemeValues.Dark]),
+        [ThemeValues.Light, ThemeValues.Dark]
+    );
+    assert.deepEqual(
+        await exports.asyncRoundTripThemeDict({ a: ThemeValues.Light, b: ThemeValues.Auto }),
+        { a: ThemeValues.Light, b: ThemeValues.Auto }
+    );
+
+    assert.equal(await exports.asyncRoundTripFileSize(FileSizeValues.Large), FileSizeValues.Large);
+    assert.equal(await exports.asyncRoundTripOptionalFileSize(FileSizeValues.Tiny), FileSizeValues.Tiny);
+    assert.equal(await exports.asyncRoundTripOptionalFileSize(null), null);
+
+    const asyncPayloadSuccess = { tag: AsyncPayloadResultValues.Tag.Success, param0: "ok" };
+    const asyncPayloadFailure = { tag: AsyncPayloadResultValues.Tag.Failure, param0: 7 };
+    const asyncPayloadIdle = { tag: AsyncPayloadResultValues.Tag.Idle };
+    assert.deepEqual(await exports.asyncRoundTripAssociatedValueEnum(asyncPayloadSuccess), asyncPayloadSuccess);
+    assert.deepEqual(await exports.asyncRoundTripAssociatedValueEnum(asyncPayloadFailure), asyncPayloadFailure);
+    assert.deepEqual(await exports.asyncRoundTripAssociatedValueEnum(asyncPayloadIdle), asyncPayloadIdle);
+    assert.deepEqual(await exports.asyncRoundTripOptionalAssociatedValueEnum(asyncPayloadSuccess), asyncPayloadSuccess);
+    assert.deepEqual(await exports.asyncRoundTripOptionalAssociatedValueEnum(asyncPayloadFailure), asyncPayloadFailure);
+    assert.deepEqual(await exports.asyncRoundTripOptionalAssociatedValueEnum(asyncPayloadIdle), asyncPayloadIdle);
+    assert.equal(await exports.asyncRoundTripOptionalAssociatedValueEnum(null), null);
 }
diff --git a/Tests/BridgeJSRuntimeTests/JavaScript/ClosureAsyncTests.mjs b/Tests/BridgeJSRuntimeTests/JavaScript/ClosureAsyncTests.mjs
new file mode 100644
index 000000000..57a824aa4
--- /dev/null
+++ b/Tests/BridgeJSRuntimeTests/JavaScript/ClosureAsyncTests.mjs
@@ -0,0 +1,131 @@
+import assert from "node:assert";
+import { AsyncPayloadResultValues } from '../../../.build/plugins/PackageToJS/outputs/PackageTests/bridge-js.js';
+
+/**
+ * @returns {import('../../../.build/plugins/PackageToJS/outputs/PackageTests/bridge-js.d.ts').Imports["ClosureAsyncImports"]}
+ */
+export function getImports(importsContext) {
+    return {
+        runJsClosureAsyncTests: async () => {
+            const exports = importsContext.getExports();
+            if (!exports) {
+                throw new Error("No exports!?");
+            }
+            await runJsClosureAsyncTests(exports);
+        },
+    };
+}
+
+/** @param {import('../../../.build/plugins/PackageToJS/outputs/PackageTests/bridge-js.d.ts').Exports} exports */
+export async function runJsClosureAsyncTests(exports) {
+    assert.equal(
+        await exports.awaitAsyncCallback(async (req) => {
+            await Promise.resolve();
+            return `js-${req}`;
+        }),
+        "swift-saw:js-request",
+    );
+
+    let directionAReject = null;
+    try {
+        await exports.awaitAsyncCallback(async () => {
+            throw new Error("CallbackRejected");
+        });
+        assert.fail("Expected awaitAsyncCallback to reject when the JS callback rejects");
+    } catch (error) {
+        directionAReject = error;
+    }
+    assert.notEqual(directionAReject, null);
+    assert.equal(directionAReject.message, "CallbackRejected");
+
+    const parser = exports.makeAsyncParser();
+
+    const parsed = parser("42");
+    assert.ok(parsed instanceof Promise, "async closure must return a Promise");
+    assert.equal(await parsed, "parsed:42");
+    assert.equal(await parser("-7"), "parsed:-7");
+
+    let directionBReject = null;
+    try {
+        await parser("not-a-number");
+        assert.fail("Expected makeAsyncParser closure to reject for invalid input");
+    } catch (error) {
+        directionBReject = error;
+    }
+    assert.notEqual(directionBReject, null);
+    assert.equal(directionBReject.message, "AsyncParseError: not-a-number");
+
+    assert.equal(await parser("100"), "parsed:100");
+
+    const echo = exports.makeAsyncEcho();
+    const echoed = echo("hi");
+    assert.ok(echoed instanceof Promise, "non-throwing async closure must return a Promise");
+    assert.equal(await echoed, "echo:hi");
+
+    const recorder = exports.makeAsyncRecorder();
+    const recorded = recorder("logged-value");
+    assert.ok(recorded instanceof Promise, "Void async closure must return a Promise");
+    assert.equal(await recorded, undefined);
+    assert.equal(exports.lastRecordedValue(), "logged-value");
+
+    let voidReject = null;
+    try {
+        await recorder("boom");
+        assert.fail("Expected makeAsyncRecorder closure to reject for 'boom'");
+    } catch (error) {
+        voidReject = error;
+    }
+    assert.notEqual(voidReject, null);
+    assert.equal(voidReject.message, "AsyncRecorderError");
+
+    const payloadLoader = exports.makeAsyncPayloadLoader();
+    const payloadPromise = payloadLoader(true);
+    assert.ok(payloadPromise instanceof Promise, "associated-value enum async closure must return a Promise");
+    assert.deepEqual(await payloadPromise, { tag: AsyncPayloadResultValues.Tag.Success, param0: "loaded" });
+    assert.deepEqual(await payloadLoader(false), { tag: AsyncPayloadResultValues.Tag.Failure, param0: 42 });
+
+    assert.equal(
+        await exports.awaitPayloadCallback(async (succeed) => {
+            await Promise.resolve();
+            return succeed
+                ? { tag: AsyncPayloadResultValues.Tag.Success, param0: "js" }
+                : { tag: AsyncPayloadResultValues.Tag.Idle };
+        }),
+        "success:js|idle",
+    );
+
+    const pointMaker = exports.makeAsyncPointMaker();
+    const pointPromise = pointMaker(3);
+    assert.ok(pointPromise instanceof Promise, "struct-returning async closure must return a Promise");
+    const point = await pointPromise;
+    assert.equal(point.x, 3);
+    assert.equal(point.y, 6);
+    assert.equal(point.label, "async:3.0");
+
+    {
+        const racer = exports.makeAsyncEcho();
+        const inFlight = racer("race");
+        if (typeof racer.release === "function") {
+            racer.release();
+        }
+        if (typeof global !== "undefined" && typeof global.gc === "function") {
+            global.gc();
+        }
+        assert.equal(await inFlight, "echo:race");
+    }
+
+    {
+        const concurrent = exports.makeAsyncEcho();
+        const promises = [];
+        for (let i = 0; i < 16; i++) {
+            promises.push(concurrent("c" + i));
+        }
+        const results = await Promise.all(promises);
+        for (let i = 0; i < 16; i++) {
+            assert.equal(results[i], "echo:c" + i);
+        }
+        if (typeof concurrent.release === "function") {
+            concurrent.release();
+        }
+    }
+}
diff --git a/Tests/BridgeJSRuntimeTests/JavaScript/ClosureSupportTests.mjs b/Tests/BridgeJSRuntimeTests/JavaScript/ClosureSupportTests.mjs
index bab496d09..9461bec1f 100644
--- a/Tests/BridgeJSRuntimeTests/JavaScript/ClosureSupportTests.mjs
+++ b/Tests/BridgeJSRuntimeTests/JavaScript/ClosureSupportTests.mjs
@@ -366,6 +366,24 @@ export function runJsClosureSupportTests(exports) {
     );
     assert.equal(optVectorResult, "(2.0,4.0) | nil");
 
+    // Swift→JS callback with a struct parameter must deliver the struct fields.
+    // Regression: empty-stack lift previously yielded `dx`/`dy` as `undefined`
+    // (and Bool fields wrongly became `true`).
+    let observed = null;
+    processor.observeVector((vector) => {
+        observed = vector;
+    });
+    assert.ok(observed, "observeVector must invoke the callback");
+    assert.equal(observed.dx, 1.5);
+    assert.equal(observed.dy, 2.5);
+
+    const mapped = processor.mapVector({ dx: 3, dy: 4 }, (vector) => ({
+        dx: vector.dx * 2,
+        dy: vector.dy * 2,
+    }));
+    assert.equal(mapped.dx, 6);
+    assert.equal(mapped.dy, 8);
+
     processor.release();
 
     const intToInt = exports.ClosureSupportExports.makeIntToInt(10);
diff --git a/Tests/BridgeJSRuntimeTests/JavaScript/ClosureThrowsTests.mjs b/Tests/BridgeJSRuntimeTests/JavaScript/ClosureThrowsTests.mjs
new file mode 100644
index 000000000..94bd27d5c
--- /dev/null
+++ b/Tests/BridgeJSRuntimeTests/JavaScript/ClosureThrowsTests.mjs
@@ -0,0 +1,57 @@
+import assert from "node:assert";
+
+/**
+ * @returns {import('../../../.build/plugins/PackageToJS/outputs/PackageTests/bridge-js.d.ts').Imports["ClosureThrowsImports"]}
+ */
+export function getImports(importsContext) {
+    return {
+        runJsClosureThrowsTests: () => {
+            const exports = importsContext.getExports();
+            if (!exports) {
+                throw new Error("No exports!?");
+            }
+            runJsClosureThrowsTests(exports);
+        },
+    };
+}
+
+/** @param {import('../../../.build/plugins/PackageToJS/outputs/PackageTests/bridge-js.d.ts').Exports} exports */
+export function runJsClosureThrowsTests(exports) {
+    const parser = exports.makeThrowingParser();
+
+    assert.equal(parser("42"), 42);
+    assert.equal(parser("-7"), -7);
+
+    let caught = null;
+    try {
+        parser("not-a-number");
+        assert.fail("Expected makeThrowingParser closure to throw for invalid input");
+    } catch (error) {
+        caught = error;
+    }
+    assert.notEqual(caught, null);
+    assert.equal(caught.message, "ParseError: not-a-number");
+
+    assert.equal(parser("100"), 100);
+
+    assert.equal(
+        exports.runValidator((value) => value === "input"),
+        true,
+    );
+    assert.equal(
+        exports.runValidator((value) => value === "something-else"),
+        false,
+    );
+
+    let propagated = null;
+    try {
+        exports.runValidator(() => {
+            throw new Error("ValidatorError");
+        });
+        assert.fail("Expected runValidator to propagate the JS callback error");
+    } catch (error) {
+        propagated = error;
+    }
+    assert.notEqual(propagated, null);
+    assert.equal(propagated.message, "ValidatorError");
+}
diff --git a/Tests/BridgeJSRuntimeTests/JavaScript/OptionalSupportTests.mjs b/Tests/BridgeJSRuntimeTests/JavaScript/OptionalSupportTests.mjs
index 6576876da..05969a56d 100644
--- a/Tests/BridgeJSRuntimeTests/JavaScript/OptionalSupportTests.mjs
+++ b/Tests/BridgeJSRuntimeTests/JavaScript/OptionalSupportTests.mjs
@@ -46,6 +46,9 @@ export function getImports(importsContext) {
         jsRoundTripOptionalStringToStringDictionaryUndefined: (v) => {
             return v === undefined ? undefined : v;
         },
+        jsRoundTripOptionalJSObjectNull: (v) => {
+            return v ?? null;
+        },
         runJsOptionalSupportTests: () => {
             const exports = importsContext.getExports();
             if (!exports) { throw new Error("No exports!?"); }
@@ -80,6 +83,10 @@ export function runJsOptionalSupportTests(rootExports) {
     assert.equal(exports.roundTripOptionalIntRawValueEnum(HttpStatus.Ok), HttpStatusValues.Ok);
     assert.equal(exports.roundTripOptionalInt64RawValueEnum(FileSize.Tiny), FileSizeValues.Tiny);
     assert.equal(exports.roundTripOptionalUInt64RawValueEnum(SessionId.Active), SessionIdValues.Active);
+    // The `none` case lowers the i64/u64 placeholder as a BigInt (`0n`); a plain `0`
+    // would throw "Cannot convert 0 to a BigInt" when calling the Wasm export.
+    assert.equal(exports.roundTripOptionalInt64RawValueEnum(null), null);
+    assert.equal(exports.roundTripOptionalUInt64RawValueEnum(null), null);
     assert.equal(exports.roundTripOptionalTSEnum(TSDirection.North), TSDirection.North);
     assert.equal(exports.roundTripOptionalTSStringEnum(TSTheme.Light), TSTheme.Light);
     assert.equal(exports.roundTripOptionalNamespacedEnum(Networking.API.Method.Get), Networking.API.Method.Get);
diff --git a/Tests/BridgeJSRuntimeTests/Modules/DefaultExport.mjs b/Tests/BridgeJSRuntimeTests/Modules/DefaultExport.mjs
new file mode 100644
index 000000000..295129c36
--- /dev/null
+++ b/Tests/BridgeJSRuntimeTests/Modules/DefaultExport.mjs
@@ -0,0 +1,6 @@
+export default {
+    label: "from the default export",
+    triple(value) {
+        return value * 3;
+    },
+};
diff --git a/Tests/BridgeJSRuntimeTests/Modules/JSImportModule.mjs b/Tests/BridgeJSRuntimeTests/Modules/JSImportModule.mjs
new file mode 100644
index 000000000..834537e10
--- /dev/null
+++ b/Tests/BridgeJSRuntimeTests/Modules/JSImportModule.mjs
@@ -0,0 +1,13 @@
+export function moduleAdd(lhs, rhs) {
+    return lhs + rhs;
+}
+
+export function renamedFunction() {
+    return "loaded from a module";
+}
+
+export function moduleThrow() {
+    throw new Error("module failure");
+}
+
+export const version = "module-v1";
diff --git a/Tests/BridgeJSRuntimeTests/Modules/ModuleCounter.mjs b/Tests/BridgeJSRuntimeTests/Modules/ModuleCounter.mjs
new file mode 100644
index 000000000..5a33b7ffa
--- /dev/null
+++ b/Tests/BridgeJSRuntimeTests/Modules/ModuleCounter.mjs
@@ -0,0 +1,17 @@
+export class ModuleCounter {
+    constructor(value) {
+        this.value = value;
+    }
+
+    static create(value) {
+        return new ModuleCounter(value);
+    }
+
+    increment() {
+        return ++this.value;
+    }
+
+    setValue(value) {
+        this.value = value;
+    }
+}
diff --git a/Tests/BridgeJSRuntimeTests/OptionalSupportTests.swift b/Tests/BridgeJSRuntimeTests/OptionalSupportTests.swift
index 3b06901db..85eaa04c7 100644
--- a/Tests/BridgeJSRuntimeTests/OptionalSupportTests.swift
+++ b/Tests/BridgeJSRuntimeTests/OptionalSupportTests.swift
@@ -24,6 +24,8 @@ import JavaScriptEventLoop
         _ v: JSUndefinedOr<[String: String]>
     ) throws(JSException) -> JSUndefinedOr<[String: String]>
 
+    @JSFunction static func jsRoundTripOptionalJSObjectNull(_ value: JSObject?) throws(JSException) -> JSObject?
+
     @JSFunction static func runJsOptionalSupportTests() throws(JSException)
 }
 
@@ -84,6 +86,15 @@ final class OptionalSupportTests: XCTestCase {
     func testRoundTripOptionalStringToStringDictionaryUndefined() throws {
         try roundTripTest(OptionalSupportImports.jsRoundTripOptionalStringToStringDictionaryUndefined, ["key": "value"])
     }
+
+    func testRoundTripOptionalJSObjectNull() throws {
+        try XCTAssertNil(OptionalSupportImports.jsRoundTripOptionalJSObjectNull(nil))
+
+        let object = JSObject.global.Object.function!.new()
+        object.testProp = "hello"
+        let result = try OptionalSupportImports.jsRoundTripOptionalJSObjectNull(object)
+        XCTAssertEqual(result?.testProp.string, "hello")
+    }
 }
 
 @JS enum OptionalSupportExports {
diff --git a/Tests/BridgeJSRuntimeTests/StructAPIs.swift b/Tests/BridgeJSRuntimeTests/StructAPIs.swift
index daa7ad1e2..e11856d41 100644
--- a/Tests/BridgeJSRuntimeTests/StructAPIs.swift
+++ b/Tests/BridgeJSRuntimeTests/StructAPIs.swift
@@ -200,6 +200,10 @@ extension Vector2D {
     @JS func scaled(by factor: Double) -> Vector2D {
         return Vector2D(dx: dx * factor, dy: dy * factor)
     }
+
+    @JS func describe() -> String {
+        return "Vector2D(\(dx), \(dy))"
+    }
 }
 
 @JS func roundTripDataPoint(_ data: DataPoint) -> DataPoint {
@@ -210,6 +214,41 @@ extension Vector2D {
     point
 }
 
+@JS public func asyncRoundTripPublicPoint(_ point: PublicPoint) async -> PublicPoint {
+    point
+}
+
+@JS public func asyncRoundTripPublicPointThrows(_ point: PublicPoint) async throws(JSException) -> PublicPoint {
+    point
+}
+
+@JS public func asyncStructOrThrow(_ shouldThrow: Bool) async throws(JSException) -> PublicPoint {
+    if shouldThrow {
+        throw JSException(JSError(message: "async struct failure").jsValue)
+    }
+    return PublicPoint(x: 1, y: 2)
+}
+
+@JS public func asyncCombinePublicPoints(_ a: PublicPoint, _ b: PublicPoint) async -> PublicPoint {
+    PublicPoint(x: a.x + b.x, y: a.y + b.y)
+}
+
+@JS func asyncRoundTripContact(_ contact: Contact) async -> Contact {
+    contact
+}
+
+@JS public func asyncRoundTripPublicPointArray(_ points: [PublicPoint]) async -> [PublicPoint] {
+    points
+}
+
+@JS public func asyncRoundTripOptionalPublicPoint(_ point: PublicPoint?) async -> PublicPoint? {
+    point
+}
+
+@JS public func asyncRoundTripPublicPointDict(_ points: [String: PublicPoint]) async -> [String: PublicPoint] {
+    points
+}
+
 @JS func roundTripContact(_ contact: Contact) -> Contact {
     return contact
 }
diff --git a/Tests/JavaScriptEventLoopTests/JSClosure+AsyncTests.swift b/Tests/JavaScriptEventLoopTests/JSClosure+AsyncTests.swift
index db093e549..f53c7eeb7 100644
--- a/Tests/JavaScriptEventLoopTests/JSClosure+AsyncTests.swift
+++ b/Tests/JavaScriptEventLoopTests/JSClosure+AsyncTests.swift
@@ -24,6 +24,18 @@ class JSClosureAsyncTests: XCTestCase {
         XCTAssertEqual(result, 42.0)
     }
 
+    func testAsyncClosureReject() async throws {
+        let closure = JSClosure.async { (_) async throws(JSException) -> JSValue in
+            throw JSException(message: "AsyncClosureRejected")
+        }.jsValue
+        let result = await JSPromise(from: closure.function!())!.result
+        guard case .failure(let rejectedValue) = result else {
+            XCTFail("Expected the async closure promise to reject, got \(result)")
+            return
+        }
+        XCTAssertEqual(rejectedValue.object?.message.string, "AsyncClosureRejected")
+    }
+
     func testAsyncClosureWithPriority() async throws {
         let priority = UnsafeSendableBox<TaskPriority?>(nil)
         let closure = JSClosure.async(priority: .high) { _ in
@@ -72,7 +84,7 @@ class JSClosureAsyncTests: XCTestCase {
         )!.value()
         XCTAssertEqual(result, 42.0)
     }
-    
+
     func testAsyncOneshotClosureWithPriority() async throws {
         let priority = UnsafeSendableBox<TaskPriority?>(nil)
         let closure = JSOneshotClosure.async(priority: .high) { _ in
@@ -83,7 +95,7 @@ class JSClosureAsyncTests: XCTestCase {
         XCTAssertEqual(result, 42.0)
         XCTAssertEqual(priority.value, .high)
     }
-    
+
     @available(macOS 15.0, iOS 18.0, watchOS 11.0, tvOS 18.0, visionOS 2.0, *)
     func testAsyncOneshotClosureWithTaskExecutor() async throws {
         let executor = AnyTaskExecutor()
@@ -93,7 +105,7 @@ class JSClosureAsyncTests: XCTestCase {
         let result = try await JSPromise(from: closure.function!())!.value()
         XCTAssertEqual(result, 42.0)
     }
-    
+
     @available(macOS 15.0, iOS 18.0, watchOS 11.0, tvOS 18.0, visionOS 2.0, *)
     func testAsyncOneshotClosureWithTaskExecutorPreference() async throws {
         let executor = AnyTaskExecutor()
diff --git a/Tests/JavaScriptEventLoopTests/WebWorkerDedicatedExecutorTests.swift b/Tests/JavaScriptEventLoopTests/WebWorkerDedicatedExecutorTests.swift
index aae8c2cea..b1dee1f3b 100644
--- a/Tests/JavaScriptEventLoopTests/WebWorkerDedicatedExecutorTests.swift
+++ b/Tests/JavaScriptEventLoopTests/WebWorkerDedicatedExecutorTests.swift
@@ -1,4 +1,4 @@
-#if compiler(>=6.1) && _runtime(_multithreaded)
+#if _runtime(_multithreaded)
 import XCTest
 @testable import JavaScriptEventLoop
 
diff --git a/Tests/JavaScriptEventLoopTests/WebWorkerTaskExecutorTests.swift b/Tests/JavaScriptEventLoopTests/WebWorkerTaskExecutorTests.swift
index 69b3390dc..a40a039bd 100644
--- a/Tests/JavaScriptEventLoopTests/WebWorkerTaskExecutorTests.swift
+++ b/Tests/JavaScriptEventLoopTests/WebWorkerTaskExecutorTests.swift
@@ -1,4 +1,4 @@
-#if compiler(>=6.1) && _runtime(_multithreaded)
+#if _runtime(_multithreaded)
 import Synchronization
 import XCTest
 import _CJavaScriptKit  // For swjs_get_worker_thread_id
diff --git a/Tests/prelude.mjs b/Tests/prelude.mjs
index 2c922dbe2..78271e1ba 100644
--- a/Tests/prelude.mjs
+++ b/Tests/prelude.mjs
@@ -5,7 +5,10 @@ import {
 } from '../.build/plugins/PackageToJS/outputs/PackageTests/bridge-js.js';
 import { ImportedFoo } from './BridgeJSRuntimeTests/JavaScript/Types.mjs';
 import { runJsOptionalSupportTests } from './BridgeJSRuntimeTests/JavaScript/OptionalSupportTests.mjs';
+import { runAliasWorks, getImports as getAliasImports, Surface } from './BridgeJSRuntimeTests/JavaScript/AliasTests.mjs';
 import { getImports as getClosureSupportImports } from './BridgeJSRuntimeTests/JavaScript/ClosureSupportTests.mjs';
+import { getImports as getClosureThrowsImports } from './BridgeJSRuntimeTests/JavaScript/ClosureThrowsTests.mjs';
+import { getImports as getClosureAsyncImports } from './BridgeJSRuntimeTests/JavaScript/ClosureAsyncTests.mjs';
 import { getImports as getSwiftClassSupportImports } from './BridgeJSRuntimeTests/JavaScript/SwiftClassSupportTests.mjs';
 import { getImports as getOptionalSupportImports } from './BridgeJSRuntimeTests/JavaScript/OptionalSupportTests.mjs';
 import { getImports as getArraySupportImports, ArrayElementObject } from './BridgeJSRuntimeTests/JavaScript/ArraySupportTests.mjs';
@@ -43,6 +46,8 @@ export async function setupOptions(options, context) {
         }
     }
 
+    const joinStackParams = (...args) => args.map((v) => JSON.stringify(v)).join("|");
+
     return {
         ...options,
         getImports: (importsContext) => {
@@ -88,6 +93,15 @@ export async function setupOptions(options, context) {
                 "jsRoundTripFeatureFlag": (flag) => {
                     return flag;
                 },
+                "jsRoundTripLightColor": (value) => {
+                    return value;
+                },
+                "jsRoundTripImportedPayloadSignal": (value) => {
+                    return value;
+                },
+                "jsRoundTripOptionalImportedPayloadSignal": (value) => {
+                    return value;
+                },
                 "jsEchoJSValue": (v) => {
                     return v;
                 },
@@ -96,6 +110,7 @@ export async function setupOptions(options, context) {
                 },
                 ArrayElementObject,
                 JSClassWithArrayMembers,
+                Surface,
                 JsGreeter: class {
                     /**
                      * @param {string} name
@@ -141,6 +156,43 @@ export async function setupOptions(options, context) {
                 jsTranslatePoint: (point, dx, dy) => {
                     return { x: (point.x | 0) + (dx | 0), y: (point.y | 0) + (dy | 0) };
                 },
+                jsRoundTripOptionalPoint: (point) => point,
+                jsJoinOptionalArrayThenArray: joinStackParams,
+                jsJoinOptionalStructThenArray: joinStackParams,
+                jsJoinEnumThenArray: joinStackParams,
+                jsJoinStringThenStackParams: joinStackParams,
+                jsGenericRoundTrip: (v) => v,
+                jsGenericRoundTripClass: (v) => v,
+                jsGenericParsePoint: (json) => JSON.parse(json),
+                jsImportPickFirst: (a, b) => a,
+                jsImportMakeInt: () => 123,
+                jsImportCombineSecond: (a, b) => b,
+                jsGenericThrowOrRoundTrip: (shouldThrow, v) => {
+                    if (shouldThrow) {
+                        throw new Error("TestError");
+                    }
+                    return v;
+                },
+                jsGenericArrayRoundTrip: (v) => v,
+                jsGenericOptionalRoundTrip: (v) => v,
+                jsGenericDictRoundTrip: (v) => v,
+                jsGenericAfterOptionalArray: (a, b) => `${JSON.stringify(a)}|${JSON.stringify(b)}`,
+                ImportGenericConsumer: class {
+                    identity(value) {
+                        return value;
+                    }
+                    static box(value) {
+                        return value;
+                    }
+                },
+                ImportGenericBoxed: class {
+                    constructor(value) {
+                        this.value = value;
+                    }
+                    unwrap() {
+                        return this.value;
+                    }
+                },
                 roundTripArrayMembers: (value) => {
                     return value;
                 },
@@ -150,6 +202,8 @@ export async function setupOptions(options, context) {
                     runJsOptionalSupportTests(exports);
                 },
                 ClosureSupportImports: getClosureSupportImports(importsContext),
+                ClosureThrowsImports: getClosureThrowsImports(importsContext),
+                ClosureAsyncImports: getClosureAsyncImports(importsContext),
                 SwiftClassSupportImports: getSwiftClassSupportImports(importsContext),
                 OptionalSupportImports: getOptionalSupportImports(importsContext),
                 ArraySupportImports: getArraySupportImports(importsContext),
@@ -159,6 +213,7 @@ export async function setupOptions(options, context) {
                 IntegerTypesSupportImports: getIntegerTypesSupportImports(importsContext),
                 JSTypedArrayImports: getJSTypedArrayImports(importsContext),
                 IdentityModeTestImports: getIdentityModeTestImports(importsContext),
+                AliasImports: getAliasImports(importsContext),
             };
         },
         addToCoreImports(importObject, importsContext) {
@@ -182,6 +237,13 @@ export async function setupOptions(options, context) {
                 }
                 return BridgeJSRuntimeTests_runJsStructWorks(exports);
             }
+            bridgeJSRuntimeTests["runAliasWorks"] = () => {
+                const exports = getExports();
+                if (!exports) {
+                    throw new Error("No exports!?");
+                }
+                runAliasWorks(exports);
+            }
             const bridgeJSGlobalTests = importObject["BridgeJSGlobalTests"] || {};
             bridgeJSGlobalTests["runJsWorksGlobal"] = () => {
                 return BridgeJSGlobalTests_runJsWorksGlobal();
@@ -251,6 +313,18 @@ function BridgeJSRuntimeTests_runJsWorks(instance, exports) {
         assert.equal(exports.roundTripUnsafeMutablePointer(p), p);
     }
 
+    assert.equal(exports.renamedEcho("hi"), "echo: hi");
+    assert.equal(exports.jsNameEcho, undefined);
+    assert.equal(exports.greetName("John"), "Hello, John!");
+    assert.equal(exports.greetCount(3), "Hello, 3 people!");
+    const renamed = new exports.JSNameRenamedClass(21);
+    assert.equal(renamed.doubled(), 42);
+    assert.equal(renamed.current, 21);
+    renamed.current = 5;
+    assert.equal(renamed.doubled(), 10);
+    const madeRenamed = exports.JSNameRenamedClass.makeWithValue(7);
+    assert.equal(madeRenamed.current, 7);
+
     const g = new exports.Greeter("John");
     assert.equal(g.greet(), "Hello, John!");
 
@@ -301,6 +375,13 @@ function BridgeJSRuntimeTests_runJsWorks(instance, exports) {
     assert.ok(foo instanceof ImportedFoo);
     assert.equal(foo.value, "hello");
 
+    // Optional @JSClass directly as an exported function parameter/return value (issue #751)
+    const optFoo = new ImportedFoo("optional-foo");
+    const optFooResult = exports.roundTripOptionalImportedClass(optFoo);
+    assert.ok(optFooResult instanceof ImportedFoo);
+    assert.equal(optFooResult.value, "optional-foo");
+    assert.equal(exports.roundTripOptionalImportedClass(null), null);
+
     // Test PropertyHolder with various types
     const testObj = { testProp: "test" };
     const sibling = new exports.SimplePropertyHolder(999);
@@ -652,6 +733,39 @@ function BridgeJSRuntimeTests_runJsWorks(instance, exports) {
     testServer.call(exports.Networking.APIV2.Internal.SupportedMethod.Post);
     testServer.release();
 
+    const nestedHost = new exports.NestedTypeHost();
+    assert.equal(nestedHost.describe(), "host");
+    assert.equal(exports.NestedTypeHost.Variant.Primary, "primary");
+    assert.equal(exports.NestedTypeHost.Variant.Secondary, "secondary");
+    const hostLabel = exports.NestedTypeHost.Label.init("Save");
+    assert.equal(hostLabel.text, "Save");
+    assert.equal(exports.NestedTypeHost.Label.maxLength, 64);
+    assert.equal(exports.NestedTypeHost.Label.untitled().text, "untitled");
+    nestedHost.release();
+
+    const library = new exports.Library("Central");
+    assert.equal(library.describe(), "Central");
+    assert.equal(library.rename("Annex"), "Annex");
+    assert.equal(exports.Library.Genre.Fiction, "fiction");
+    assert.equal(exports.Library.Genre.Reference, "reference");
+    const shelf = exports.Library.Shelf.init("History");
+    assert.equal(shelf.label, "History");
+    assert.equal(exports.Library.Shelf.capacity, 32);
+    assert.equal(library.shelf("Science").label, "Science");
+    assert.equal(shelf.describeShelf(), "Shelf: History");
+    assert.equal(exports.Library.Shelf.Divider.init(5).slot, 5);
+    const updateMessage = { tag: exports.Message.Tag.Update, param0: exports.Update.Flip };
+    assert.deepEqual(exports.roundTripMessage(updateMessage), updateMessage);
+    const deleteMessage = { tag: exports.Message.Tag.Delete };
+    assert.deepEqual(exports.roundTripMessage(deleteMessage), deleteMessage);
+    library.release();
+
+    const workspace = new exports.Workspace("Docs");
+    assert.equal(workspace.describe(), "Docs");
+    assert.equal(exports.Workspace.Kind.Personal, "personal");
+    assert.equal(exports.Workspace.Kind.Shared, "shared");
+    workspace.release();
+
     const s1 = { tag: exports.APIResult.Tag.Success, param0: "Cześć 🙋‍♂️" };
     const f1 = { tag: exports.APIResult.Tag.Failure, param0: 42 };
     const i1 = { tag: APIResultValues.Tag.Info };
@@ -824,6 +938,7 @@ function testStructSupport(exports) {
     const scaled = vec.scaled(2.0);
     assert.equal(scaled.dx, 6.0);
     assert.equal(scaled.dy, 8.0);
+    assert.equal(vec.describe(), "Vector2D(3.0, 4.0)");
 
     const publicPoint = { x: 9, y: -3 };
     assert.deepEqual(exports.roundTripPublicPoint(publicPoint), publicPoint);
diff --git a/Utilities/build-examples.sh b/Utilities/build-examples.sh
index bc84e6943..77e923322 100755
--- a/Utilities/build-examples.sh
+++ b/Utilities/build-examples.sh
@@ -6,12 +6,14 @@ EXCLUDED_EXAMPLES=()
 
 for example in Examples/*; do
     skip_example=false
-    for excluded in "${EXCLUDED_EXAMPLES[@]}"; do
-        if [[ "$example" == *"$excluded"* ]]; then
-            skip_example=true
-            break
-        fi
-    done
+    if ((${#EXCLUDED_EXAMPLES[@]})); then
+        for excluded in "${EXCLUDED_EXAMPLES[@]}"; do
+            if [[ "$example" == *"$excluded"* ]]; then
+                skip_example=true
+                break
+            fi
+        done
+    fi
     if [ "$skip_example" = true ]; then
         echo "Skipping $example"
         continue
diff --git a/package.json b/package.json
index 509cddde2..866b2bb6f 100644
--- a/package.json
+++ b/package.json
@@ -14,6 +14,7 @@
     "build:ts": "cd Runtime; rollup -c",
     "prepublishOnly": "npm run build",
     "format": "prettier --write Runtime/src",
+    "test:runtime": "vitest run Runtime/test",
     "check:bridgejs-dts": "tsc --project Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/tsconfig.json"
   },
   "keywords": [