now need to emit the swiftjava_JExtractPluginSampleLib_MyCoolSwiftClass_init_TODO_PARAMS_

Author: ktoso

Plugins/JExtractSwiftPlugin/JExtractSwiftPlugin.swift

@@ -33,6 +33,9 @@ struct JExtractSwiftBuildToolPlugin: BuildToolPlugin {
       .appending(path: "generated")
       .appending(path: "java")
     let outputDirectorySwift = context.pluginWorkDirectoryURL
+      .appending(path: "src")
+      .appending(path: "generated")
+      .appending(path: "Sources")
 
     var arguments: [String] = [
       "--swift-module", sourceModule.name,

Samples/JExtractPluginSampleApp/build.gradle

@@ -15,6 +15,7 @@
 import org.swift.swiftkit.gradle.BuildUtils
 
 import java.nio.file.Files
+import java.nio.file.Paths
 
 plugins {
     id("build-logic.java-application-conventions")
@@ -35,29 +36,47 @@ java {
 }
 
 
-def buildSwift = tasks.register("build-swift", Exec) {
+// This is for development, when we edit the Swift swift-java project, the outputs of the generated sources may change.
+// Thus, we also need to watch and re-build the top level project.
+def buildJExtractPlugin = tasks.register("swiftBuildJExtractPlugin", Exec) {
+    description = "Rebuild the swift-java root project"
+
+    inputs.file(new File(rootDir, "Package.swift"))
+    inputs.dir(new File(rootDir, "Sources"))
+    outputs.dir(new File(rootDir, ".build"))
+
+    workingDir = rootDir
+    commandLine "swift"
+    args "build"
+}
+
+def buildSwift = tasks.register("swiftBuildProject", Exec) {
     description = "Builds swift sources, including swift-java source generation"
+    dependsOn buildJExtractPlugin
 
-    // monitor root project Swift sources:
-    inputs.dir(layout.projectDirectory.dir("Sources/"))
-    println("INPUT = ${layout.projectDirectory.dir("Sources/")}")
+    // only because we depend on "live developing" the plugin while using this project to test it
+    inputs.file(new File(rootDir, "Package.swift"))
+    inputs.dir(new File(rootDir, "Sources"))
 
-    // monitor root java-swift sources (including source generator libs which may be changing):
-    inputs.dir("$rootDir/Sources")
-    println("INPUT = ${"$rootDir/Sources"}")
+    // TODO: we can use package describe --type json to figure out which targets depend on JExtractSwiftPlugin and will produce outputs
+    inputs.file(layout.projectDirectory.file("Package.swift"))
+    inputs.dir(layout.projectDirectory.dir("Sources"))
 
-    // the swift-java produced Java sources are located here:
-    outputs.dir(layout.buildDirectory.dir("../.build/plugins/outputs/jextractpluginsampleapp/JExtractPluginSampleLib/destination/JExtractSwiftPlugin/src/generated/java"))
+//    outputs.dir(layout.buildDirectory.dir("../.build/plugins/outputs/${layout.projectDirectory.asFile.getName().toLowerCase()}/JExtractPluginSampleLib/destination/JExtractSwiftPlugin/src/generated/java"))
+    outputs.dir(layout.buildDirectory.dir("../.build/plugins/outputs/${layout.projectDirectory.asFile.getName().toLowerCase()}"))
 
+    File baseSwiftPluginOutputsDir = layout.buildDirectory.dir("../.build/plugins/outputs/").get().asFile
+    if (!baseSwiftPluginOutputsDir.exists()) {
+        baseSwiftPluginOutputsDir.mkdirs()
+    }
     Files.walk(layout.buildDirectory.dir("../.build/plugins/outputs/").get().asFile.toPath()).each {
-        println("PATH === ${it}")
         if (it.endsWith("JExtractSwiftPlugin/src/generated/java")) {
             outputs.dir(it)
-            println("MAKE IT AN OUTPUT")
+            println("OUTPUT = ${it}")
         }
     }
 
-    workingDir = rootDir
+    workingDir = layout.projectDirectory
     commandLine "swift"
     args "build"
 }
@@ -76,6 +95,8 @@ dependencies {
 
     testImplementation(platform("org.junit:junit-bom:5.10.0"))
     testImplementation("org.junit.jupiter:junit-jupiter")
+
+    // implementation(swiftDynamicLibrary('')
 }
 
 tasks.named('test', Test) {

Sources/JExtractSwift/ImportedDecls.swift

@@ -14,8 +14,8 @@
 
 import Foundation
 import JavaTypes
-import SwiftSyntax
 import OrderedCollections
+import SwiftSyntax
 
 /// Any imported (Swift) declaration
 protocol ImportedDecl {
@@ -54,7 +54,7 @@ public struct ImportedNominalType: ImportedDecl {
   /// The Java class name without the package.
   public var javaClassName: String {
     switch javaType {
-    case .class(package: _, name: let name): name
+    case .class(package: _, let name): name
     default: javaType.description
     }
   }
@@ -125,12 +125,16 @@ public enum SelfParameterVariant {
 }
 
 public struct ImportedFunc: ImportedDecl, CustomStringConvertible {
+
+  /// Swift module name (e.g. the target name where a type or function was declared)
+  public var module: String
+
   /// If this function/method is member of a class/struct/protocol,
   /// this will contain that declaration's imported name.
   ///
   /// This is necessary when rendering accessor Java code we need the type that "self" is expecting to have.
-  public var parentName: TranslatedType?
-  public var hasParent: Bool { parentName != nil }
+  public var parent: TranslatedType?
+  public var hasParent: Bool { parent != nil }
 
   /// This is a full name such as init(cap:name:).
   public var identifier: String
@@ -147,8 +151,8 @@ public struct ImportedFunc: ImportedDecl, CustomStringConvertible {
   /// A display name to use to refer to the Swift declaration with its
   /// enclosing type, if there is one.
   public var displayName: String {
-    if let parentName {
-      return "\(parentName.swiftTypeName).\(identifier)"
+    if let parent {
+      return "\(parent.swiftTypeName).\(identifier)"
     }
 
     return identifier
@@ -158,7 +162,7 @@ public struct ImportedFunc: ImportedDecl, CustomStringConvertible {
   public var parameters: [ImportedParam]
 
   public func effectiveParameters(selfVariant: SelfParameterVariant?) -> [ImportedParam] {
-    if let parentName {
+    if let parent {
       var params = parameters
 
       // Add `self: Self` for method calls on a member
@@ -171,21 +175,15 @@ public struct ImportedFunc: ImportedDecl, CustomStringConvertible {
       case .pointer:
         let selfParam: FunctionParameterSyntax = "self$: $swift_pointer"
         params.append(
-          ImportedParam(
-            param: selfParam,
-            type: parentName
-          )
+          ImportedParam(param: selfParam, type: parent)
         )
 
       case .memorySegment:
         let selfParam: FunctionParameterSyntax = "self$: $java_lang_foreign_MemorySegment"
-        var parentForSelf = parentName
+        var parentForSelf = parent
         parentForSelf.javaType = .javaForeignMemorySegment
         params.append(
-          ImportedParam(
-            param: selfParam,
-            type: parentForSelf
-          )
+          ImportedParam(param: selfParam, type: parentForSelf)
         )
       }
 
@@ -197,7 +195,9 @@ public struct ImportedFunc: ImportedDecl, CustomStringConvertible {
     }
   }
 
-  public var swiftMangledName: String = ""
+  public var accessorThunkName: String {
+    SwiftKitPrinting.Names.functionThunk(module: self.module, function: self)
+  }
 
   public var swiftDecl: any DeclSyntaxProtocol
 
@@ -208,14 +208,16 @@ public struct ImportedFunc: ImportedDecl, CustomStringConvertible {
   public var isInit: Bool = false
 
   public init(
+    module: String,
     decl: any DeclSyntaxProtocol,
-    parentName: TranslatedType?,
+    parent: TranslatedType?,
     identifier: String,
     returnType: TranslatedType,
     parameters: [ImportedParam]
   ) {
     self.swiftDecl = decl
-    self.parentName = parentName
+    self.module = module
+    self.parent = parent
     self.identifier = identifier
     self.returnType = returnType
     self.parameters = parameters
@@ -224,7 +226,7 @@ public struct ImportedFunc: ImportedDecl, CustomStringConvertible {
   public var description: String {
     """
     ImportedFunc {
-      mangledName: \(swiftMangledName)
+      accessorThunkName: \(self.accessorThunkName)
       identifier: \(identifier)
       returnType: \(returnType)
       parameters: \(parameters)
@@ -243,6 +245,9 @@ public enum VariableAccessorKind {
 }
 
 public struct ImportedVariable: ImportedDecl, CustomStringConvertible {
+
+  public var module: String
+
   /// If this function/method is member of a class/struct/protocol,
   /// this will contain that declaration's imported name.
   ///
@@ -254,7 +259,7 @@ public struct ImportedVariable: ImportedDecl, CustomStringConvertible {
   public var identifier: String
 
   /// Which accessors are we able to expose.
-  /// 
+  ///
   /// Usually this will be all the accessors the variable declares,
   /// however if the getter is async or throwing we may not be able to import it
   /// (yet), and therefore would skip it from the supported set.
@@ -289,38 +294,44 @@ public struct ImportedVariable: ImportedDecl, CustomStringConvertible {
 
     switch kind {
     case .set:
-      let newValueParam: FunctionParameterSyntax = "_ newValue: \(self.returnType.cCompatibleSwiftType)"
+      let newValueParam: FunctionParameterSyntax =
+        "_ newValue: \(self.returnType.cCompatibleSwiftType)"
       var funcDecl = ImportedFunc(
+        module: self.module,
         decl: self.syntax!,
-        parentName: self.parentName,
+        parent: self.parentName,
         identifier: self.identifier,
         returnType: TranslatedType.void,
         parameters: [.init(param: newValueParam, type: self.returnType)])
-      funcDecl.swiftMangledName = self.swiftMangledName + "s" // form mangled name of the getter by adding the suffix
+      // FIXME: funcDecl.swiftMangledName = self.swiftMangledName + "s" // form mangled name of the getter by adding the suffix
       return funcDecl
 
     case .get:
       var funcDecl = ImportedFunc(
+        module: self.module,
         decl: self.syntax!,
-        parentName: self.parentName,
+        parent: self.parentName,
         identifier: self.identifier,
         returnType: self.returnType,
         parameters: [])
-      funcDecl.swiftMangledName = self.swiftMangledName + "g" // form mangled name of the getter by adding the suffix
+      // FIXME: funcDecl.swiftMangledName = self.swiftMangledName + "g" // form mangled name of the getter by adding the suffix
       return funcDecl
     }
   }
 
-  public func effectiveAccessorParameters(_ kind: VariableAccessorKind, selfVariant: SelfParameterVariant?) -> [ImportedParam] {
+  public func effectiveAccessorParameters(
+    _ kind: VariableAccessorKind, selfVariant: SelfParameterVariant?
+  ) -> [ImportedParam] {
     var params: [ImportedParam] = []
 
     if kind == .set {
-      let newValueParam: FunctionParameterSyntax = "_ newValue: \(raw: self.returnType.swiftTypeName)"
+      let newValueParam: FunctionParameterSyntax =
+        "_ newValue: \(raw: self.returnType.swiftTypeName)"
       params.append(
         ImportedParam(
           param: newValueParam,
           type: self.returnType)
-        )
+      )
     }
 
     if let parentName {
@@ -361,10 +372,12 @@ public struct ImportedVariable: ImportedDecl, CustomStringConvertible {
   public var syntax: VariableDeclSyntax? = nil
 
   public init(
+    module: String,
     parentName: TranslatedType?,
     identifier: String,
     returnType: TranslatedType
   ) {
+    self.module = module
     self.parentName = parentName
     self.identifier = identifier
     self.returnType = returnType

Sources/JExtractSwift/Swift2JavaTranslator+Printing.swift

@@ -159,11 +159,11 @@ extension Swift2JavaTranslator {
       // Prepare type metadata, we're going to need these when invoking e.g. initializers so cache them in a static.
       // We call into source swift-java source generated accessors which give us the type of the Swift object:
       // TODO: seems we no longer need the mangled name per se, so avoiding such constant and downcall
-//      printer.printParts(
-//        "public static final String TYPE_MANGLED_NAME = ",
-//        SwiftKitPrinting.renderCallGetSwiftTypeMangledName(module: self.swiftModuleName, nominal: decl),
-//        ";"
-//      )
+      //      printer.printParts(
+      //        "public static final String TYPE_MANGLED_NAME = ",
+      //        SwiftKitPrinting.renderCallGetSwiftTypeMangledName(module: self.swiftModuleName, nominal: decl),
+      //        ";"
+      //      )
       printer.printParts(
         """
         public static final SwiftAnyType TYPE_METADATA =
@@ -438,15 +438,15 @@ extension Swift2JavaTranslator {
   }
 
   public func printClassConstructors(_ printer: inout CodePrinter, _ decl: ImportedFunc) {
-    guard let parentName = decl.parentName else {
+    guard let parentName = decl.parent else {
       fatalError("init must be inside a parent type! Was: \(decl)")
     }
     printer.printSeparator(decl.identifier)
 
     let descClassIdentifier = renderDescClassName(decl)
     printer.printTypeDecl("private static class \(descClassIdentifier)") { printer in
       printFunctionDescriptorValue(&printer, decl)
-      printFindMemorySegmentAddrByMangledName(&printer, decl)
+      printAccessorFunctionAddr(&printer, decl)
       printMethodDowncallHandleForAddrDesc(&printer)
     }
 
@@ -516,7 +516,7 @@ extension Swift2JavaTranslator {
 
     printer.printTypeDecl("private static class \(decl.baseIdentifier)") { printer in
       printFunctionDescriptorValue(&printer, decl)
-      printFindMemorySegmentAddrByMangledName(&printer, decl)
+      printAccessorFunctionAddr(&printer, decl)
       printMethodDowncallHandleForAddrDesc(&printer)
     }
 
@@ -611,7 +611,7 @@ extension Swift2JavaTranslator {
         }
 
         printFunctionDescriptorValue(&printer, accessor, accessorKind: accessorKind)
-        printFindMemorySegmentAddrByMangledName(&printer, accessor, accessorKind: accessorKind)
+        printAccessorFunctionAddr(&printer, accessor, accessorKind: accessorKind)
         printMethodDowncallHandleForAddrDesc(&printer, accessorKind: accessorKind)
       }
     }
@@ -647,13 +647,15 @@ extension Swift2JavaTranslator {
     }
   }
 
-  func printFindMemorySegmentAddrByMangledName(
+  func printAccessorFunctionAddr(
     _ printer: inout CodePrinter, _ decl: ImportedFunc,
     accessorKind: VariableAccessorKind? = nil
   ) {
     printer.print(
       """
-      public static final MemorySegment \(accessorKind.renderAddrFieldName) = \(swiftModuleName).findOrThrow("\(decl.swiftMangledName)");
+      public static final MemorySegment \(accessorKind.renderAddrFieldName) = 
+        // FIXME: remove old impl \(swiftModuleName).findOrThrow("NO MANGLED NAMES");
+        \(swiftModuleName).findOrThrow("\(SwiftKitPrinting.Names.functionThunk(module: self.swiftModuleName, function: decl))");
       """
     )
   }