Merge pull request #642 from PassiveLogic/kr/bridgejs-wrap-function-scope-fix

kateinoigakukun · web-flow · commit d8ae96f299a0 · 2026-02-18T09:41:52.000+09:00
BridgeJS: Use indirect _exports lookup in wrap functions
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -200,15 +200,15 @@ 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
             if (!importObject["PrivateModule"]) {
                 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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);
             };
         },

Original file line number	Diff line number	Diff line change
`@@ -1122,7 +1122,7 @@ public struct BridgeJSLink {`
`1122`	`1122`	`for klass in classes.sorted(by: { $0.name < $1.name }) {`
`1123`	`1123`	`let wrapperFunctionName = "bjs_\(klass.name)_wrap"`
`1124`	`1124`	`wrapperLines.append("importObject[\"\(moduleName)\"][\"\(wrapperFunctionName)\"] = function(pointer) {")`
`1125`		`- wrapperLines.append(" const obj = \(klass.name).__construct(pointer);")`
	`1125`	`+ wrapperLines.append(" const obj = _exports['\(klass.name)'].__construct(pointer);")`
`1126`	`1126`	`wrapperLines.append(" return \(JSGlueVariableScope.reservedSwift).memory.retain(obj);")`
`1127`	`1127`	`wrapperLines.append("};")`
`1128`	`1128`	`}`
Original file line number	Diff line number	Diff line change
`@@ -239,7 +239,7 @@ export async function createInstantiator(options, swift) {`
`239`	`239`	`importObject["TestModule"] = {};`
`240`	`240`	`}`
`241`	`241`	`importObject["TestModule"]["bjs_Item_wrap"] = function(pointer) {`
`242`		`- const obj = Item.__construct(pointer);`
	`242`	`+ const obj = _exports['Item'].__construct(pointer);`
`243`	`243`	`return swift.memory.retain(obj);`
`244`	`244`	`};`
`245`	`245`	`const TestModule = importObject["TestModule"] = importObject["TestModule"] \|\| {};`
Original file line number	Diff line number	Diff line change
`@@ -201,7 +201,7 @@ export async function createInstantiator(options, swift) {`
`201`	`201`	`importObject["TestModule"] = {};`
`202`	`202`	`}`
`203`	`203`	`importObject["TestModule"]["bjs_Box_wrap"] = function(pointer) {`
`204`		`- const obj = Box.__construct(pointer);`
	`204`	`+ const obj = _exports['Box'].__construct(pointer);`
`205`	`205`	`return swift.memory.retain(obj);`
`206`	`206`	`};`
`207`	`207`	`const TestModule = importObject["TestModule"] = importObject["TestModule"] \|\| {};`
Original file line number	Diff line number	Diff line change
`@@ -1027,7 +1027,7 @@ export async function createInstantiator(options, swift) {`
`1027`	`1027`	`importObject["TestModule"] = {};`
`1028`	`1028`	`}`
`1029`	`1029`	`importObject["TestModule"]["bjs_User_wrap"] = function(pointer) {`
`1030`		`- const obj = User.__construct(pointer);`
	`1030`	`+ const obj = _exports['User'].__construct(pointer);`
`1031`	`1031`	`return swift.memory.retain(obj);`
`1032`	`1032`	`};`
`1033`	`1033`	`},`
Original file line number	Diff line number	Diff line change
`@@ -290,7 +290,7 @@ export async function createInstantiator(options, swift) {`
`290`	`290`	`importObject["TestModule"] = {};`
`291`	`291`	`}`
`292`	`292`	`importObject["TestModule"]["bjs_JSValueHolder_wrap"] = function(pointer) {`
`293`		`- const obj = JSValueHolder.__construct(pointer);`
	`293`	`+ const obj = _exports['JSValueHolder'].__construct(pointer);`
`294`	`294`	`return swift.memory.retain(obj);`
`295`	`295`	`};`
`296`	`296`	`const TestModule = importObject["TestModule"] = importObject["TestModule"] \|\| {};`
Original file line number	Diff line number	Diff line change
`@@ -200,7 +200,7 @@ export async function createInstantiator(options, swift) {`
`200`	`200`	`importObject["TestModule"] = {};`
`201`	`201`	`}`
`202`	`202`	`importObject["TestModule"]["bjs_GlobalClass_wrap"] = function(pointer) {`
`203`		`- const obj = GlobalClass.__construct(pointer);`
	`203`	`+ const obj = _exports['GlobalClass'].__construct(pointer);`
`204`	`204`	`return swift.memory.retain(obj);`
`205`	`205`	`};`
`206`	`206`	`},`