Merge pull request #504 from GoodNotes/katei/7b73-generate-jsbridg

krodak · web-flow · commit eca0298e1362 · 2026-01-21T19:47:57.000+07:00
BridgeJS: Generate `_JSBridgedClass` conformance via macro
diff --git a/Examples/PlayBridgeJS/Sources/PlayBridgeJS/Generated/BridgeJS.Macros.swift b/Examples/PlayBridgeJS/Sources/PlayBridgeJS/Generated/BridgeJS.Macros.swift
@@ -8,6 +8,6 @@
 
 @JSFunction func createTS2Swift() throws (JSException) -> TS2Swift
 
-@JSClass struct TS2Swift: _JSBridgedClass {
+@JSClass struct TS2Swift {
     @JSFunction func convert(_ ts: String) throws (JSException) -> String
 }
diff --git a/Plugins/BridgeJS/Sources/BridgeJSMacros/JSClassMacro.swift b/Plugins/BridgeJS/Sources/BridgeJSMacros/JSClassMacro.swift
@@ -9,6 +9,7 @@ extension JSClassMacro: MemberMacro {
     public static func expansion(
         of node: AttributeSyntax,
         providingMembersOf declaration: some DeclGroupSyntax,
+        conformingTo protocols: [TypeSyntax],
         in context: some MacroExpansionContext
     ) throws -> [DeclSyntax] {
         var members: [DeclSyntax] = []
@@ -49,3 +50,20 @@ extension JSClassMacro: MemberMacro {
         return members
     }
 }
+
+extension JSClassMacro: ExtensionMacro {
+    public static func expansion(
+        of node: AttributeSyntax,
+        attachedTo declaration: some DeclGroupSyntax,
+        providingExtensionsOf type: some TypeSyntaxProtocol,
+        conformingTo protocols: [TypeSyntax],
+        in context: some MacroExpansionContext
+    ) throws -> [ExtensionDeclSyntax] {
+        guard !protocols.isEmpty else { return [] }
+
+        let conformanceList = protocols.map { $0.trimmed.description }.joined(separator: ", ")
+        return [
+            try ExtensionDeclSyntax("extension \(type.trimmed): \(raw: conformanceList) {}")
+        ]
+    }
+}
diff --git a/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/src/processor.js b/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/src/processor.js
@@ -213,7 +213,7 @@ export class TypeProcessor {
         if (!node.name) return;
 
         const className = this.renderIdentifier(node.name.text);
-        this.swiftLines.push(`@JSClass struct ${className}: _JSBridgedClass {`);
+        this.swiftLines.push(`@JSClass struct ${className} {`);
 
         // Process members in declaration order
         for (const member of node.members) {
@@ -268,7 +268,7 @@ export class TypeProcessor {
      */
     visitStructuredType(name, members) {
         const typeName = this.renderIdentifier(name);
-        this.swiftLines.push(`@JSClass struct ${typeName}: _JSBridgedClass {`);
+        this.swiftLines.push(`@JSClass struct ${typeName} {`);
 
         // Collect all declarations with their positions to preserve order
         /** @type {Array<{ decl: ts.Node, symbol: ts.Symbol, position: number }>} */
diff --git a/Plugins/BridgeJS/Tests/BridgeJSMacrosTests/JSClassMacroTests.swift b/Plugins/BridgeJS/Tests/BridgeJSMacrosTests/JSClassMacroTests.swift
@@ -1,12 +1,16 @@
 import SwiftDiagnostics
 import SwiftSyntax
+import SwiftSyntaxMacroExpansion
 import SwiftSyntaxMacros
 import SwiftSyntaxMacrosTestSupport
 import Testing
 import BridgeJSMacros
 
 @Suite struct JSClassMacroTests {
     private let indentationWidth: Trivia = .spaces(4)
+    private let macroSpecs: [String: MacroSpec] = [
+        "JSClass": MacroSpec(type: JSClassMacro.self, conformances: ["_JSBridgedClass"])
+    ]
 
     @Test func emptyStruct() {
         assertMacroExpansion(
@@ -23,8 +27,11 @@ import BridgeJSMacros
                         self.jsObject = jsObject
                     }
                 }
+
+                extension MyClass: _JSBridgedClass {
+                }
                 """,
-            macros: ["JSClass": JSClassMacro.self],
+            macroSpecs: macroSpecs,
             indentationWidth: indentationWidth
         )
     }
@@ -45,8 +52,11 @@ import BridgeJSMacros
                         self.jsObject = jsObject
                     }
                 }
+
+                extension MyClass: _JSBridgedClass {
+                }
                 """,
-            macros: ["JSClass": JSClassMacro.self],
+            macroSpecs: macroSpecs,
             indentationWidth: indentationWidth
         )
     }
@@ -69,8 +79,11 @@ import BridgeJSMacros
                         self.jsObject = jsObject
                     }
                 }
+
+                extension MyClass: _JSBridgedClass {
+                }
                 """,
-            macros: ["JSClass": JSClassMacro.self],
+            macroSpecs: macroSpecs,
             indentationWidth: indentationWidth
         )
     }
@@ -95,8 +108,11 @@ import BridgeJSMacros
                         self.jsObject = jsObject
                     }
                 }
+
+                extension MyClass: _JSBridgedClass {
+                }
                 """,
-            macros: ["JSClass": JSClassMacro.self],
+            macroSpecs: macroSpecs,
             indentationWidth: indentationWidth
         )
     }
@@ -119,8 +135,11 @@ import BridgeJSMacros
                         self.jsObject = jsObject
                     }
                 }
+
+                extension MyClass: _JSBridgedClass {
+                }
                 """,
-            macros: ["JSClass": JSClassMacro.self],
+            macroSpecs: macroSpecs,
             indentationWidth: indentationWidth
         )
     }
@@ -140,8 +159,11 @@ import BridgeJSMacros
                         self.jsObject = jsObject
                     }
                 }
+
+                extension MyClass: _JSBridgedClass {
+                }
                 """,
-            macros: ["JSClass": JSClassMacro.self],
+            macroSpecs: macroSpecs,
             indentationWidth: indentationWidth
         )
     }
@@ -161,8 +183,11 @@ import BridgeJSMacros
                         self.jsObject = jsObject
                     }
                 }
+
+                extension MyEnum: _JSBridgedClass {
+                }
                 """,
-            macros: ["JSClass": JSClassMacro.self],
+            macroSpecs: macroSpecs,
             indentationWidth: indentationWidth
         )
     }
@@ -182,8 +207,11 @@ import BridgeJSMacros
                         self.jsObject = jsObject
                     }
                 }
+
+                extension MyActor: _JSBridgedClass {
+                }
                 """,
-            macros: ["JSClass": JSClassMacro.self],
+            macroSpecs: macroSpecs,
             indentationWidth: indentationWidth
         )
     }
@@ -206,8 +234,11 @@ import BridgeJSMacros
                         self.jsObject = jsObject
                     }
                 }
+
+                extension MyClass: _JSBridgedClass {
+                }
                 """,
-            macros: ["JSClass": JSClassMacro.self],
+            macroSpecs: macroSpecs,
             indentationWidth: indentationWidth
         )
     }
@@ -232,8 +263,11 @@ import BridgeJSMacros
                         self.jsObject = jsObject
                     }
                 }
+
+                extension MyClass: _JSBridgedClass {
+                }
                 """,
-            macros: ["JSClass": JSClassMacro.self],
+            macroSpecs: macroSpecs,
             indentationWidth: indentationWidth
         )
     }
@@ -258,8 +292,11 @@ import BridgeJSMacros
                         self.jsObject = jsObject
                     }
                 }
+
+                extension MyClass: _JSBridgedClass {
+                }
                 """,
-            macros: ["JSClass": JSClassMacro.self],
+            macroSpecs: macroSpecs,
             indentationWidth: indentationWidth
         )
     }
@@ -281,8 +318,32 @@ import BridgeJSMacros
                         self.jsObject = jsObject
                     }
                 }
+
+                extension MyClass: _JSBridgedClass {
+                }
+                """,
+            macroSpecs: macroSpecs,
+            indentationWidth: indentationWidth
+        )
+    }
+
+    @Test func structAlreadyConforms() {
+        assertMacroExpansion(
+            """
+            @JSClass
+            struct MyClass: _JSBridgedClass {
+            }
+            """,
+            expandedSource: """
+                struct MyClass: _JSBridgedClass {
+                    let jsObject: JSObject
+
+                    init(unsafelyWrapping jsObject: JSObject) {
+                        self.jsObject = jsObject
+                    }
+                }
                 """,
-            macros: ["JSClass": JSClassMacro.self],
+            macroSpecs: macroSpecs,
             indentationWidth: indentationWidth
         )
     }
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/Interface.Macros.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/Interface.Macros.swift
@@ -8,7 +8,7 @@
 
 @JSFunction func returnAnimatable() throws (JSException) -> Animatable
 
-@JSClass struct Animatable: _JSBridgedClass {
+@JSClass struct Animatable {
     @JSFunction func animate(_ keyframes: JSObject, _ options: JSObject) throws (JSException) -> JSObject
     @JSFunction func getAnimations(_ options: JSObject) throws (JSException) -> JSObject
 }
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/InvalidPropertyNames.Macros.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/InvalidPropertyNames.Macros.swift
@@ -8,14 +8,14 @@
 
 @JSFunction func createArrayBuffer() throws (JSException) -> ArrayBufferLike
 
-@JSClass struct ArrayBufferLike: _JSBridgedClass {
+@JSClass struct ArrayBufferLike {
     @JSGetter var byteLength: Double
     @JSFunction func slice(_ begin: Double, _ end: Double) throws (JSException) -> ArrayBufferLike
 }
 
 @JSFunction func createWeirdObject() throws (JSException) -> WeirdNaming
 
-@JSClass struct WeirdNaming: _JSBridgedClass {
+@JSClass struct WeirdNaming {
     @JSGetter var normalProperty: String
     @JSSetter func setNormalProperty(_ value: String) throws (JSException)
     @JSGetter var `for`: String
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/MultipleImportedTypes.Macros.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/MultipleImportedTypes.Macros.swift
@@ -8,7 +8,7 @@
 
 @JSFunction func createDatabaseConnection(_ config: JSObject) throws (JSException) -> DatabaseConnection
 
-@JSClass struct DatabaseConnection: _JSBridgedClass {
+@JSClass struct DatabaseConnection {
     @JSFunction func connect(_ url: String) throws (JSException) -> Void
     @JSFunction func execute(_ query: String) throws (JSException) -> JSObject
     @JSGetter var isConnected: Bool
@@ -18,15 +18,15 @@
 
 @JSFunction func createLogger(_ level: String) throws (JSException) -> Logger
 
-@JSClass struct Logger: _JSBridgedClass {
+@JSClass struct Logger {
     @JSFunction func log(_ message: String) throws (JSException) -> Void
     @JSFunction func error(_ message: String, _ error: JSObject) throws (JSException) -> Void
     @JSGetter var level: String
 }
 
 @JSFunction func getConfigManager() throws (JSException) -> ConfigManager
 
-@JSClass struct ConfigManager: _JSBridgedClass {
+@JSClass struct ConfigManager {
     @JSFunction func get(_ key: String) throws (JSException) -> JSObject
     @JSFunction func set(_ key: String, _ value: JSObject) throws (JSException) -> Void
     @JSGetter var configPath: String
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/TS2SkeletonLike.Macros.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/TS2SkeletonLike.Macros.swift
@@ -8,15 +8,15 @@
 
 @JSFunction func createTS2Skeleton() throws (JSException) -> TypeScriptProcessor
 
-@JSClass struct TypeScriptProcessor: _JSBridgedClass {
+@JSClass struct TypeScriptProcessor {
     @JSFunction func convert(_ ts: String) throws (JSException) -> String
     @JSFunction func validate(_ ts: String) throws (JSException) -> Bool
     @JSGetter var version: String
 }
 
 @JSFunction func createCodeGenerator(_ format: String) throws (JSException) -> CodeGenerator
 
-@JSClass struct CodeGenerator: _JSBridgedClass {
+@JSClass struct CodeGenerator {
     @JSFunction func generate(_ input: JSObject) throws (JSException) -> String
     @JSGetter var outputFormat: String
 }
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/TypeScriptClass.Macros.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/TypeScriptClass.Macros.swift
@@ -6,7 +6,7 @@
 
 @_spi(Experimental) import JavaScriptKit
 
-@JSClass struct Greeter: _JSBridgedClass {
+@JSClass struct Greeter {
     @JSGetter var name: String
     @JSSetter func setName(_ value: String) throws (JSException)
     @JSGetter var age: Double
diff --git a/Sources/JavaScriptKit/JSBridgedType.swift b/Sources/JavaScriptKit/JSBridgedType.swift
@@ -15,7 +15,7 @@ extension JSBridgedType {
 
 /// A protocol that Swift classes that are exposed to JavaScript via `@JS class` conform to.
 ///
-/// The conformance is automatically synthesized by the BridgeJS code generator.
+/// The conformance is automatically synthesized by `@JSClass` for BridgeJS-generated declarations.
 public protocol _JSBridgedClass {
     /// The JavaScript object wrapped by this instance.
     /// You may assume that `jsObject instanceof Self.constructor == true`
diff --git a/Sources/JavaScriptKit/Macros.swift b/Sources/JavaScriptKit/Macros.swift
@@ -174,14 +174,15 @@ public macro JSFunction() =
 /// @_spi(Experimental) import JavaScriptKit
 ///
 /// @JSClass
-/// struct JsGreeter: _JSBridgedClass {
+/// struct JsGreeter {
 ///     @JSGetter var name: String
 ///     @JSSetter func setName(_ value: String) throws (JSException)
 ///     @JSFunction init(_ name: String) throws (JSException)
 ///     @JSFunction func greet() throws (JSException) -> String
 /// }
 /// ```
 @attached(member, names: arbitrary)
+@attached(extension, conformances: _JSBridgedClass)
 @_spi(Experimental)
 public macro JSClass() =
     #externalMacro(module: "BridgeJSMacros", type: "JSClassMacro")
diff --git a/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.Macros.swift b/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.Macros.swift
@@ -22,7 +22,7 @@
 
 @JSFunction func jsThrowOrString(_ shouldThrow: Bool) throws (JSException) -> String
 
-@JSClass struct JsGreeter: _JSBridgedClass {
+@JSClass struct JsGreeter {
     @JSGetter var name: String
     @JSSetter func setName(_ value: String) throws (JSException)
     @JSGetter var `prefix`: String

Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,6 @@`
`8`	`8`
`9`	`9`	`@JSFunction func createTS2Swift() throws (JSException) -> TS2Swift`
`10`	`10`
`11`		`-@JSClass struct TS2Swift: _JSBridgedClass {`
	`11`	`+@JSClass struct TS2Swift {`
`12`	`12`	`@JSFunction func convert(_ ts: String) throws (JSException) -> String`
`13`	`13`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,12 +1,16 @@`
`1`	`1`	`import SwiftDiagnostics`
`2`	`2`	`import SwiftSyntax`
	`3`	`+import SwiftSyntaxMacroExpansion`
`3`	`4`	`import SwiftSyntaxMacros`
`4`	`5`	`import SwiftSyntaxMacrosTestSupport`
`5`	`6`	`import Testing`
`6`	`7`	`import BridgeJSMacros`
`7`	`8`
`8`	`9`	`@Suite struct JSClassMacroTests {`
`9`	`10`	`private let indentationWidth: Trivia = .spaces(4)`
	`11`	`+ private let macroSpecs: [String: MacroSpec] = [`
	`12`	`+ "JSClass": MacroSpec(type: JSClassMacro.self, conformances: ["_JSBridgedClass"])`
	`13`	`+ ]`
`10`	`14`
`11`	`15`	`@Test func emptyStruct() {`
`12`	`16`	`assertMacroExpansion(`
`@@ -23,8 +27,11 @@ import BridgeJSMacros`
`23`	`27`	`self.jsObject = jsObject`
`24`	`28`	`}`
`25`	`29`	`}`
	`30`	`+`
	`31`	`+ extension MyClass: _JSBridgedClass {`
	`32`	`+ }`
`26`	`33`	`""",`
`27`		`- macros: ["JSClass": JSClassMacro.self],`
	`34`	`+ macroSpecs: macroSpecs,`
`28`	`35`	`indentationWidth: indentationWidth`
`29`	`36`	`)`
`30`	`37`	`}`
`@@ -45,8 +52,11 @@ import BridgeJSMacros`
`45`	`52`	`self.jsObject = jsObject`
`46`	`53`	`}`
`47`	`54`	`}`
	`55`	`+`
	`56`	`+ extension MyClass: _JSBridgedClass {`
	`57`	`+ }`
`48`	`58`	`""",`
`49`		`- macros: ["JSClass": JSClassMacro.self],`
	`59`	`+ macroSpecs: macroSpecs,`
`50`	`60`	`indentationWidth: indentationWidth`
`51`	`61`	`)`
`52`	`62`	`}`
`@@ -69,8 +79,11 @@ import BridgeJSMacros`
`69`	`79`	`self.jsObject = jsObject`
`70`	`80`	`}`
`71`	`81`	`}`
	`82`	`+`
	`83`	`+ extension MyClass: _JSBridgedClass {`
	`84`	`+ }`
`72`	`85`	`""",`
`73`		`- macros: ["JSClass": JSClassMacro.self],`
	`86`	`+ macroSpecs: macroSpecs,`
`74`	`87`	`indentationWidth: indentationWidth`
`75`	`88`	`)`
`76`	`89`	`}`
`@@ -95,8 +108,11 @@ import BridgeJSMacros`
`95`	`108`	`self.jsObject = jsObject`
`96`	`109`	`}`
`97`	`110`	`}`
	`111`	`+`
	`112`	`+ extension MyClass: _JSBridgedClass {`
	`113`	`+ }`
`98`	`114`	`""",`
`99`		`- macros: ["JSClass": JSClassMacro.self],`
	`115`	`+ macroSpecs: macroSpecs,`
`100`	`116`	`indentationWidth: indentationWidth`
`101`	`117`	`)`
`102`	`118`	`}`
`@@ -119,8 +135,11 @@ import BridgeJSMacros`
`119`	`135`	`self.jsObject = jsObject`
`120`	`136`	`}`
`121`	`137`	`}`
	`138`	`+`
	`139`	`+ extension MyClass: _JSBridgedClass {`
	`140`	`+ }`
`122`	`141`	`""",`
`123`		`- macros: ["JSClass": JSClassMacro.self],`
	`142`	`+ macroSpecs: macroSpecs,`
`124`	`143`	`indentationWidth: indentationWidth`
`125`	`144`	`)`
`126`	`145`	`}`
`@@ -140,8 +159,11 @@ import BridgeJSMacros`
`140`	`159`	`self.jsObject = jsObject`
`141`	`160`	`}`
`142`	`161`	`}`
	`162`	`+`
	`163`	`+ extension MyClass: _JSBridgedClass {`
	`164`	`+ }`
`143`	`165`	`""",`
`144`		`- macros: ["JSClass": JSClassMacro.self],`
	`166`	`+ macroSpecs: macroSpecs,`
`145`	`167`	`indentationWidth: indentationWidth`
`146`	`168`	`)`
`147`	`169`	`}`
`@@ -161,8 +183,11 @@ import BridgeJSMacros`
`161`	`183`	`self.jsObject = jsObject`
`162`	`184`	`}`
`163`	`185`	`}`
	`186`	`+`
	`187`	`+ extension MyEnum: _JSBridgedClass {`
	`188`	`+ }`
`164`	`189`	`""",`
`165`		`- macros: ["JSClass": JSClassMacro.self],`
	`190`	`+ macroSpecs: macroSpecs,`
`166`	`191`	`indentationWidth: indentationWidth`
`167`	`192`	`)`
`168`	`193`	`}`
`@@ -182,8 +207,11 @@ import BridgeJSMacros`
`182`	`207`	`self.jsObject = jsObject`
`183`	`208`	`}`
`184`	`209`	`}`
	`210`	`+`
	`211`	`+ extension MyActor: _JSBridgedClass {`
	`212`	`+ }`
`185`	`213`	`""",`
`186`		`- macros: ["JSClass": JSClassMacro.self],`
	`214`	`+ macroSpecs: macroSpecs,`
`187`	`215`	`indentationWidth: indentationWidth`
`188`	`216`	`)`
`189`	`217`	`}`
`@@ -206,8 +234,11 @@ import BridgeJSMacros`
`206`	`234`	`self.jsObject = jsObject`
`207`	`235`	`}`
`208`	`236`	`}`
	`237`	`+`
	`238`	`+ extension MyClass: _JSBridgedClass {`
	`239`	`+ }`
`209`	`240`	`""",`
`210`		`- macros: ["JSClass": JSClassMacro.self],`
	`241`	`+ macroSpecs: macroSpecs,`
`211`	`242`	`indentationWidth: indentationWidth`
`212`	`243`	`)`
`213`	`244`	`}`
`@@ -232,8 +263,11 @@ import BridgeJSMacros`
`232`	`263`	`self.jsObject = jsObject`
`233`	`264`	`}`
`234`	`265`	`}`
	`266`	`+`
	`267`	`+ extension MyClass: _JSBridgedClass {`
	`268`	`+ }`
`235`	`269`	`""",`
`236`		`- macros: ["JSClass": JSClassMacro.self],`
	`270`	`+ macroSpecs: macroSpecs,`
`237`	`271`	`indentationWidth: indentationWidth`
`238`	`272`	`)`
`239`	`273`	`}`
`@@ -258,8 +292,11 @@ import BridgeJSMacros`
`258`	`292`	`self.jsObject = jsObject`
`259`	`293`	`}`
`260`	`294`	`}`
	`295`	`+`
	`296`	`+ extension MyClass: _JSBridgedClass {`
	`297`	`+ }`
`261`	`298`	`""",`
`262`		`- macros: ["JSClass": JSClassMacro.self],`
	`299`	`+ macroSpecs: macroSpecs,`
`263`	`300`	`indentationWidth: indentationWidth`
`264`	`301`	`)`
`265`	`302`	`}`
`@@ -281,8 +318,32 @@ import BridgeJSMacros`
`281`	`318`	`self.jsObject = jsObject`
`282`	`319`	`}`
`283`	`320`	`}`
	`321`	`+`
	`322`	`+ extension MyClass: _JSBridgedClass {`
	`323`	`+ }`
	`324`	`+ """,`
	`325`	`+ macroSpecs: macroSpecs,`
	`326`	`+ indentationWidth: indentationWidth`
	`327`	`+ )`
	`328`	`+ }`
	`329`	`+`
	`330`	`+ @Test func structAlreadyConforms() {`
	`331`	`+ assertMacroExpansion(`
	`332`	`+ """`
	`333`	`+ @JSClass`
	`334`	`+ struct MyClass: _JSBridgedClass {`
	`335`	`+ }`
	`336`	`+ """,`
	`337`	`+ expandedSource: """`
	`338`	`+ struct MyClass: _JSBridgedClass {`
	`339`	`+ let jsObject: JSObject`
	`340`	`+`
	`341`	`+ init(unsafelyWrapping jsObject: JSObject) {`
	`342`	`+ self.jsObject = jsObject`
	`343`	`+ }`
	`344`	`+ }`
`284`	`345`	`""",`
`285`		`- macros: ["JSClass": JSClassMacro.self],`
	`346`	`+ macroSpecs: macroSpecs,`
`286`	`347`	`indentationWidth: indentationWidth`
`287`	`348`	`)`
`288`	`349`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`
`9`	`9`	`@JSFunction func returnAnimatable() throws (JSException) -> Animatable`
`10`	`10`
`11`		`-@JSClass struct Animatable: _JSBridgedClass {`
	`11`	`+@JSClass struct Animatable {`
`12`	`12`	`@JSFunction func animate(_ keyframes: JSObject, _ options: JSObject) throws (JSException) -> JSObject`
`13`	`13`	`@JSFunction func getAnimations(_ options: JSObject) throws (JSException) -> JSObject`
`14`	`14`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,15 +8,15 @@`
`8`	`8`
`9`	`9`	`@JSFunction func createTS2Skeleton() throws (JSException) -> TypeScriptProcessor`
`10`	`10`
`11`		`-@JSClass struct TypeScriptProcessor: _JSBridgedClass {`
	`11`	`+@JSClass struct TypeScriptProcessor {`
`12`	`12`	`@JSFunction func convert(_ ts: String) throws (JSException) -> String`
`13`	`13`	`@JSFunction func validate(_ ts: String) throws (JSException) -> Bool`
`14`	`14`	`@JSGetter var version: String`
`15`	`15`	`}`
`16`	`16`
`17`	`17`	`@JSFunction func createCodeGenerator(_ format: String) throws (JSException) -> CodeGenerator`
`18`	`18`
`19`		`-@JSClass struct CodeGenerator: _JSBridgedClass {`
	`19`	`+@JSClass struct CodeGenerator {`
`20`	`20`	`@JSFunction func generate(_ input: JSObject) throws (JSException) -> String`
`21`	`21`	`@JSGetter var outputFormat: String`
`22`	`22`	`}`