BridgeJS: Fix PlayBridgeJS build

kateinoigakukun · kateinoigakukun · commit b176aef0fd1e · 2026-01-17T17:46:02.000+09:00
diff --git a/Examples/PlayBridgeJS/Sources/JavaScript/app.js b/Examples/PlayBridgeJS/Sources/JavaScript/app.js
@@ -250,9 +250,9 @@ export class BridgeJSPlayground {
                 // Process the TypeScript definitions to generate skeleton
                 const processor = new TypeProcessor(tsProgram.getTypeChecker(), diagnosticEngine);
 
-                const skeleton = processor.processTypeDeclarations(tsProgram, virtualFilePath);
+                const { content } = processor.processTypeDeclarations(tsProgram, virtualFilePath);
 
-                return JSON.stringify(skeleton);
+                return content;
             }
         }
     }
@@ -340,4 +340,4 @@ export class BridgeJSPlayground {
             this.progressBar.classList.add('hidden');
         }
     }
-}
+}
diff --git a/Examples/PlayBridgeJS/Sources/JavaScript/editor.js b/Examples/PlayBridgeJS/Sources/JavaScript/editor.js
@@ -38,20 +38,20 @@ export class EditorSystem {
                     modelUri: 'Playground.d.ts'
                 },
                 {
-                    key: 'import-glue',
-                    id: 'importGlueOutput',
+                    key: 'swift-import-macros',
+                    id: 'swiftImportMacrosOutput',
                     language: 'swift',
-                    placeholder: '// Import Swift Glue will appear here...',
+                    placeholder: '// Import Swift Macros will appear here...',
                     readOnly: true,
-                    modelUri: 'ImportTS.swift'
+                    modelUri: 'BridgeJS.Macros.swift'
                 },
                 {
-                    key: 'export-glue',
-                    id: 'exportGlueOutput',
+                    key: 'swift-glue',
+                    id: 'swiftGlueOutput',
                     language: 'swift',
-                    placeholder: '// Export Swift Glue will appear here...',
+                    placeholder: '// Swift Glue will appear here...',
                     readOnly: true,
-                    modelUri: 'ExportTS.swift'
+                    modelUri: 'BridgeJS.swift'
                 },
                 {
                     key: 'js-generated',
@@ -206,8 +206,8 @@ export class EditorSystem {
 
     updateOutputs(result) {
         const outputMap = {
-            'import-glue': () => result.importSwiftGlue(),
-            'export-glue': () => result.exportSwiftGlue(),
+            'swift-glue': () => result.swiftGlue(),
+            'swift-import-macros': () => result.importSwiftMacroDecls(),
             'js-generated': () => result.outputJs(),
             'dts-generated': () => result.outputDts()
         };
@@ -238,4 +238,4 @@ export class EditorSystem {
     getActiveTabs() {
         return this.activeTabs;
     }
-}
+}
diff --git a/Examples/PlayBridgeJS/Sources/JavaScript/processor.js b/Examples/PlayBridgeJS/Sources/JavaScript/processor.js
@@ -1 +1 @@
-../../../../Plugins/BridgeJS/Sources/TS2Skeleton/JavaScript/src/processor.js
+../../../../Plugins/BridgeJS/Sources/TS2Swift/JavaScript/src/processor.js
diff --git a/Examples/PlayBridgeJS/Sources/PlayBridgeJS/Generated/BridgeJS.swift b/Examples/PlayBridgeJS/Sources/PlayBridgeJS/Generated/BridgeJS.swift
@@ -90,22 +90,22 @@ public func _bjs_PlayBridgeJSOutput_outputDts(_ _self: UnsafeMutableRawPointer)
     #endif
 }
 
-@_expose(wasm, "bjs_PlayBridgeJSOutput_importSwiftGlue")
-@_cdecl("bjs_PlayBridgeJSOutput_importSwiftGlue")
-public func _bjs_PlayBridgeJSOutput_importSwiftGlue(_ _self: UnsafeMutableRawPointer) -> Void {
+@_expose(wasm, "bjs_PlayBridgeJSOutput_importSwiftMacroDecls")
+@_cdecl("bjs_PlayBridgeJSOutput_importSwiftMacroDecls")
+public func _bjs_PlayBridgeJSOutput_importSwiftMacroDecls(_ _self: UnsafeMutableRawPointer) -> Void {
     #if arch(wasm32)
-    let ret = PlayBridgeJSOutput.bridgeJSLiftParameter(_self).importSwiftGlue()
+    let ret = PlayBridgeJSOutput.bridgeJSLiftParameter(_self).importSwiftMacroDecls()
     return ret.bridgeJSLowerReturn()
     #else
     fatalError("Only available on WebAssembly")
     #endif
 }
 
-@_expose(wasm, "bjs_PlayBridgeJSOutput_exportSwiftGlue")
-@_cdecl("bjs_PlayBridgeJSOutput_exportSwiftGlue")
-public func _bjs_PlayBridgeJSOutput_exportSwiftGlue(_ _self: UnsafeMutableRawPointer) -> Void {
+@_expose(wasm, "bjs_PlayBridgeJSOutput_swiftGlue")
+@_cdecl("bjs_PlayBridgeJSOutput_swiftGlue")
+public func _bjs_PlayBridgeJSOutput_swiftGlue(_ _self: UnsafeMutableRawPointer) -> Void {
     #if arch(wasm32)
-    let ret = PlayBridgeJSOutput.bridgeJSLiftParameter(_self).exportSwiftGlue()
+    let ret = PlayBridgeJSOutput.bridgeJSLiftParameter(_self).swiftGlue()
     return ret.bridgeJSLowerReturn()
     #else
     fatalError("Only available on WebAssembly")
diff --git a/Examples/PlayBridgeJS/Sources/PlayBridgeJS/Generated/JavaScript/BridgeJS.json b/Examples/PlayBridgeJS/Sources/PlayBridgeJS/Generated/JavaScript/BridgeJS.json
@@ -92,13 +92,13 @@
             }
           },
           {
-            "abiName" : "bjs_PlayBridgeJSOutput_importSwiftGlue",
+            "abiName" : "bjs_PlayBridgeJSOutput_importSwiftMacroDecls",
             "effects" : {
               "isAsync" : false,
               "isStatic" : false,
               "isThrows" : false
             },
-            "name" : "importSwiftGlue",
+            "name" : "importSwiftMacroDecls",
             "parameters" : [
 
             ],
@@ -109,13 +109,13 @@
             }
           },
           {
-            "abiName" : "bjs_PlayBridgeJSOutput_exportSwiftGlue",
+            "abiName" : "bjs_PlayBridgeJSOutput_swiftGlue",
             "effects" : {
               "isAsync" : false,
               "isStatic" : false,
               "isThrows" : false
             },
-            "name" : "exportSwiftGlue",
+            "name" : "swiftGlue",
             "parameters" : [
 
             ],
diff --git a/Examples/PlayBridgeJS/Sources/PlayBridgeJS/main.swift b/Examples/PlayBridgeJS/Sources/PlayBridgeJS/main.swift
@@ -22,49 +22,45 @@ import class Foundation.JSONDecoder
         let sourceFile = Parser.parse(source: swiftSource)
         try exportSwift.addSourceFile(sourceFile, "Playground.swift")
         let exportResult = try exportSwift.finalize()
-        var importTS = ImportTS(progress: .silent, moduleName: moduleName)
         let ts2swift = try createTS2Swift()
-        let skeletonJSONString = try ts2swift.convert(dtsSource)
-        let decoder = JSONDecoder()
-        let importSkeleton = try decoder.decode(
-            ImportedFileSkeleton.self,
-            from: skeletonJSONString.data(using: .utf8)!
-        )
-        importTS.addSkeleton(importSkeleton)
-        let importSwiftGlue = try importTS.finalize()
-
+        let importSwiftMacroDecls = try ts2swift.convert(dtsSource)
+        let importSwift = ImportSwiftMacros(progress: .silent, moduleName: moduleName)
+        let importSourceFile = Parser.parse(source: importSwiftMacroDecls)
+        importSwift.addSourceFile(importSourceFile, "Playground.Macros.swift")
+        importSwift.addSourceFile(sourceFile, "Playground.swift")
+        let importResult = try importSwift.finalize()
         let skeleton = BridgeJSSkeleton(
             moduleName: moduleName,
             exported: exportResult.map { $0.outputSkeleton },
-            imported: ImportedModuleSkeleton(children: [importSkeleton])
+            imported: importResult.outputSkeleton
         )
         let linker = BridgeJSLink(skeletons: [skeleton], sharedMemory: false)
         let linked = try linker.link()
 
         return PlayBridgeJSOutput(
             outputJs: linked.outputJs,
             outputDts: linked.outputDts,
-            importSwiftGlue: importSwiftGlue ?? "",
-            exportSwiftGlue: exportResult?.outputSwift ?? ""
+            importSwiftMacroDecls: importSwiftMacroDecls,
+            swiftGlue: (importResult.outputSwift ?? "") + "\n\n" + (exportResult?.outputSwift ?? "")
         )
     }
 }
 
 @JS class PlayBridgeJSOutput {
     let _outputJs: String
     let _outputDts: String
-    let _importSwiftGlue: String
-    let _exportSwiftGlue: String
+    let _importSwiftMacroDecls: String
+    let _swiftGlue: String
 
-    init(outputJs: String, outputDts: String, importSwiftGlue: String, exportSwiftGlue: String) {
+    init(outputJs: String, outputDts: String, importSwiftMacroDecls: String, swiftGlue: String) {
         self._outputJs = outputJs
         self._outputDts = outputDts
-        self._importSwiftGlue = importSwiftGlue
-        self._exportSwiftGlue = exportSwiftGlue
+        self._importSwiftMacroDecls = importSwiftMacroDecls
+        self._swiftGlue = swiftGlue
     }
 
     @JS func outputJs() -> String { self._outputJs }
     @JS func outputDts() -> String { self._outputDts }
-    @JS func importSwiftGlue() -> String { self._importSwiftGlue }
-    @JS func exportSwiftGlue() -> String { self._exportSwiftGlue }
+    @JS func importSwiftMacroDecls() -> String { self._importSwiftMacroDecls }
+    @JS func swiftGlue() -> String { self._swiftGlue }
 }
diff --git a/Examples/PlayBridgeJS/index.html b/Examples/PlayBridgeJS/index.html
@@ -84,15 +84,15 @@ <h2 class="output-title">Output</h2>
                 </div>
                 <div class="tab-group">
                     <button class="tab-button active" data-tab="dts-generated">Playground.d.ts</button>
+                    <button class="tab-button" data-tab="swift-import-macros">BridgeJS.Macros.swift</button>
                     <button class="tab-button" data-tab="js-generated">Playground.js</button>
-                    <button class="tab-button" data-tab="import-glue">ImportTS.swift</button>
-                    <button class="tab-button" data-tab="export-glue">ExportSwift.swift</button>
+                    <button class="tab-button" data-tab="swift-glue">BridgeJS.swift</button>
                 </div>
-                <div id="importGlueOutputTab" class="tab-content active">
-                    <div id="importGlueOutput" class="editor-container"></div>
+                <div id="swiftImportMacrosOutputTab" class="tab-content active">
+                    <div id="swiftImportMacrosOutput" class="editor-container"></div>
                 </div>
-                <div id="exportGlueOutputTab" class="tab-content">
-                    <div id="exportGlueOutput" class="editor-container"></div>
+                <div id="swiftGlueOutputTab" class="tab-content">
+                    <div id="swiftGlueOutput" class="editor-container"></div>
                 </div>
                 <div id="jsOutputTab" class="tab-content">
                     <div id="jsOutput" class="editor-container"></div>
diff --git a/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/src/processor.js b/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/src/processor.js
@@ -5,7 +5,6 @@
 
 // @ts-check
 import ts from 'typescript';
-import path from 'path';
 
 /** @typedef {import('./index.d.ts').Parameter} Parameter */
 /** @typedef {import('./index.d.ts').BridgeType} BridgeType */
@@ -64,11 +63,9 @@ export class TypeProcessor {
      * @returns {{ content: string, hasAny: boolean }} Rendered Swift code
      */
     processTypeDeclarations(program, inputFilePath) {
-        const normalizedInput = path.resolve(inputFilePath);
-        const sourceFiles = program.getSourceFiles().filter(sf => {
-            if (!sf.isDeclarationFile) return true;
-            return path.resolve(sf.fileName) === normalizedInput;
-        });
+        const sourceFiles = program.getSourceFiles().filter(
+            sf => !sf.isDeclarationFile || sf.fileName === inputFilePath
+        );
 
         // Add prelude
         this.swiftLines.push(
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/ImportTSTests.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/ImportTSTests.swift
@@ -22,7 +22,6 @@ import SwiftParser
         let nodePath = try #require(which("node"))
         let tsconfigPath = url.deletingLastPathComponent().appendingPathComponent("tsconfig.json")
 
-        // Use the new workflow: invokeTS2Swift -> ImportSwiftMacros -> ImportTS
         let swiftSource = try invokeTS2Swift(
             dtsFile: url.path,
             tsconfigPath: tsconfigPath.path,
@@ -42,12 +41,7 @@ import SwiftParser
         importSwift.addSourceFile(sourceFile, "\(name).Macros.swift")
         let importResult = try importSwift.finalize()
 
-        var api = ImportTS(progress: .silent, moduleName: "Check")
-        for child in importResult.outputSkeleton.children {
-            api.addSkeleton(child)
-        }
-
-        let outputSwift = try #require(try api.finalize())
+        let outputSwift = try #require(importResult.outputSwift)
         try assertSnapshot(
             name: name,
             filePath: #filePath,

Original file line number	Diff line number	Diff line change
`@@ -250,9 +250,9 @@ export class BridgeJSPlayground {`
`250`	`250`	`// Process the TypeScript definitions to generate skeleton`
`251`	`251`	`const processor = new TypeProcessor(tsProgram.getTypeChecker(), diagnosticEngine);`
`252`	`252`
`253`		`- const skeleton = processor.processTypeDeclarations(tsProgram, virtualFilePath);`
	`253`	`+ const { content } = processor.processTypeDeclarations(tsProgram, virtualFilePath);`
`254`	`254`
`255`		`- return JSON.stringify(skeleton);`
	`255`	`+ return content;`
`256`	`256`	`}`
`257`	`257`	`}`
`258`	`258`	`}`
`@@ -340,4 +340,4 @@ export class BridgeJSPlayground {`
`340`	`340`	`this.progressBar.classList.add('hidden');`
`341`	`341`	`}`
`342`	`342`	`}`
`343`		`-}`
	`343`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-../../../../Plugins/BridgeJS/Sources/TS2Skeleton/JavaScript/src/processor.js`
	`1`	`+../../../../Plugins/BridgeJS/Sources/TS2Swift/JavaScript/src/processor.js`