change naming scheme; types are "extracted" since SwiftExtract

Author: ktoso

…tSwiftLib/ImportedDecls+JavaNaming.swift …SwiftLib/ExtractedDecls+JavaNaming.swiftSources/JExtractSwiftLib/ImportedDecls+JavaNaming.swift renamed to Sources/JExtractSwiftLib/ExtractedDecls+JavaNaming.swift Sources/JExtractSwiftLib/ImportedDecls+JavaNaming.swift renamed to Sources/JExtractSwiftLib/ExtractedDecls+JavaNaming.swift

@@ -15,19 +15,26 @@
 import SwiftExtract
 
 // ==== -----------------------------------------------------------------------
-// MARK: Java-facing name aliases for ImportedNominalType
+// MARK: Java name typealiases
 
-extension ImportedNominalType {
+package typealias JavaClassName = String
+package typealias JavaFullyQualifiedClassName = String
+package typealias JavaPackageName = String
+
+// ==== -----------------------------------------------------------------------
+// MARK: Java-facing name aliases for ExtractedNominalType
+
+extension ExtractedNominalType {
   package var effectiveJavaTypeName: SwiftQualifiedTypeName { effectiveOutputTypeName }
   package var effectiveJavaName: String { effectiveOutputName }
   package var effectiveJavaSimpleName: String { effectiveOutputSimpleName }
   package var javaGenericClause: String { outputGenericClause }
 }
 
 // ==== -----------------------------------------------------------------------
-// MARK: Java-facing name aliases for ImportedFunc
+// MARK: Java-facing name aliases for ExtractedFunc
 
-extension ImportedFunc {
+extension ExtractedFunc {
   /// The Java getter name for a Swift property/subscript getter, following
   /// Java Beans conventions: `get<Name>` for non-boolean, `is<Name>` for
   /// boolean (unless the property already starts with `is`, in which case

Sources/JExtractSwiftLib/FFM/FFMSwift2JavaGenerator+FoundationData.swift

@@ -24,7 +24,7 @@ import struct Foundation.URL
 extension FFMSwift2JavaGenerator {
 
   /// Print Java helper methods for Foundation.Data type
-  package func printFoundationDataHelpers(_ printer: inout CodePrinter, _ decl: ImportedNominalType) {
+  package func printFoundationDataHelpers(_ printer: inout CodePrinter, _ decl: ExtractedNominalType) {
     let typeName = decl.swiftNominal.name
     let thunkNameCopyBytes = "swiftjava_\(swiftModuleName)_\(typeName)_copyBytes__"
 

Sources/JExtractSwiftLib/FFM/FFMSwift2JavaGenerator+JavaBindingsPrinting.swift

@@ -20,7 +20,7 @@ import SwiftJavaJNICore
 extension FFMSwift2JavaGenerator {
   package func printFunctionDowncallMethods(
     _ printer: inout CodePrinter,
-    _ decl: ImportedFunc,
+    _ decl: ExtractedFunc,
   ) {
     guard let _ = translatedDecl(for: decl) else {
       // Failed to translate. Skip.
@@ -40,7 +40,7 @@ extension FFMSwift2JavaGenerator {
   /// Print FFM Java binding descriptors for the imported Swift API.
   package func printJavaBindingDescriptorClass(
     _ printer: inout CodePrinter,
-    _ decl: ImportedFunc,
+    _ decl: ExtractedFunc,
   ) {
     let thunkName = thunkNameRegistry.functionThunkName(decl: decl)
     let translated = self.translatedDecl(for: decl)!
@@ -271,7 +271,7 @@ extension FFMSwift2JavaGenerator {
   /// * User-facing functional interfaces.
   func printJavaBindingWrapperHelperClass(
     _ printer: inout CodePrinter,
-    _ decl: ImportedFunc,
+    _ decl: ExtractedFunc,
   ) {
     let translated = self.translatedDecl(for: decl)!
     let bindingDescriptorName = self.thunkNameRegistry.functionThunkName(decl: decl)
@@ -360,7 +360,7 @@ extension FFMSwift2JavaGenerator {
   /// with adding `SwiftArena.ofAuto()` at the end.
   package func printJavaBindingWrapperMethod(
     _ printer: inout CodePrinter,
-    _ decl: ImportedFunc,
+    _ decl: ExtractedFunc,
   ) {
     let translated = self.translatedDecl(for: decl)!
     let methodName = translated.name
@@ -421,7 +421,7 @@ extension FFMSwift2JavaGenerator {
   /// This assumes that all the parameters are passed-in with appropriate names.
   package func printDowncall(
     _ printer: inout CodePrinter,
-    _ decl: ImportedFunc,
+    _ decl: ExtractedFunc,
   ) {
     //===  Part 1: prepare temporary arena if needed.
     let translatedSignature = self.translatedDecl(for: decl)!.translatedSignature
@@ -455,7 +455,7 @@ extension FFMSwift2JavaGenerator {
 
       let arena =
         if let className = type.className,
-          analysis.importedTypes[className] != nil
+          analysis.extractedTypes[className] != nil
         {
           // Use passed-in 'SwiftArena' for 'SwiftValue'.
           "swiftArena"

Sources/JExtractSwiftLib/FFM/FFMSwift2JavaGenerator+SwiftThunkPrinting.swift

@@ -74,20 +74,20 @@ extension FFMSwift2JavaGenerator {
     // We have to write all types to their corresponding output file that matches the file they were declared in,
     // because otherwise SwiftPM plugins will not pick up files apropriately -- we expect 1 output +SwiftJava.swift file for every input.
 
-    let filteredTypes: [String: ImportedNominalType]
+    let filteredTypes: [String: ExtractedNominalType]
     if let singleType = config.singleType {
-      filteredTypes = self.analysis.importedTypes.filter { $0.key == singleType }
+      filteredTypes = self.analysis.extractedTypes.filter { $0.key == singleType }
     } else {
-      filteredTypes = self.analysis.importedTypes
+      filteredTypes = self.analysis.extractedTypes
     }
 
-    for group: (key: String, value: [Dictionary<String, ImportedNominalType>.Element]) in Dictionary(
+    for group: (key: String, value: [Dictionary<String, ExtractedNominalType>.Element]) in Dictionary(
       grouping: filteredTypes,
       by: { $0.value.sourceFilePath },
     ) {
       log.warning("Writing types in file group: \(group.key): \(group.value.map(\.key))")
 
-      let importedTypesForThisFile = group.value
+      let extractedTypesForThisFile = group.value
         .map(\.value)
         .sorted(by: { $0.qualifiedName < $1.qualifiedName })
 
@@ -105,7 +105,7 @@ extension FFMSwift2JavaGenerator {
       )
       self.lookupContext.symbolTable.printImportedModules(&printer)
 
-      for ty in importedTypesForThisFile {
+      for ty in extractedTypesForThisFile {
         log.info("Printing Swift thunks for type: \(ty.qualifiedName.bold)")
         printer.printSeparator("Thunks for \(ty.qualifiedName)")
 
@@ -148,7 +148,7 @@ extension FFMSwift2JavaGenerator {
     self.lookupContext.symbolTable.printImportedModules(&printer)
 
     self.currentJavaIdentifiers = JavaIdentifierFactory(
-      self.analysis.importedGlobalFuncs + self.analysis.importedGlobalVariables
+      self.analysis.extractedGlobalFuncs + self.analysis.extractedGlobalVariables
     )
 
     for thunk in stt.renderGlobalThunks() {
@@ -157,7 +157,7 @@ extension FFMSwift2JavaGenerator {
     }
   }
 
-  public func printSwiftThunkSources(_ printer: inout CodePrinter, decl: ImportedFunc) {
+  public func printSwiftThunkSources(_ printer: inout CodePrinter, decl: ExtractedFunc) {
     let stt = SwiftThunkTranslator(self)
 
     for thunk in stt.render(forFunc: decl) {
@@ -166,7 +166,7 @@ extension FFMSwift2JavaGenerator {
     }
   }
 
-  package func printSwiftThunkSources(_ printer: inout CodePrinter, ty: ImportedNominalType) throws {
+  package func printSwiftThunkSources(_ printer: inout CodePrinter, ty: ExtractedNominalType) throws {
     let stt = SwiftThunkTranslator(self)
 
     self.currentJavaIdentifiers = JavaIdentifierFactory(
@@ -191,22 +191,22 @@ struct SwiftThunkTranslator {
   func renderGlobalThunks() -> [DeclSyntax] {
     var decls: [DeclSyntax] = []
     decls.reserveCapacity(
-      st.analysis.importedGlobalVariables.count + st.analysis.importedGlobalFuncs.count
+      st.analysis.extractedGlobalVariables.count + st.analysis.extractedGlobalFuncs.count
     )
 
-    for decl in st.analysis.importedGlobalVariables {
+    for decl in st.analysis.extractedGlobalVariables {
       decls.append(contentsOf: render(forFunc: decl))
     }
 
-    for decl in st.analysis.importedGlobalFuncs {
+    for decl in st.analysis.extractedGlobalFuncs {
       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] {
+  func renderThunks(forType nominal: ExtractedNominalType) -> [DeclSyntax] {
     var decls: [DeclSyntax] = []
     decls.reserveCapacity(
       1 + nominal.initializers.count + nominal.variables.count + nominal.methods.count
@@ -233,7 +233,7 @@ struct SwiftThunkTranslator {
   }
 
   /// Accessor to get the `T.self` of the Swift type, without having to rely on mangled name lookups.
-  func renderSwiftTypeAccessor(_ nominal: ImportedNominalType) -> DeclSyntax {
+  func renderSwiftTypeAccessor(_ nominal: ExtractedNominalType) -> DeclSyntax {
     let funcName = SwiftKitPrinting.Names.getType(
       module: st.swiftModuleName,
       nominal: nominal,
@@ -248,7 +248,7 @@ struct SwiftThunkTranslator {
       """
   }
 
-  func render(forFunc decl: ImportedFunc) -> [DeclSyntax] {
+  func render(forFunc decl: ExtractedFunc) -> [DeclSyntax] {
     st.log.trace("Rendering thunks for: \(decl.displayName)")
 
     let thunkName = st.thunkNameRegistry.functionThunkName(decl: decl)
@@ -265,7 +265,7 @@ struct SwiftThunkTranslator {
   }
 
   /// Render special thunks for known types like Foundation.Data
-  func renderSpecificTypeThunks(_ nominal: ImportedNominalType) -> [DeclSyntax] {
+  func renderSpecificTypeThunks(_ nominal: ExtractedNominalType) -> [DeclSyntax] {
     guard let knownType = nominal.swiftNominal.knownTypeKind else {
       return []
     }
@@ -279,7 +279,7 @@ struct SwiftThunkTranslator {
   }
 
   /// Render Swift thunks for Foundation.Data helper methods
-  private func renderFoundationDataThunks(_ nominal: ImportedNominalType) -> [DeclSyntax] {
+  private func renderFoundationDataThunks(_ nominal: ExtractedNominalType) -> [DeclSyntax] {
     let thunkName = "swiftjava_\(st.swiftModuleName)_\(nominal.swiftNominal.name)_copyBytes__"
     let qualifiedName = nominal.swiftNominal.qualifiedName
 

Sources/JExtractSwiftLib/JNI/JNICaching.swift

@@ -15,15 +15,15 @@
 import SwiftExtract
 
 enum JNICaching {
-  static func cacheName(for type: ImportedNominalType) -> String {
+  static func cacheName(for type: ExtractedNominalType) -> String {
     cacheName(for: type.effectiveJavaTypeName)
   }
 
   static func cacheName(for type: SwiftNominalType) -> String {
     cacheName(for: type.nominalTypeDecl.qualifiedTypeName)
   }
 
-  static func bridgeName(for type: ImportedNominalType) -> String {
+  static func bridgeName(for type: ExtractedNominalType) -> String {
     bridgeName(for: type.swiftNominal.qualifiedTypeName)
   }
 
@@ -39,7 +39,7 @@ enum JNICaching {
     "_JNIBridge_\(typeName.fullFlatName)"
   }
 
-  static func cacheMemberName(for enumCase: ImportedEnumCase) -> String {
+  static func cacheMemberName(for enumCase: ExtractedEnumCase) -> String {
     "\(enumCase.enumType.nominalTypeDecl.name.firstCharacterLowercased)\(enumCase.name.firstCharacterUppercased)Cache"
   }
 

Sources/JExtractSwiftLib/JNI/JNISwift2JavaGenerator+InterfaceWrapperGeneration.swift

@@ -21,9 +21,9 @@ import SwiftSyntax
 extension JNISwift2JavaGenerator {
 
   func generateInterfaceWrappers(
-    _ types: [ImportedNominalType]
-  ) -> [ImportedNominalType: JavaInterfaceSwiftWrapper] {
-    var wrappers = [ImportedNominalType: JavaInterfaceSwiftWrapper]()
+    _ types: [ExtractedNominalType]
+  ) -> [ExtractedNominalType: JavaInterfaceSwiftWrapper] {
+    var wrappers = [ExtractedNominalType: JavaInterfaceSwiftWrapper]()
 
     for type in types where type.swiftNominal.kind == .protocol {
       // Skip protocols that have a known representative concrete type (e.g. DataProtocol).
@@ -51,7 +51,7 @@ extension JNISwift2JavaGenerator {
     let protocolType: SwiftNominalType
     let functions: [Function]
     let variables: [Variable]
-    let importedType: ImportedNominalType
+    let importedType: ExtractedNominalType
 
     var wrapperName: String {
       protocolType.nominalTypeDecl.javaInterfaceSwiftProtocolWrapperName
@@ -102,7 +102,7 @@ extension JNISwift2JavaGenerator {
   }
 
   struct JavaInterfaceProtocolWrapperGenerator {
-    func generate(for type: ImportedNominalType) throws -> JavaInterfaceSwiftWrapper {
+    func generate(for type: ExtractedNominalType) throws -> JavaInterfaceSwiftWrapper {
       if !type.initializers.isEmpty
         || type.methods.contains(where: \.isStatic)
         || type.variables.contains(where: \.isStatic)
@@ -164,7 +164,7 @@ extension JNISwift2JavaGenerator {
       )
     }
 
-    private func translate(function: ImportedFunc) throws -> JavaInterfaceSwiftWrapper.Function {
+    private func translate(function: ExtractedFunc) throws -> JavaInterfaceSwiftWrapper.Function {
       let parameters = try function.functionSignature.parameters.map {
         try self.translateParameter($0)
       }
@@ -181,8 +181,8 @@ extension JNISwift2JavaGenerator {
     }
 
     private func translateVariable(
-      getter: ImportedFunc,
-      setter: ImportedFunc?
+      getter: ExtractedFunc,
+      setter: ExtractedFunc?
     ) throws -> JavaInterfaceSwiftWrapper.Variable {
       try JavaInterfaceSwiftWrapper.Variable(
         swiftDecl: getter.swiftDecl, // they should be the same