rename JExtractSwift to JExtractSwiftLib as we'll depend on it in SwiftJava

Author: ktoso

Package.swift

@@ -127,8 +127,8 @@ let package = Package(
     ),
 
     .library(
-      name: "JExtractSwift",
-      targets: ["JExtractSwift"]
+      name: "JExtractSwiftLib",
+      targets: ["JExtractSwiftLib"]
     ),
 
     // ==== Plugin for wrapping Java classes in Swift
@@ -355,7 +355,7 @@ let package = Package(
     ),
 
     .target(
-      name: "JExtractSwift",
+      name: "JExtractSwiftLib",
       dependencies: [
         .product(name: "SwiftBasicFormat", package: "swift-syntax"),
         .product(name: "SwiftSyntax", package: "swift-syntax"),
@@ -373,7 +373,7 @@ let package = Package(
     .executableTarget(
       name: "JExtractSwiftTool",
       dependencies: [
-        "JExtractSwift",
+        "JExtractSwiftLib",
       ],
       swiftSettings: [
         .swiftLanguageMode(.v5)
@@ -438,7 +438,7 @@ let package = Package(
     .testTarget(
       name: "JExtractSwiftTests",
       dependencies: [
-        "JExtractSwift"
+        "JExtractSwiftLib"
       ],
       swiftSettings: [
         .swiftLanguageMode(.v5),

Sources/JExtractSwift/CDeclLowering/CRepresentation.swift renamed to Sources/JExtractSwiftLib/CDeclLowering/CRepresentation.swift

@@ -0,0 +1,191 @@
+//===----------------------------------------------------------------------===//
+//
+// This source file is part of the Swift.org open source project
+//
+// Copyright (c) 2024 Apple Inc. and the Swift.org project authors
+// Licensed under Apache License v2.0
+//
+// See LICENSE.txt for license information
+// See CONTRIBUTORS.txt for the list of Swift.org project authors
+//
+// SPDX-License-Identifier: Apache-2.0
+//
+//===----------------------------------------------------------------------===//
+
+import SwiftSyntax
+import SwiftSyntaxBuilder
+
+extension Swift2JavaTranslator {
+  public func writeSwiftThunkSources(outputDirectory: String) throws {
+    var printer = CodePrinter()
+
+    try writeSwiftThunkSources(outputDirectory: outputDirectory, printer: &printer)
+  }
+
+  public func writeSwiftThunkSources(outputDirectory: String, printer: inout CodePrinter) throws {
+    let moduleFilenameBase = "\(self.swiftModuleName)Module+SwiftJava"
+    let moduleFilename = "\(moduleFilenameBase).swift"
+    do {
+      log.info("Printing contents: \(moduleFilename)")
+
+      try printGlobalSwiftThunkSources(&printer)
+
+      if let outputFile = try printer.writeContents(
+        outputDirectory: outputDirectory,
+        javaPackagePath: nil,
+        filename: moduleFilename)
+      {
+        print("[swift-java] Generated: \(moduleFilenameBase.bold).swift (at \(outputFile)")
+      }
+    } catch {
+      log.warning("Failed to write to Swift thunks: \(moduleFilename)")
+    }
+
+    // === All types
+    for (_, ty) in importedTypes.sorted(by: { (lhs, rhs) in lhs.key < rhs.key }) {
+      let fileNameBase = "\(ty.swiftNominal.qualifiedName)+SwiftJava"
+      let filename = "\(fileNameBase).swift"
+      log.info("Printing contents: \(filename)")
+
+      do {
+        try printSwiftThunkSources(&printer, ty: ty)
+
+        if let outputFile = try printer.writeContents(
+          outputDirectory: outputDirectory,
+          javaPackagePath: nil,
+          filename: filename)
+        {
+          print("[swift-java] Generated: \(fileNameBase.bold).swift (at \(outputFile)")
+        }
+      } catch {
+        log.warning("Failed to write to Swift thunks: \(filename)")
+      }
+    }
+  }
+
+  public func printGlobalSwiftThunkSources(_ printer: inout CodePrinter) throws {
+    let stt = SwiftThunkTranslator(self)
+
+    printer.print(
+      """
+      // Generated by swift-java
+
+      import SwiftKitSwift
+
+      """)
+
+    for thunk in stt.renderGlobalThunks() {
+      printer.print(thunk)
+      printer.println()
+    }
+  }
+
+  public func printSwiftThunkSources(_ printer: inout CodePrinter, decl: ImportedFunc) {
+    let stt = SwiftThunkTranslator(self)
+
+    for thunk in stt.render(forFunc: decl) {
+      printer.print(thunk)
+      printer.println()
+    }
+  }
+
+  package func printSwiftThunkSources(_ printer: inout CodePrinter, ty: ImportedNominalType) throws {
+    let stt = SwiftThunkTranslator(self)
+
+    printer.print(
+      """
+      // Generated by swift-java
+
+      import SwiftKitSwift
+
+      """
+    )
+
+    for thunk in stt.renderThunks(forType: ty) {
+      printer.print("\(thunk)")
+      printer.print("")
+    }
+  }
+}
+
+struct SwiftThunkTranslator {
+
+  let st: Swift2JavaTranslator
+
+  init(_ st: Swift2JavaTranslator) {
+    self.st = st
+  }
+
+  func renderGlobalThunks() -> [DeclSyntax] {
+    var decls: [DeclSyntax] = []
+    decls.reserveCapacity(
+      st.importedGlobalVariables.count + st.importedGlobalFuncs.count
+    )
+
+    for decl in st.importedGlobalVariables {
+      decls.append(contentsOf: render(forFunc: decl))
+    }
+
+    for decl in st.importedGlobalFuncs {
+      decls.append(contentsOf: render(forFunc: decl))
+    }
+
+    return decls
+  }
+
+  /// Render all the thunks that make Swift methods accessible to Java.
+  func renderThunks(forType nominal: ImportedNominalType) -> [DeclSyntax] {
+    var decls: [DeclSyntax] = []
+    decls.reserveCapacity(
+      1 + nominal.initializers.count + nominal.variables.count + nominal.methods.count
+    )
+
+    decls.append(renderSwiftTypeAccessor(nominal))
+
+    for decl in nominal.initializers {
+      decls.append(contentsOf: render(forFunc: decl))
+    }
+
+    for decl in nominal.variables {
+      decls.append(contentsOf: render(forFunc: decl))
+    }
+
+    for decl in nominal.methods {
+      decls.append(contentsOf: render(forFunc: decl))
+    }
+
+    return decls
+  }
+
+  /// Accessor to get the `T.self` of the Swift type, without having to rely on mangled name lookups.
+  func renderSwiftTypeAccessor(_ nominal: ImportedNominalType) -> DeclSyntax {
+    let funcName = SwiftKitPrinting.Names.getType(
+      module: st.swiftModuleName,
+      nominal: nominal)
+
+    return
+      """
+      @_cdecl("\(raw: funcName)")
+      public func \(raw: funcName)() -> UnsafeMutableRawPointer /* Any.Type */ {
+        return unsafeBitCast(\(raw: nominal.swiftNominal.qualifiedName).self, to: UnsafeMutableRawPointer.self)
+      }
+      """
+  }
+
+  func render(forFunc decl: ImportedFunc) -> [DeclSyntax] {
+    st.log.trace("Rendering thunks for: \(decl.displayName)")
+
+    let thunkName = st.thunkNameRegistry.functionThunkName(decl: decl)
+    guard let translatedSignatures = st.translatedSignature(for: decl) else {
+      return []
+    }
+
+    let thunkFunc = translatedSignatures.loweredSignature.cdeclThunk(
+      cName: thunkName,
+      swiftAPIName: decl.name,
+      as: decl.apiKind,
+      stdlibTypes: st.swiftStdlibTypes
+    )
+    return [DeclSyntax(thunkFunc)]
+  }
+}

Sources/JExtractSwift/CDeclLowering/Swift2JavaTranslator+FunctionLowering.swift renamed to Sources/JExtractSwiftLib/CDeclLowering/Swift2JavaTranslator+FunctionLowering.swift

@@ -12,7 +12,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-@_spi(Testing) import JExtractSwift
+@_spi(Testing) import JExtractSwiftLib
 import SwiftSyntax
 import Testing
 

Sources/JExtractSwift/CTypes/CEnum.swift renamed to Sources/JExtractSwiftLib/CTypes/CEnum.swift

@@ -12,7 +12,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-import JExtractSwift
+import JExtractSwiftLib
 import Testing
 import struct Foundation.CharacterSet
 

Sources/JExtractSwift/CTypes/CFunction.swift renamed to Sources/JExtractSwiftLib/CTypes/CFunction.swift

@@ -12,7 +12,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-import JExtractSwift
+import JExtractSwiftLib
 import Testing
 
 @Suite("C type system tests")

Sources/JExtractSwift/CTypes/CParameter.swift renamed to Sources/JExtractSwiftLib/CTypes/CParameter.swift

@@ -12,7 +12,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-import JExtractSwift
+import JExtractSwiftLib
 import Testing
 
 struct ClassPrintingTests {

Sources/JExtractSwift/CTypes/CStruct.swift renamed to Sources/JExtractSwiftLib/CTypes/CStruct.swift

@@ -12,7 +12,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-import JExtractSwift
+import JExtractSwiftLib
 import Testing
 
 final class FuncCallbackImportTests {

Sources/JExtractSwift/CTypes/CTag.swift renamed to Sources/JExtractSwiftLib/CTypes/CTag.swift

@@ -12,7 +12,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-import JExtractSwift
+import JExtractSwiftLib
 import Testing
 
 @Suite

Sources/JExtractSwift/CTypes/CType.swift renamed to Sources/JExtractSwiftLib/CTypes/CType.swift

@@ -12,7 +12,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-import JExtractSwift
+import JExtractSwiftLib
 import SwiftSyntax
 import Testing
 

Sources/JExtractSwift/CTypes/CUnion.swift renamed to Sources/JExtractSwiftLib/CTypes/CUnion.swift

@@ -12,7 +12,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-import JExtractSwift
+import JExtractSwiftLib
 import Testing
 
 final class MethodImportTests {

Sources/JExtractSwift/CodePrinter.swift renamed to Sources/JExtractSwiftLib/CodePrinter.swift

@@ -12,7 +12,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-import JExtractSwift
+import JExtractSwiftLib
 import Testing
 
 final class MethodThunkTests {

Sources/JExtractSwift/Convenience/Collection+Extensions.swift renamed to Sources/JExtractSwiftLib/Convenience/Collection+Extensions.swift

@@ -12,7 +12,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-import JExtractSwift
+import JExtractSwiftLib
 import Testing
 
 final class StringPassingTests {

Sources/JExtractSwift/Convenience/String+Extensions.swift renamed to Sources/JExtractSwiftLib/Convenience/String+Extensions.swift

@@ -12,7 +12,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-@_spi(Testing) import JExtractSwift
+@_spi(Testing) import JExtractSwiftLib
 import SwiftSyntax
 import SwiftParser
 import Testing

Sources/JExtractSwift/Convenience/SwiftSyntax+Extensions.swift renamed to Sources/JExtractSwiftLib/Convenience/SwiftSyntax+Extensions.swift

@@ -12,7 +12,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-import JExtractSwift
+import JExtractSwiftLib
 import Testing
 
 final class VariableImportTests {