address reviewed items

Author: andrewmd5

Sources/WASI/FileSystem.swift

@@ -137,9 +137,9 @@ public enum FileContent {
 /// Public protocol for file system providers that users interact with.
 ///
 /// This protocol exposes only user-facing methods for managing files and directories.
-public protocol FileSystemProvider {
+public protocol FileSystemProvider: ~Copyable {
     /// Adds a file to the file system with the given byte content.
-    func addFile(at path: String, content: [UInt8]) throws
+    func addFile(at path: String, content: some Sequence<UInt8>) throws
 
     /// Adds a file to the file system with the given string content.
     func addFile(at path: String, content: String) throws
@@ -158,9 +158,9 @@ public protocol FileSystemProvider {
 ///
 /// This protocol contains WASI-specific implementation details that should not
 /// be exposed to library users.
-internal protocol FileSystem {
+protocol FileSystemImplementation: ~Copyable {
     /// Returns the list of pre-opened directory paths.
-    func getPreopenPaths() -> [String]
+    var preopenPaths: [String] { get }
 
     /// Opens a directory and returns a WASIDir implementation.
     func openDirectory(at path: String) throws -> any WASIDir

Sources/WASI/MemoryFileSystem/MemoryDirEntry.swift

@@ -1,7 +1,7 @@
 import SystemPackage
 
 /// A WASIDir implementation backed by an in-memory directory node.
-internal struct MemoryDirEntry: WASIDir {
+struct MemoryDirEntry: WASIDir {
     let preopenPath: String?
     let dirNode: MemoryDirectoryNode
     let path: String

Sources/WASI/MemoryFileSystem/MemoryFSNodes.swift

@@ -1,19 +1,19 @@
 import SystemPackage
 
 /// Base protocol for all file system nodes in memory.
-internal protocol MemFSNode: AnyObject {
+protocol MemFSNode: AnyObject {
     var type: MemFSNodeType { get }
 }
 
 /// Types of file system nodes.
-internal enum MemFSNodeType {
+enum MemFSNodeType {
     case directory
     case file
     case characterDevice
 }
 
 /// A directory node in the memory file system.
-internal final class MemoryDirectoryNode: MemFSNode {
+final class MemoryDirectoryNode: MemFSNode {
     let type: MemFSNodeType = .directory
     private var children: [String: MemFSNode] = [:]
 
@@ -42,16 +42,16 @@ internal final class MemoryDirectoryNode: MemFSNode {
 }
 
 /// A regular file node in the memory file system.
-internal final class MemoryFileNode: MemFSNode {
+final class MemoryFileNode: MemFSNode {
     let type: MemFSNodeType = .file
     var content: FileContent
 
     init(content: FileContent) {
         self.content = content
     }
 
-    convenience init(bytes: [UInt8]) {
-        self.init(content: .bytes(bytes))
+    convenience init(bytes: some Sequence<UInt8>) {
+        self.init(content: .bytes(Array(bytes)))
     }
 
     convenience init(handle: FileDescriptor) {
@@ -74,7 +74,7 @@ internal final class MemoryFileNode: MemFSNode {
 }
 
 /// A character device node in the memory file system.
-internal final class MemoryCharacterDeviceNode: MemFSNode {
+final class MemoryCharacterDeviceNode: MemFSNode {
     let type: MemFSNodeType = .characterDevice
 
     enum Kind {
@@ -89,7 +89,7 @@ internal final class MemoryCharacterDeviceNode: MemFSNode {
 }
 
 /// A WASIFile implementation for character devices like /dev/null
-internal final class MemoryCharacterDeviceEntry: WASIFile {
+final class MemoryCharacterDeviceEntry: WASIFile {
     let deviceNode: MemoryCharacterDeviceNode
     let accessMode: FileAccessMode
 

Sources/WASI/MemoryFileSystem/MemoryFileEntry.swift

@@ -1,7 +1,7 @@
 import SystemPackage
 
 /// A WASIFile implementation for regular files in the memory file system.
-internal final class MemoryFileEntry: WASIFile {
+final class MemoryFileEntry: WASIFile {
     let fileNode: MemoryFileNode
     let accessMode: FileAccessMode
     var position: Int

Sources/WASI/MemoryFileSystem/MemoryFileSystem.swift

@@ -16,11 +16,11 @@ import SystemPackage
 /// let fd = try FileDescriptor.open("/path/to/file", .readOnly)
 /// try fs.addFile(at: "/mounted.txt", handle: fd)
 /// ```
-public final class MemoryFileSystem: FileSystemProvider, FileSystem {
+public final class MemoryFileSystem: FileSystemProvider, FileSystemImplementation {
     private static let rootPath = "/"
 
     private var root: MemoryDirectoryNode
-    private let preopenPaths: [String]
+    let preopenPaths: [String]
 
     /// Creates a new in-memory file system.
     ///
@@ -50,8 +50,8 @@ public final class MemoryFileSystem: FileSystemProvider, FileSystem {
     ///
     /// - Parameters:
     ///   - path: The path where the file should be created
-    ///   - content: The file content as byte array
-    public func addFile(at path: String, content: [UInt8]) throws {
+    ///   - content: The file content as a sequence of bytes
+    public func addFile(at path: String, content: some Sequence<UInt8>) throws {
         let normalized = normalizePath(path)
         let (parentPath, fileName) = try splitPath(normalized)
 
@@ -65,7 +65,7 @@ public final class MemoryFileSystem: FileSystemProvider, FileSystem {
     ///   - path: The path where the file should be created
     ///   - content: The file content as string (converted to UTF-8)
     public func addFile(at path: String, content: String) throws {
-        try addFile(at: path, content: Array(content.utf8))
+        try addFile(at: path, content: content.utf8)
     }
 
     /// Adds a file to the file system backed by a file descriptor.
@@ -113,13 +113,9 @@ public final class MemoryFileSystem: FileSystemProvider, FileSystem {
         }
     }
 
-    // MARK: - FileSystem (Internal WASI API)
+    // MARK: - FileSystemImplementation (WASI API)
 
-    internal func getPreopenPaths() -> [String] {
-        return preopenPaths
-    }
-
-    internal func openDirectory(at path: String) throws -> any WASIDir {
+    func openDirectory(at path: String) throws -> any WASIDir {
         guard let node = lookup(at: path) else {
             throw WASIAbi.Errno.ENOENT
         }
@@ -136,7 +132,7 @@ public final class MemoryFileSystem: FileSystemProvider, FileSystem {
         )
     }
 
-    internal func openAt(
+    func openAt(
         dirFd: any WASIDir,
         path: String,
         oflags: WASIAbi.Oflags,
@@ -227,13 +223,13 @@ public final class MemoryFileSystem: FileSystemProvider, FileSystem {
         throw WASIAbi.Errno.ENOTSUP
     }
 
-    internal func createStdioFile(fd: FileDescriptor, accessMode: FileAccessMode) -> any WASIFile {
+    func createStdioFile(fd: FileDescriptor, accessMode: FileAccessMode) -> any WASIFile {
         return MemoryStdioFile(fd: fd, accessMode: accessMode)
     }
 
-    // MARK: - Internal File Operations
+    // MARK: - File Operations
 
-    internal func lookup(at path: String) -> MemFSNode? {
+    func lookup(at path: String) -> MemFSNode? {
         let normalized = normalizePath(path)
 
         if normalized == Self.rootPath {
@@ -256,7 +252,7 @@ public final class MemoryFileSystem: FileSystemProvider, FileSystem {
         return current
     }
 
-    internal func resolve(from directory: MemoryDirectoryNode, at directoryPath: String, path relativePath: String) -> MemFSNode? {
+    func resolve(from directory: MemoryDirectoryNode, at directoryPath: String, path relativePath: String) -> MemFSNode? {
         if relativePath.isEmpty {
             return directory
         }
@@ -292,7 +288,7 @@ public final class MemoryFileSystem: FileSystemProvider, FileSystem {
     }
 
     @discardableResult
-    internal func ensureDirectory(at path: String) throws -> MemoryDirectoryNode {
+    func ensureDirectory(at path: String) throws -> MemoryDirectoryNode {
         let normalized = normalizePath(path)
 
         if normalized == Self.rootPath {
@@ -342,7 +338,7 @@ public final class MemoryFileSystem: FileSystemProvider, FileSystem {
     }
 
     @discardableResult
-    internal func createFile(in directory: MemoryDirectoryNode, at relativePath: String, oflags: WASIAbi.Oflags) throws -> MemoryFileNode {
+    func createFile(in directory: MemoryDirectoryNode, at relativePath: String, oflags: WASIAbi.Oflags) throws -> MemoryFileNode {
         try validateRelativePath(relativePath)
 
         let components = relativePath.split(separator: "/").map(String.init)
@@ -367,7 +363,7 @@ public final class MemoryFileSystem: FileSystemProvider, FileSystem {
         }
     }
 
-    internal func removeNode(in directory: MemoryDirectoryNode, at relativePath: String, mustBeDirectory: Bool) throws {
+    func removeNode(in directory: MemoryDirectoryNode, at relativePath: String, mustBeDirectory: Bool) throws {
         try validateRelativePath(relativePath)
 
         let components = relativePath.split(separator: "/").map(String.init)
@@ -403,7 +399,7 @@ public final class MemoryFileSystem: FileSystemProvider, FileSystem {
         current.removeChild(name: fileName)
     }
 
-    internal func rename(from sourcePath: String, in sourceDir: MemoryDirectoryNode, to destPath: String, in destDir: MemoryDirectoryNode) throws {
+    func rename(from sourcePath: String, in sourceDir: MemoryDirectoryNode, to destPath: String, in destDir: MemoryDirectoryNode) throws {
         guard let sourceNode = resolve(from: sourceDir, at: "", path: sourcePath) else {
             throw WASIAbi.Errno.ENOENT
         }

Sources/WASI/Platform/HostFileSystem.swift

@@ -20,7 +20,8 @@ import SystemPackage
 ///
 /// This implementation provides access to actual files and directories on the host system,
 /// with appropriate sandboxing through pre-opened directories.
-public final class HostFileSystem: FileSystemProvider, FileSystem {
+public final class HostFileSystem: FileSystemProvider, FileSystemImplementation {
+
     private let preopens: [String: String]
 
     /// Creates a new host file system with the specified pre-opened directories.
@@ -32,7 +33,7 @@ public final class HostFileSystem: FileSystemProvider, FileSystem {
 
     // MARK: - FileSystemProvider (Public API)
 
-    public func addFile(at path: String, content: [UInt8]) throws {
+    public func addFile(at path: String, content: some Sequence<UInt8>) throws {
         throw WASIAbi.Errno.ENOTSUP
     }
 
@@ -52,13 +53,13 @@ public final class HostFileSystem: FileSystemProvider, FileSystem {
         throw WASIAbi.Errno.ENOTSUP
     }
 
-    // MARK: - FileSystem (Internal WASI API)
+    // MARK: - FileSystemImplementation (WASI API)
 
-    internal func getPreopenPaths() -> [String] {
+    var preopenPaths: [String] {
         return Array(preopens.keys).sorted()
     }
 
-    internal func openDirectory(at path: String) throws -> any WASIDir {
+    func openDirectory(at path: String) throws -> any WASIDir {
         guard let hostPath = preopens[path] else {
             throw WASIAbi.Errno.ENOENT
         }
@@ -83,7 +84,7 @@ public final class HostFileSystem: FileSystemProvider, FileSystem {
         return DirEntry(preopenPath: path, fd: fd)
     }
 
-    internal func openAt(
+    func openAt(
         dirFd: any WASIDir,
         path: String,
         oflags: WASIAbi.Oflags,
@@ -124,7 +125,7 @@ public final class HostFileSystem: FileSystemProvider, FileSystem {
         #endif
     }
 
-    internal func createStdioFile(fd: FileDescriptor, accessMode: FileAccessMode) -> any WASIFile {
+    func createStdioFile(fd: FileDescriptor, accessMode: FileAccessMode) -> any WASIFile {
         return StdioFileEntry(fd: fd, accessMode: accessMode)
     }
 }

Sources/WASI/WASI.swift

@@ -1373,7 +1373,7 @@ public class WASIBridgeToHost: WASI {
     private let wallClock: WallClock
     private let monotonicClock: MonotonicClock
     private var randomGenerator: RandomBufferGenerator
-    private let fileSystem: FileSystem
+    private let fileSystem: FileSystemImplementation
 
     public init(
         args: [String] = [],
@@ -1390,7 +1390,7 @@ public class WASIBridgeToHost: WASI {
         self.args = args
         self.environment = environment
         if let provider = fileSystemProvider {
-            guard let fs = provider as? FileSystem else {
+            guard let fs = provider as? FileSystemImplementation else {
                 throw WASIError(description: "Invalid file system provider")
             }
             self.fileSystem = fs
@@ -1403,7 +1403,7 @@ public class WASIBridgeToHost: WASI {
         fdTable[1] = .file(self.fileSystem.createStdioFile(fd: stdout, accessMode: .write))
         fdTable[2] = .file(self.fileSystem.createStdioFile(fd: stderr, accessMode: .write))
 
-        for preopenPath in self.fileSystem.getPreopenPaths() {
+        for preopenPath in self.fileSystem.preopenPaths {
             let dirEntry = try self.fileSystem.openDirectory(at: preopenPath)
             _ = try fdTable.push(.directory(dirEntry))
         }

Tests/WASITests/WASITests.swift

@@ -139,7 +139,7 @@ struct WASITests {
     func memoryFileSystem() throws {
         let fs = try MemoryFileSystem(preopens: ["/": "/"])
 
-        #expect(fs.getPreopenPaths() == ["/"])
+        #expect(fs.preopenPaths == ["/"])
         #expect(fs.lookup(at: "/") != nil)
         #expect(fs.lookup(at: "/dev/null") != nil)
 
@@ -329,7 +329,7 @@ struct WASITests {
             "/data": "/data",
         ])
 
-        let preopens = fs.getPreopenPaths()
+        let preopens = fs.preopenPaths
         #expect(preopens.count == 3)
         #expect(preopens.contains("/"))
         #expect(preopens.contains("/tmp"))