[JExtract] Always emit Data+SwiftJava.swift

Author: rintaro

Samples/SwiftKitSampleApp/src/main/java/com/example/swift/HelloJava2Swift.java

@@ -86,6 +86,7 @@ static void examples() {
         try (var arena = SwiftArena.ofConfined()) {
             var origBytes = arena.allocateFrom("foobar");
             var origDat = Data.init(origBytes, origBytes.byteSize(), arena);
+            SwiftKit.trace("origDat.count = " + origDat.getCount());
 
             // var origBytes = arena.allocate(ValueLayout.JAVA_INT, arry.length);
             // origBytes.copyFrom(MemorySegment.ofArray(arry));

Sources/JExtractSwiftLib/FFM/FFMSwift2JavaGenerator.swift

@@ -63,6 +63,9 @@ package class FFMSwift2JavaGenerator: Swift2JavaGenerator {
         return String(filePathPart.replacing(".swift", with: "+SwiftJava.swift"))
       })
       self.expectedOutputSwiftFiles.insert("\(translator.swiftModuleName)Module+SwiftJava.swift")
+
+      // FIXME: Can we avoid this?
+      self.expectedOutputSwiftFiles.insert("Data+SwiftJava.swift")
     } else {
       self.expectedOutputSwiftFiles = []
     }

Sources/JExtractSwiftLib/JNI/JNISwift2JavaGenerator.swift

@@ -58,6 +58,9 @@ package class JNISwift2JavaGenerator: Swift2JavaGenerator {
         return String(filePathPart.replacing(".swift", with: "+SwiftJava.swift"))
       })
       self.expectedOutputSwiftFiles.insert("\(translator.swiftModuleName)Module+SwiftJava.swift")
+
+      // FIXME: Can we avoid this?
+      self.expectedOutputSwiftFiles.insert("Data+SwiftJava.swift")
     } else {
       self.expectedOutputSwiftFiles = []
     }

Sources/JExtractSwiftLib/SwiftTypes/SwiftKnownModules.swift

@@ -88,6 +88,7 @@ private let swiftSourceFile: SourceFileSyntax = """
 private let foundationSourceFile: SourceFileSyntax = """
   public struct Data {
     public init(bytes: UnsafeRawPointer, count: Int)
+    public var count: Int { get }
     public func withUnsafeBytes(_ body: (UnsafeRawBufferPointer) -> Void)
   }
   """