./Utilities/format.swift

kateinoigakukun · kateinoigakukun · commit ed7e019919be · 2026-01-16T12:53:16.000+09:00
diff --git a/Package.swift b/Package.swift
@@ -63,7 +63,7 @@ let package = Package(
             name: "JavaScriptKitMacros",
             dependencies: [
                 .product(name: "SwiftSyntaxMacros", package: "swift-syntax"),
-                .product(name: "SwiftCompilerPlugin", package: "swift-syntax")
+                .product(name: "SwiftCompilerPlugin", package: "swift-syntax"),
             ]
         ),
 
diff --git a/Plugins/BridgeJS/Sources/BridgeJSCore/ImportTS.swift b/Plugins/BridgeJS/Sources/BridgeJSCore/ImportTS.swift
@@ -355,7 +355,11 @@ public struct ImportTS {
         "_$\(type.name)_init"
     }
 
-    private static func thunkName(type: ImportedTypeSkeleton, property: ImportedPropertySkeleton, operation: String)
+    private static func thunkName(
+        type: ImportedTypeSkeleton,
+        property: ImportedPropertySkeleton,
+        operation: String
+    )
         -> String
     {
         "_$\(type.name)_\(property.name)_\(operation)"
diff --git a/Plugins/BridgeJS/Sources/BridgeJSSkeleton/BridgeJSSkeleton.swift b/Plugins/BridgeJS/Sources/BridgeJSSkeleton/BridgeJSSkeleton.swift
@@ -655,7 +655,13 @@ public struct ImportedTypeSkeleton: Codable {
     public let properties: [ImportedPropertySkeleton]
     public let documentation: String?
 
-    public init(name: String, constructor: ImportedConstructorSkeleton? = nil, methods: [ImportedFunctionSkeleton], properties: [ImportedPropertySkeleton], documentation: String? = nil) {
+    public init(
+        name: String,
+        constructor: ImportedConstructorSkeleton? = nil,
+        methods: [ImportedFunctionSkeleton],
+        properties: [ImportedPropertySkeleton],
+        documentation: String? = nil
+    ) {
         self.name = name
         self.constructor = constructor
         self.methods = methods
diff --git a/Sources/JavaScriptKit/Macros.swift b/Sources/JavaScriptKit/Macros.swift
@@ -109,10 +109,13 @@ public enum JSEnumStyle: String {
 public macro JS(namespace: String? = nil, enumStyle: JSEnumStyle = .const) = Builtin.ExternalMacro
 
 @attached(accessor)
-public macro JSVariable(from: String? = nil, jsName: String? = nil) = #externalMacro(module: "JavaScriptKitMacros", type: "JSImportVariableMacro")
+public macro JSVariable(from: String? = nil, jsName: String? = nil) =
+    #externalMacro(module: "JavaScriptKitMacros", type: "JSImportVariableMacro")
 
 @attached(body)
-public macro JSFunction(from: String? = nil, jsName: String? = nil) = #externalMacro(module: "JavaScriptKitMacros", type: "JSImportFunctionMacro")
+public macro JSFunction(from: String? = nil, jsName: String? = nil) =
+    #externalMacro(module: "JavaScriptKitMacros", type: "JSImportFunctionMacro")
 
 @attached(member)
-public macro JSClass(from: String? = nil, jsName: String? = nil) = #externalMacro(module: "JavaScriptKitMacros", type: "JSImportClassMacro")
+public macro JSClass(from: String? = nil, jsName: String? = nil) =
+    #externalMacro(module: "JavaScriptKitMacros", type: "JSImportClassMacro")
diff --git a/Sources/JavaScriptKitMacros/JSImportMacro.swift b/Sources/JavaScriptKitMacros/JSImportMacro.swift
@@ -88,147 +88,152 @@ private enum JSImportMacroHelper {
 }
 
 extension JSImportFunctionMacro: BodyMacro {
-  package static func expansion(
-    of node: AttributeSyntax,
-    providingBodyFor declaration: some DeclSyntaxProtocol & WithOptionalCodeBlockSyntax,
-    in context: some MacroExpansionContext
-  ) throws -> [CodeBlockItemSyntax] {
-    if let functionDecl = declaration.as(FunctionDeclSyntax.self) {
-        let enclosingTypeName = JSImportMacroHelper.enclosingTypeName(from: context)
-        let isStatic = JSImportMacroHelper.isStatic(functionDecl.modifiers)
-        let isInstanceMember = enclosingTypeName != nil && !isStatic
+    package static func expansion(
+        of node: AttributeSyntax,
+        providingBodyFor declaration: some DeclSyntaxProtocol & WithOptionalCodeBlockSyntax,
+        in context: some MacroExpansionContext
+    ) throws -> [CodeBlockItemSyntax] {
+        if let functionDecl = declaration.as(FunctionDeclSyntax.self) {
+            let enclosingTypeName = JSImportMacroHelper.enclosingTypeName(from: context)
+            let isStatic = JSImportMacroHelper.isStatic(functionDecl.modifiers)
+            let isInstanceMember = enclosingTypeName != nil && !isStatic
+
+            let name = functionDecl.name.text
+            let glueName = JSImportMacroHelper.glueName(baseName: name, enclosingTypeName: enclosingTypeName)
+
+            var arguments: [String] = []
+            if isInstanceMember {
+                arguments.append("self.jsObject")
+            }
+            arguments.append(
+                contentsOf: JSImportMacroHelper.parameterNames(functionDecl.signature.parameterClause.parameters)
+            )
 
-        let name = functionDecl.name.text
-        let glueName = JSImportMacroHelper.glueName(baseName: name, enclosingTypeName: enclosingTypeName)
+            let argsJoined = arguments.joined(separator: ", ")
+            let call = "\(glueName)(\(argsJoined))"
 
-        var arguments: [String] = []
-        if isInstanceMember {
-            arguments.append("self.jsObject")
+            let effects = functionDecl.signature.effectSpecifiers
+            let isAsync = effects?.asyncSpecifier != nil
+            let isThrows = effects?.throwsClause != nil
+            let prefix = JSImportMacroHelper.tryAwaitPrefix(isAsync: isAsync, isThrows: isThrows)
+
+            let isVoid = JSImportMacroHelper.isVoidReturn(functionDecl.signature.returnClause?.type)
+            let line = isVoid ? "\(prefix)\(call)" : "return \(prefix)\(call)"
+            return [CodeBlockItemSyntax(stringLiteral: line)]
         }
-        arguments.append(contentsOf: JSImportMacroHelper.parameterNames(functionDecl.signature.parameterClause.parameters))
 
-        let argsJoined = arguments.joined(separator: ", ")
-        let call = "\(glueName)(\(argsJoined))"
+        if let initializerDecl = declaration.as(InitializerDeclSyntax.self) {
+            guard let enclosingTypeName = JSImportMacroHelper.enclosingTypeName(from: context) else {
+                context.diagnose(
+                    Diagnostic(node: Syntax(declaration), message: JSImportMacroMessage.unsupportedDeclaration)
+                )
+                return []
+            }
 
-        let effects = functionDecl.signature.effectSpecifiers
-        let isAsync = effects?.asyncSpecifier != nil
-        let isThrows = effects?.throwsClause != nil
-        let prefix = JSImportMacroHelper.tryAwaitPrefix(isAsync: isAsync, isThrows: isThrows)
+            let glueName = JSImportMacroHelper.glueName(baseName: "init", enclosingTypeName: enclosingTypeName)
+            let parameters = initializerDecl.signature.parameterClause.parameters
+            let arguments = JSImportMacroHelper.parameterNames(parameters)
+            let call = "\(glueName)(\(arguments.joined(separator: ", ")))"
 
-        let isVoid = JSImportMacroHelper.isVoidReturn(functionDecl.signature.returnClause?.type)
-        let line = isVoid ? "\(prefix)\(call)" : "return \(prefix)\(call)"
-        return [CodeBlockItemSyntax(stringLiteral: line)]
-    }
+            let effects = initializerDecl.signature.effectSpecifiers
+            let isAsync = effects?.asyncSpecifier != nil
+            let isThrows = effects?.throwsClause != nil
+            let prefix = JSImportMacroHelper.tryAwaitPrefix(isAsync: isAsync, isThrows: isThrows)
 
-    if let initializerDecl = declaration.as(InitializerDeclSyntax.self) {
-        guard let enclosingTypeName = JSImportMacroHelper.enclosingTypeName(from: context) else {
-            context.diagnose(Diagnostic(node: Syntax(declaration), message: JSImportMacroMessage.unsupportedDeclaration))
-            return []
+            return [
+                CodeBlockItemSyntax(stringLiteral: "let jsObject = \(prefix)\(call)"),
+                CodeBlockItemSyntax(stringLiteral: "self.init(unsafelyWrapping: jsObject)"),
+            ]
         }
 
-        let glueName = JSImportMacroHelper.glueName(baseName: "init", enclosingTypeName: enclosingTypeName)
-        let parameters = initializerDecl.signature.parameterClause.parameters
-        let arguments = JSImportMacroHelper.parameterNames(parameters)
-        let call = "\(glueName)(\(arguments.joined(separator: ", ")))"
-
-        let effects = initializerDecl.signature.effectSpecifiers
-        let isAsync = effects?.asyncSpecifier != nil
-        let isThrows = effects?.throwsClause != nil
-        let prefix = JSImportMacroHelper.tryAwaitPrefix(isAsync: isAsync, isThrows: isThrows)
-
-        return [
-            CodeBlockItemSyntax(stringLiteral: "let jsObject = \(prefix)\(call)"),
-            CodeBlockItemSyntax(stringLiteral: "self.init(unsafelyWrapping: jsObject)"),
-        ]
+        context.diagnose(Diagnostic(node: Syntax(declaration), message: JSImportMacroMessage.unsupportedDeclaration))
+        return []
     }
-
-    context.diagnose(Diagnostic(node: Syntax(declaration), message: JSImportMacroMessage.unsupportedDeclaration))
-    return []
-  }
 }
 
 enum JSImportVariableMacro {}
 
 extension JSImportVariableMacro: AccessorMacro {
-  package static func expansion(
-    of node: AttributeSyntax,
-    providingAccessorsOf declaration: some DeclSyntaxProtocol,
-    in context: some MacroExpansionContext
-) throws -> [AccessorDeclSyntax] {
-    guard let variableDecl = declaration.as(VariableDeclSyntax.self),
-          let binding = variableDecl.bindings.first,
-          let identifier = binding.pattern.as(IdentifierPatternSyntax.self)
-    else {
-        context.diagnose(Diagnostic(node: Syntax(declaration), message: JSImportMacroMessage.unsupportedVariable))
-        return []
-    }
+    package static func expansion(
+        of node: AttributeSyntax,
+        providingAccessorsOf declaration: some DeclSyntaxProtocol,
+        in context: some MacroExpansionContext
+    ) throws -> [AccessorDeclSyntax] {
+        guard let variableDecl = declaration.as(VariableDeclSyntax.self),
+            let binding = variableDecl.bindings.first,
+            let identifier = binding.pattern.as(IdentifierPatternSyntax.self)
+        else {
+            context.diagnose(Diagnostic(node: Syntax(declaration), message: JSImportMacroMessage.unsupportedVariable))
+            return []
+        }
 
-    let enclosingTypeName = JSImportMacroHelper.enclosingTypeName(from: context)
-    let isStatic = JSImportMacroHelper.isStatic(variableDecl.modifiers)
-    let isInstanceMember = enclosingTypeName != nil && !isStatic
-
-    let propertyName = identifier.identifier.text
-    let getterName = JSImportMacroHelper.glueName(
-        baseName: propertyName,
-        enclosingTypeName: enclosingTypeName,
-        operation: "get"
-    )
-    let setterName = JSImportMacroHelper.glueName(
-        baseName: propertyName,
-        enclosingTypeName: enclosingTypeName,
-        operation: "set"
-    )
-
-    var getterArgs: [String] = []
-    if isInstanceMember {
-        getterArgs.append("self.jsObject")
-    }
-    let getterCall: CodeBlockItemSyntax = "return try \(raw: getterName)(\(raw: getterArgs.joined(separator: ", ")))"
-
-    let throwsClause = ThrowsClauseSyntax(
-        throwsSpecifier: .keyword(.throws),
-        leftParen: .leftParenToken(),
-        type: IdentifierTypeSyntax(name: .identifier("JSException")),
-        rightParen: .rightParenToken()
-    )
-
-    var accessors: [AccessorDeclSyntax] = [
-        AccessorDeclSyntax(
-            accessorSpecifier: .keyword(.get),
-            effectSpecifiers: AccessorEffectSpecifiersSyntax(
-                asyncSpecifier: nil,
-                throwsClause: throwsClause
-            ),
-            body: CodeBlockSyntax {
-                getterCall
-            }
+        let enclosingTypeName = JSImportMacroHelper.enclosingTypeName(from: context)
+        let isStatic = JSImportMacroHelper.isStatic(variableDecl.modifiers)
+        let isInstanceMember = enclosingTypeName != nil && !isStatic
+
+        let propertyName = identifier.identifier.text
+        let getterName = JSImportMacroHelper.glueName(
+            baseName: propertyName,
+            enclosingTypeName: enclosingTypeName,
+            operation: "get"
+        )
+        let setterName = JSImportMacroHelper.glueName(
+            baseName: propertyName,
+            enclosingTypeName: enclosingTypeName,
+            operation: "set"
         )
-    ]
 
-    let isLet = variableDecl.bindingSpecifier.tokenKind == .keyword(.let)
-    if !isLet {
-        var setterArgs: [String] = []
+        var getterArgs: [String] = []
         if isInstanceMember {
-            setterArgs.append("self.jsObject")
+            getterArgs.append("self.jsObject")
         }
-        setterArgs.append("newValue")
-        let setterCall: CodeBlockItemSyntax = "try \(raw: setterName)(\(raw: setterArgs.joined(separator: ", ")))"
-        accessors.append(
+        let getterCall: CodeBlockItemSyntax =
+            "return try \(raw: getterName)(\(raw: getterArgs.joined(separator: ", ")))"
+
+        let throwsClause = ThrowsClauseSyntax(
+            throwsSpecifier: .keyword(.throws),
+            leftParen: .leftParenToken(),
+            type: IdentifierTypeSyntax(name: .identifier("JSException")),
+            rightParen: .rightParenToken()
+        )
+
+        var accessors: [AccessorDeclSyntax] = [
             AccessorDeclSyntax(
-                accessorSpecifier: .keyword(.set),
+                accessorSpecifier: .keyword(.get),
                 effectSpecifiers: AccessorEffectSpecifiersSyntax(
                     asyncSpecifier: nil,
                     throwsClause: throwsClause
                 ),
                 body: CodeBlockSyntax {
-                    setterCall
+                    getterCall
                 }
             )
-        )
-    }
+        ]
+
+        let isLet = variableDecl.bindingSpecifier.tokenKind == .keyword(.let)
+        if !isLet {
+            var setterArgs: [String] = []
+            if isInstanceMember {
+                setterArgs.append("self.jsObject")
+            }
+            setterArgs.append("newValue")
+            let setterCall: CodeBlockItemSyntax = "try \(raw: setterName)(\(raw: setterArgs.joined(separator: ", ")))"
+            accessors.append(
+                AccessorDeclSyntax(
+                    accessorSpecifier: .keyword(.set),
+                    effectSpecifiers: AccessorEffectSpecifiersSyntax(
+                        asyncSpecifier: nil,
+                        throwsClause: throwsClause
+                    ),
+                    body: CodeBlockSyntax {
+                        setterCall
+                    }
+                )
+            )
+        }
 
-    return accessors
-  }
+        return accessors
+    }
 }
 
 enum JSImportClassMacro {}
diff --git a/Sources/JavaScriptKitMacros/JavaScriptKitMacrosPlugin.swift b/Sources/JavaScriptKitMacros/JavaScriptKitMacrosPlugin.swift
@@ -3,9 +3,9 @@ import SwiftSyntaxMacros
 
 @main
 struct JavaScriptKitMacrosPlugin: CompilerPlugin {
-  var providingMacros: [Macro.Type] = [
-    JSImportFunctionMacro.self,
-    JSImportVariableMacro.self,
-    JSImportClassMacro.self,
-  ]
+    var providingMacros: [Macro.Type] = [
+        JSImportFunctionMacro.self,
+        JSImportVariableMacro.self,
+        JSImportClassMacro.self,
+    ]
 }

Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ let package = Package(`
`63`	`63`	`name: "JavaScriptKitMacros",`
`64`	`64`	`dependencies: [`
`65`	`65`	`.product(name: "SwiftSyntaxMacros", package: "swift-syntax"),`
`66`		`- .product(name: "SwiftCompilerPlugin", package: "swift-syntax")`
	`66`	`+ .product(name: "SwiftCompilerPlugin", package: "swift-syntax"),`
`67`	`67`	`]`
`68`	`68`	`),`
`69`	`69`
Original file line number	Diff line number	Diff line change
`@@ -355,7 +355,11 @@ public struct ImportTS {`
`355`	`355`	`"_$\(type.name)_init"`
`356`	`356`	`}`
`357`	`357`
`358`		`- private static func thunkName(type: ImportedTypeSkeleton, property: ImportedPropertySkeleton, operation: String)`
	`358`	`+ private static func thunkName(`
	`359`	`+ type: ImportedTypeSkeleton,`
	`360`	`+ property: ImportedPropertySkeleton,`
	`361`	`+ operation: String`
	`362`	`+ )`
`359`	`363`	`-> String`
`360`	`364`	`{`
`361`	`365`	`"_$\(type.name)_\(property.name)_\(operation)"`