Propetly extract usage of Data type from FoundationEssentials.

Author: pelekon

Sources/JExtractSwiftLib/FFM/CDeclLowering/CRepresentation.swift

@@ -125,7 +125,9 @@ extension SwiftKnownTypeDeclKind {
       .qualified(const: true, volatile: false, type: .void)
     )
     case .void: .void
-    case .unsafePointer, .unsafeMutablePointer, .unsafeRawBufferPointer, .unsafeMutableRawBufferPointer, .unsafeBufferPointer, .unsafeMutableBufferPointer, .string, .data, .dataProtocol, .optional:
+    case .unsafePointer, .unsafeMutablePointer, .unsafeRawBufferPointer, .unsafeMutableRawBufferPointer, 
+    .unsafeBufferPointer, .unsafeMutableBufferPointer, .string, .data, .dataProtocol, .essentialsData, 
+    .essentialsDataProtocol, .optional:
        nil
     }
   }

Sources/JExtractSwiftLib/JNI/JNIJavaTypeTranslator.swift

@@ -50,7 +50,7 @@ enum JNIJavaTypeTranslator {
         .unsafePointer, .unsafeMutablePointer,
         .unsafeRawBufferPointer, .unsafeMutableRawBufferPointer,
         .unsafeBufferPointer, .unsafeMutableBufferPointer,
-        .optional, .data, .dataProtocol:
+        .optional, .data, .dataProtocol, .essentialsData, .essentialsDataProtocol:
       return nil
     }
   }

Sources/JExtractSwiftLib/Swift2JavaTranslator.swift

@@ -108,10 +108,10 @@ extension Swift2JavaTranslator {
       visitor.visit(sourceFile: input.syntax)
     }
 
-    // If any API uses 'Foundation.Data', import 'Data' as if it's declared in
-    // this module.
-    if let dataDecl = self.symbolTable[.data] {
-      let dataProtocolDecl = self.symbolTable[.dataProtocol]!
+    // If any API uses 'Foundation.Data' or 'FoundationEssentials.Data', 
+    // import 'Data' as if it's declared in this module.
+    if let dataDecl = self.symbolTable[.data] ?? self.symbolTable[.essentialsData] {
+      let dataProtocolDecl = (self.symbolTable[.dataProtocol] ?? self.symbolTable[.essentialsDataProtocol])!
       if self.isUsing(where: { $0 == dataDecl || $0 == dataProtocolDecl }) {
         visitor.visit(nominalDecl: dataDecl.syntax!.asNominal!, in: nil)
       }

Sources/JExtractSwiftLib/SwiftTypes/SwiftKnownModules.swift

@@ -18,6 +18,7 @@ import SwiftSyntaxBuilder
 enum SwiftKnownModule: String {
   case swift = "Swift"
   case foundation = "Foundation"
+  case foundationEssentials = "FoundationEssentials"
 
   var name: String {
     return self.rawValue
@@ -27,13 +28,15 @@ enum SwiftKnownModule: String {
     return switch self {
     case .swift: swiftSymbolTable
     case .foundation: foundationSymbolTable
+    case .foundationEssentials: foundationEssentialsSymbolTable
     }
   }
 
   var sourceFile: SourceFileSyntax {
     return switch self {
     case .swift: swiftSourceFile
-    case .foundation: foundationSourceFile
+    case .foundation: foundationEssentialsSourceFile
+    case .foundationEssentials: foundationEssentialsSourceFile
     }
   }
 }
@@ -44,6 +47,12 @@ private var swiftSymbolTable: SwiftModuleSymbolTable {
   return builder.finalize()
 }
 
+private var foundationEssentialsSymbolTable: SwiftModuleSymbolTable {
+  var builder = SwiftParsedModuleSymbolTableBuilder(moduleName: "FoundationEssentials", importedModules: ["Swift": swiftSymbolTable])
+  builder.handle(sourceFile: foundationEssentialsSourceFile)
+  return builder.finalize()
+}
+
 private var foundationSymbolTable: SwiftModuleSymbolTable {
   var builder = SwiftParsedModuleSymbolTableBuilder(moduleName: "Foundation", importedModules: ["Swift": swiftSymbolTable])
   builder.handle(sourceFile: foundationSourceFile)
@@ -87,7 +96,7 @@ private let swiftSourceFile: SourceFileSyntax = """
   }
   """
 
-private let foundationSourceFile: SourceFileSyntax = """
+private let foundationEssentialsSourceFile: SourceFileSyntax = """
   public protocol DataProtocol {}
   
   public struct Data: DataProtocol {
@@ -96,3 +105,9 @@ private let foundationSourceFile: SourceFileSyntax = """
     public func withUnsafeBytes(_ body: (UnsafeRawBufferPointer) -> Void)
   }
   """
+
+private var foundationSourceFile: SourceFileSyntax {
+  // On platforms other than Darwin, imports such as FoundationEssentials, FoundationNetworking, etc. are used, 
+  // so this file should be created by combining the files of the aforementioned modules.
+  foundationEssentialsSourceFile
+}

Sources/JExtractSwiftLib/SwiftTypes/SwiftKnownTypeDecls.swift

@@ -15,6 +15,7 @@
 import SwiftSyntax
 
 enum SwiftKnownTypeDeclKind: String, Hashable {
+  // MARK: -Std
   case bool = "Swift.Bool"
   case int = "Swift.Int"
   case uint = "Swift.UInt"
@@ -40,8 +41,11 @@ enum SwiftKnownTypeDeclKind: String, Hashable {
   case void = "Swift.Void"
   case string = "Swift.String"
 
+  // MARK: -Foundation
   case dataProtocol = "Foundation.DataProtocol"
+  case essentialsDataProtocol = "FoundationEssentials.DataProtocol"
   case data = "Foundation.Data"
+  case essentialsData = "FoundationEssentials.Data"
 
   var moduleAndName: (module: String, name: String) {
     let qualified = self.rawValue