From 487cf7911307c60efbb6c3613cf61915d721be20 Mon Sep 17 00:00:00 2001
From: Krzysztof Rodak <krodak.konta@gmail.com>
Date: Tue, 17 Feb 2026 12:14:57 +0100
Subject: [PATCH] BridgeJS: Use indirect _exports lookup in wrap functions

---
 Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift    | 2 +-
 .../__Snapshots__/BridgeJSLinkTests/ArrayTypes.js           | 2 +-
 .../__Snapshots__/BridgeJSLinkTests/DefaultParameters.js    | 6 +++---
 .../__Snapshots__/BridgeJSLinkTests/DictionaryTypes.js      | 2 +-
 .../__Snapshots__/BridgeJSLinkTests/EnumAssociatedValue.js  | 2 +-
 .../__Snapshots__/BridgeJSLinkTests/EnumNamespace.Global.js | 6 +++---
 .../__Snapshots__/BridgeJSLinkTests/EnumNamespace.js        | 6 +++---
 .../__Snapshots__/BridgeJSLinkTests/JSValue.js              | 2 +-
 .../__Snapshots__/BridgeJSLinkTests/MixedGlobal.js          | 2 +-
 .../__Snapshots__/BridgeJSLinkTests/MixedModules.js         | 4 ++--
 .../__Snapshots__/BridgeJSLinkTests/MixedPrivate.js         | 2 +-
 .../__Snapshots__/BridgeJSLinkTests/Namespaces.Global.js    | 6 +++---
 .../__Snapshots__/BridgeJSLinkTests/Namespaces.js           | 6 +++---
 .../__Snapshots__/BridgeJSLinkTests/Optionals.js            | 4 ++--
 .../__Snapshots__/BridgeJSLinkTests/PropertyTypes.js        | 2 +-
 .../__Snapshots__/BridgeJSLinkTests/Protocol.js             | 6 +++---
 .../BridgeJSLinkTests/StaticFunctions.Global.js             | 2 +-
 .../__Snapshots__/BridgeJSLinkTests/StaticFunctions.js      | 2 +-
 .../BridgeJSLinkTests/StaticProperties.Global.js            | 2 +-
 .../__Snapshots__/BridgeJSLinkTests/StaticProperties.js     | 2 +-
 .../__Snapshots__/BridgeJSLinkTests/SwiftClass.js           | 6 +++---
 .../__Snapshots__/BridgeJSLinkTests/SwiftClosure.js         | 4 ++--
 .../__Snapshots__/BridgeJSLinkTests/SwiftStruct.js          | 2 +-
 23 files changed, 40 insertions(+), 40 deletions(-)

diff --git a/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift b/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift
index b779e0171..625b82b6e 100644
--- a/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift
+++ b/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift
@@ -1122,7 +1122,7 @@ public struct BridgeJSLink {
             for klass in classes.sorted(by: { $0.name < $1.name }) {
                 let wrapperFunctionName = "bjs_\(klass.name)_wrap"
                 wrapperLines.append("importObject[\"\(moduleName)\"][\"\(wrapperFunctionName)\"] = function(pointer) {")
-                wrapperLines.append("    const obj = \(klass.name).__construct(pointer);")
+                wrapperLines.append("    const obj = _exports['\(klass.name)'].__construct(pointer);")
                 wrapperLines.append("    return \(JSGlueVariableScope.reservedSwift).memory.retain(obj);")
                 wrapperLines.append("};")
             }
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ArrayTypes.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ArrayTypes.js
index 52438d27d..5944dc257 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ArrayTypes.js
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ArrayTypes.js
@@ -239,7 +239,7 @@ export async function createInstantiator(options, swift) {
                 importObject["TestModule"] = {};
             }
             importObject["TestModule"]["bjs_Item_wrap"] = function(pointer) {
-                const obj = Item.__construct(pointer);
+                const obj = _exports['Item'].__construct(pointer);
                 return swift.memory.retain(obj);
             };
             const TestModule = importObject["TestModule"] = importObject["TestModule"] || {};
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DefaultParameters.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DefaultParameters.js
index 6182298a1..adb9143cf 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DefaultParameters.js
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DefaultParameters.js
@@ -272,15 +272,15 @@ export async function createInstantiator(options, swift) {
                 importObject["TestModule"] = {};
             }
             importObject["TestModule"]["bjs_ConstructorDefaults_wrap"] = function(pointer) {
-                const obj = ConstructorDefaults.__construct(pointer);
+                const obj = _exports['ConstructorDefaults'].__construct(pointer);
                 return swift.memory.retain(obj);
             };
             importObject["TestModule"]["bjs_DefaultGreeter_wrap"] = function(pointer) {
-                const obj = DefaultGreeter.__construct(pointer);
+                const obj = _exports['DefaultGreeter'].__construct(pointer);
                 return swift.memory.retain(obj);
             };
             importObject["TestModule"]["bjs_EmptyGreeter_wrap"] = function(pointer) {
-                const obj = EmptyGreeter.__construct(pointer);
+                const obj = _exports['EmptyGreeter'].__construct(pointer);
                 return swift.memory.retain(obj);
             };
         },
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DictionaryTypes.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DictionaryTypes.js
index 4f71aa76e..41a6074ea 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DictionaryTypes.js
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DictionaryTypes.js
@@ -201,7 +201,7 @@ export async function createInstantiator(options, swift) {
                 importObject["TestModule"] = {};
             }
             importObject["TestModule"]["bjs_Box_wrap"] = function(pointer) {
-                const obj = Box.__construct(pointer);
+                const obj = _exports['Box'].__construct(pointer);
                 return swift.memory.retain(obj);
             };
             const TestModule = importObject["TestModule"] = importObject["TestModule"] || {};
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumAssociatedValue.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumAssociatedValue.js
index af81d52fe..a5ead8a1c 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumAssociatedValue.js
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumAssociatedValue.js
@@ -1027,7 +1027,7 @@ export async function createInstantiator(options, swift) {
                 importObject["TestModule"] = {};
             }
             importObject["TestModule"]["bjs_User_wrap"] = function(pointer) {
-                const obj = User.__construct(pointer);
+                const obj = _exports['User'].__construct(pointer);
                 return swift.memory.retain(obj);
             };
         },
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Global.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Global.js
index 392788ef6..887f5ff3f 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Global.js
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Global.js
@@ -244,15 +244,15 @@ export async function createInstantiator(options, swift) {
                 importObject["TestModule"] = {};
             }
             importObject["TestModule"]["bjs_Converter_wrap"] = function(pointer) {
-                const obj = Converter.__construct(pointer);
+                const obj = _exports['Converter'].__construct(pointer);
                 return swift.memory.retain(obj);
             };
             importObject["TestModule"]["bjs_HTTPServer_wrap"] = function(pointer) {
-                const obj = HTTPServer.__construct(pointer);
+                const obj = _exports['HTTPServer'].__construct(pointer);
                 return swift.memory.retain(obj);
             };
             importObject["TestModule"]["bjs_TestServer_wrap"] = function(pointer) {
-                const obj = TestServer.__construct(pointer);
+                const obj = _exports['TestServer'].__construct(pointer);
                 return swift.memory.retain(obj);
             };
         },
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.js
index 0a2826a5e..a9470aad7 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.js
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.js
@@ -225,15 +225,15 @@ export async function createInstantiator(options, swift) {
                 importObject["TestModule"] = {};
             }
             importObject["TestModule"]["bjs_Converter_wrap"] = function(pointer) {
-                const obj = Converter.__construct(pointer);
+                const obj = _exports['Converter'].__construct(pointer);
                 return swift.memory.retain(obj);
             };
             importObject["TestModule"]["bjs_HTTPServer_wrap"] = function(pointer) {
-                const obj = HTTPServer.__construct(pointer);
+                const obj = _exports['HTTPServer'].__construct(pointer);
                 return swift.memory.retain(obj);
             };
             importObject["TestModule"]["bjs_TestServer_wrap"] = function(pointer) {
-                const obj = TestServer.__construct(pointer);
+                const obj = _exports['TestServer'].__construct(pointer);
                 return swift.memory.retain(obj);
             };
         },
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSValue.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSValue.js
index d45efc771..ab59944ce 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSValue.js
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSValue.js
@@ -290,7 +290,7 @@ export async function createInstantiator(options, swift) {
                 importObject["TestModule"] = {};
             }
             importObject["TestModule"]["bjs_JSValueHolder_wrap"] = function(pointer) {
-                const obj = JSValueHolder.__construct(pointer);
+                const obj = _exports['JSValueHolder'].__construct(pointer);
                 return swift.memory.retain(obj);
             };
             const TestModule = importObject["TestModule"] = importObject["TestModule"] || {};
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedGlobal.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedGlobal.js
index 675aa3798..ee89f5e5f 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedGlobal.js
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedGlobal.js
@@ -200,7 +200,7 @@ export async function createInstantiator(options, swift) {
                 importObject["TestModule"] = {};
             }
             importObject["TestModule"]["bjs_GlobalClass_wrap"] = function(pointer) {
-                const obj = GlobalClass.__construct(pointer);
+                const obj = _exports['GlobalClass'].__construct(pointer);
                 return swift.memory.retain(obj);
             };
         },
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedModules.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedModules.js
index 6a6c75ef4..ab54a88c3 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedModules.js
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedModules.js
@@ -200,7 +200,7 @@ export async function createInstantiator(options, swift) {
                 importObject["GlobalModule"] = {};
             }
             importObject["GlobalModule"]["bjs_GlobalClass_wrap"] = function(pointer) {
-                const obj = GlobalClass.__construct(pointer);
+                const obj = _exports['GlobalClass'].__construct(pointer);
                 return swift.memory.retain(obj);
             };
             // Wrapper functions for module: PrivateModule
@@ -208,7 +208,7 @@ export async function createInstantiator(options, swift) {
                 importObject["PrivateModule"] = {};
             }
             importObject["PrivateModule"]["bjs_PrivateClass_wrap"] = function(pointer) {
-                const obj = PrivateClass.__construct(pointer);
+                const obj = _exports['PrivateClass'].__construct(pointer);
                 return swift.memory.retain(obj);
             };
         },
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedPrivate.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedPrivate.js
index f36211310..24dac8d27 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedPrivate.js
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedPrivate.js
@@ -200,7 +200,7 @@ export async function createInstantiator(options, swift) {
                 importObject["TestModule"] = {};
             }
             importObject["TestModule"]["bjs_PrivateClass_wrap"] = function(pointer) {
-                const obj = PrivateClass.__construct(pointer);
+                const obj = _exports['PrivateClass'].__construct(pointer);
                 return swift.memory.retain(obj);
             };
         },
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.Global.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.Global.js
index 09ad002a1..3ce2779e1 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.Global.js
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.Global.js
@@ -200,15 +200,15 @@ export async function createInstantiator(options, swift) {
                 importObject["TestModule"] = {};
             }
             importObject["TestModule"]["bjs_Converter_wrap"] = function(pointer) {
-                const obj = Converter.__construct(pointer);
+                const obj = _exports['Converter'].__construct(pointer);
                 return swift.memory.retain(obj);
             };
             importObject["TestModule"]["bjs_Greeter_wrap"] = function(pointer) {
-                const obj = Greeter.__construct(pointer);
+                const obj = _exports['Greeter'].__construct(pointer);
                 return swift.memory.retain(obj);
             };
             importObject["TestModule"]["bjs_UUID_wrap"] = function(pointer) {
-                const obj = UUID.__construct(pointer);
+                const obj = _exports['UUID'].__construct(pointer);
                 return swift.memory.retain(obj);
             };
         },
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.js
index 7368e52fa..d4437f0c1 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.js
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.js
@@ -200,15 +200,15 @@ export async function createInstantiator(options, swift) {
                 importObject["TestModule"] = {};
             }
             importObject["TestModule"]["bjs_Converter_wrap"] = function(pointer) {
-                const obj = Converter.__construct(pointer);
+                const obj = _exports['Converter'].__construct(pointer);
                 return swift.memory.retain(obj);
             };
             importObject["TestModule"]["bjs_Greeter_wrap"] = function(pointer) {
-                const obj = Greeter.__construct(pointer);
+                const obj = _exports['Greeter'].__construct(pointer);
                 return swift.memory.retain(obj);
             };
             importObject["TestModule"]["bjs_UUID_wrap"] = function(pointer) {
-                const obj = UUID.__construct(pointer);
+                const obj = _exports['UUID'].__construct(pointer);
                 return swift.memory.retain(obj);
             };
         },
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Optionals.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Optionals.js
index c4f99c84b..349921a25 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Optionals.js
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Optionals.js
@@ -201,11 +201,11 @@ export async function createInstantiator(options, swift) {
                 importObject["TestModule"] = {};
             }
             importObject["TestModule"]["bjs_Greeter_wrap"] = function(pointer) {
-                const obj = Greeter.__construct(pointer);
+                const obj = _exports['Greeter'].__construct(pointer);
                 return swift.memory.retain(obj);
             };
             importObject["TestModule"]["bjs_OptionalPropertyHolder_wrap"] = function(pointer) {
-                const obj = OptionalPropertyHolder.__construct(pointer);
+                const obj = _exports['OptionalPropertyHolder'].__construct(pointer);
                 return swift.memory.retain(obj);
             };
             const TestModule = importObject["TestModule"] = importObject["TestModule"] || {};
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PropertyTypes.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PropertyTypes.js
index b39362233..024523591 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PropertyTypes.js
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PropertyTypes.js
@@ -200,7 +200,7 @@ export async function createInstantiator(options, swift) {
                 importObject["TestModule"] = {};
             }
             importObject["TestModule"]["bjs_PropertyHolder_wrap"] = function(pointer) {
-                const obj = PropertyHolder.__construct(pointer);
+                const obj = _exports['PropertyHolder'].__construct(pointer);
                 return swift.memory.retain(obj);
             };
         },
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Protocol.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Protocol.js
index 1d413db20..0ff740ad1 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Protocol.js
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Protocol.js
@@ -261,15 +261,15 @@ export async function createInstantiator(options, swift) {
                 importObject["TestModule"] = {};
             }
             importObject["TestModule"]["bjs_DelegateManager_wrap"] = function(pointer) {
-                const obj = DelegateManager.__construct(pointer);
+                const obj = _exports['DelegateManager'].__construct(pointer);
                 return swift.memory.retain(obj);
             };
             importObject["TestModule"]["bjs_Helper_wrap"] = function(pointer) {
-                const obj = Helper.__construct(pointer);
+                const obj = _exports['Helper'].__construct(pointer);
                 return swift.memory.retain(obj);
             };
             importObject["TestModule"]["bjs_MyViewController_wrap"] = function(pointer) {
-                const obj = MyViewController.__construct(pointer);
+                const obj = _exports['MyViewController'].__construct(pointer);
                 return swift.memory.retain(obj);
             };
             const TestModule = importObject["TestModule"] = importObject["TestModule"] || {};
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.Global.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.Global.js
index 07f7a3c77..370ca98b4 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.Global.js
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.Global.js
@@ -248,7 +248,7 @@ export async function createInstantiator(options, swift) {
                 importObject["TestModule"] = {};
             }
             importObject["TestModule"]["bjs_MathUtils_wrap"] = function(pointer) {
-                const obj = MathUtils.__construct(pointer);
+                const obj = _exports['MathUtils'].__construct(pointer);
                 return swift.memory.retain(obj);
             };
         },
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.js
index c2c3f9a70..bd7964c85 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.js
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.js
@@ -248,7 +248,7 @@ export async function createInstantiator(options, swift) {
                 importObject["TestModule"] = {};
             }
             importObject["TestModule"]["bjs_MathUtils_wrap"] = function(pointer) {
-                const obj = MathUtils.__construct(pointer);
+                const obj = _exports['MathUtils'].__construct(pointer);
                 return swift.memory.retain(obj);
             };
         },
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.Global.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.Global.js
index 3784b5a7e..b5155bddf 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.Global.js
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.Global.js
@@ -205,7 +205,7 @@ export async function createInstantiator(options, swift) {
                 importObject["TestModule"] = {};
             }
             importObject["TestModule"]["bjs_PropertyClass_wrap"] = function(pointer) {
-                const obj = PropertyClass.__construct(pointer);
+                const obj = _exports['PropertyClass'].__construct(pointer);
                 return swift.memory.retain(obj);
             };
         },
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.js
index 47f0092af..47918485d 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.js
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.js
@@ -205,7 +205,7 @@ export async function createInstantiator(options, swift) {
                 importObject["TestModule"] = {};
             }
             importObject["TestModule"]["bjs_PropertyClass_wrap"] = function(pointer) {
-                const obj = PropertyClass.__construct(pointer);
+                const obj = _exports['PropertyClass'].__construct(pointer);
                 return swift.memory.retain(obj);
             };
         },
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClass.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClass.js
index 9f8f93c5b..7dce46d8e 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClass.js
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClass.js
@@ -201,15 +201,15 @@ export async function createInstantiator(options, swift) {
                 importObject["TestModule"] = {};
             }
             importObject["TestModule"]["bjs_Greeter_wrap"] = function(pointer) {
-                const obj = Greeter.__construct(pointer);
+                const obj = _exports['Greeter'].__construct(pointer);
                 return swift.memory.retain(obj);
             };
             importObject["TestModule"]["bjs_PackageGreeter_wrap"] = function(pointer) {
-                const obj = PackageGreeter.__construct(pointer);
+                const obj = _exports['PackageGreeter'].__construct(pointer);
                 return swift.memory.retain(obj);
             };
             importObject["TestModule"]["bjs_PublicGreeter_wrap"] = function(pointer) {
-                const obj = PublicGreeter.__construct(pointer);
+                const obj = _exports['PublicGreeter'].__construct(pointer);
                 return swift.memory.retain(obj);
             };
             const TestModule = importObject["TestModule"] = importObject["TestModule"] || {};
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosure.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosure.js
index 3371cf1b3..d701e93d7 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosure.js
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosure.js
@@ -885,11 +885,11 @@ export async function createInstantiator(options, swift) {
                 importObject["TestModule"] = {};
             }
             importObject["TestModule"]["bjs_Person_wrap"] = function(pointer) {
-                const obj = Person.__construct(pointer);
+                const obj = _exports['Person'].__construct(pointer);
                 return swift.memory.retain(obj);
             };
             importObject["TestModule"]["bjs_TestProcessor_wrap"] = function(pointer) {
-                const obj = TestProcessor.__construct(pointer);
+                const obj = _exports['TestProcessor'].__construct(pointer);
                 return swift.memory.retain(obj);
             };
         },
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStruct.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStruct.js
index 316dfb709..f3c0810c1 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStruct.js
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStruct.js
@@ -512,7 +512,7 @@ export async function createInstantiator(options, swift) {
                 importObject["TestModule"] = {};
             }
             importObject["TestModule"]["bjs_Greeter_wrap"] = function(pointer) {
-                const obj = Greeter.__construct(pointer);
+                const obj = _exports['Greeter'].__construct(pointer);
                 return swift.memory.retain(obj);
             };
         },