Add async mkdir/rmdir/unlink, add rename

All have been missing.

Author: helje5

Sources/fs/File.swift

@@ -3,7 +3,7 @@
 //  Macro
 //
 //  Created by Helge Hess.
-//  Copyright © 2020-2023 ZeeZide GmbH. All rights reserved.
+//  Copyright © 2020-2026 ZeeZide GmbH. All rights reserved.
 //
 
 import protocol NIO.EventLoop
@@ -24,6 +24,7 @@ import struct   xsys.mode_t
 import let      xsys.mkdir
 import let      xsys.rmdir
 import var      xsys.errno
+import let      xsys.rename
 
 // Most, not all, funcs currently require Foundation and should be reimplemented
 // using Posix as an alternative.
@@ -406,6 +407,67 @@ public struct MakeDirOptions: Equatable {
   }
 }
 
+// MARK: - Async Callback Variants
+
+/**
+ * Create a directory asynchronously on the thread pool (blocks).
+ *
+ * - Parameters:
+ *   - path:    The path to the directory to create.
+ *   - options: The ``MakeDirOptions`` specifying the creation behaviour.
+ *   - yield:   Called on completion with an optional error.
+ */
+@inlinable
+public func mkdir(_ path: String,
+                  _ options: MakeDirOptions = .init(),
+                  yield: @escaping ( Error? ) -> Void)
+{
+  FileSystemModule._evalAsync(
+    mkdirSync, (path, options), yield)
+}
+
+/**
+ * Delete a directory asynchronously on the thread pool (blocks).
+ *
+ * - Parameters:
+ *   - path:  The path to the directory to remove.
+ *   - yield: Called on completion with an optional error.
+ */
+@inlinable
+public func rmdir(_ path: String, yield: @escaping ( Error? ) -> Void) {
+  FileSystemModule._evalAsync(rmdirSync, path, yield)
+}
+
+/**
+ * Delete a file asynchronously on the thread pool (blocks).
+ *
+ * - Parameters:
+ *   - path:  The path to the file to remove.
+ *   - yield: Called on completion with an optional error.
+ */
+@inlinable
+public func unlink(_ path: String, yield: @escaping ( Error? ) -> Void) {
+  FileSystemModule._evalAsync(unlinkSync, path, yield)
+}
+
+/**
+ * Rename a file or directory asynchronously on the thread pool (blocks).
+ *
+ * - Parameters:
+ *   - oldPath: The current path.
+ *   - newPath: The new path.
+ *   - yield:   Called on completion with an optional error.
+ */
+@inlinable
+public func rename(_ oldPath: String, _ newPath: String,
+                   yield: @escaping ( Error? ) -> Void)
+{
+  FileSystemModule._evalAsync(renameSync, (oldPath, newPath), yield)
+}
+
+
+// MARK: - Sync Variants
+
 /**
  * Create a directory synchronously, on the active thread.
  *
@@ -443,7 +505,7 @@ public func mkdirSync(_ path: String, _ umask: String) throws {
 }
 
 /**
- * Delete a directory synchronously, on the active thread.
+ * Delete a directory synchronously, on the active thread (blocks).
  *
  * - Parameters:
  *   - path:  The path to the directory to create.
@@ -459,7 +521,7 @@ public func rmdirSync(_ path: String) throws {
 }
 
 /**
- * Delete a directory or file synchronously, on the active thread.
+ * Delete a directory or file synchronously, on the active thread (blocks).
  *
  * - Parameters:
  *   - path:  The path to the directory to create.
@@ -474,6 +536,18 @@ public func unlinkSync(_ path: String) throws {
   #endif
 }
 
+/**
+ * Rename a file or directory synchronously, on the active thread (blocks).
+ * 
+ * - Parameters:
+ *   - path:    The path to rename
+ *   - newPath: The new name. 
+ */
+public func renameSync(_ path: String, _ newPath: String) throws {
+  let rc = rename(path, newPath)
+  if rc != 0 { try throwErrno() }
+}
+
 /**
  * Throw a custom error for the currently active Posix `errno` value.
  */

Sources/fs/fs.swift

@@ -3,7 +3,7 @@
 //  Macro
 //
 //  Created by Helge Hess.
-//  Copyright © 2020-2021 ZeeZide GmbH. All rights reserved.
+//  Copyright © 2020-2026 ZeeZide GmbH. All rights reserved.
 //
 
 import class  NIO.NIOThreadPool
@@ -80,10 +80,10 @@ public extension FileSystemModule {
     return fs.createReadStream(path)
   }
   @inlinable
-  static func createWriteStream(on eventLoop: EventLoop? = nil,
-                                _ path: String,
-                                flags: NIOFileHandle.Flags
-                                          = .allowFileCreation())
+  static func createWriteStream(on eventLoop : EventLoop? = nil,
+                                _       path : String,
+                                flags        : NIOFileHandle.Flags
+                                             = .allowFileCreation())
               -> FileWriteStream
   {
     return fs.createWriteStream(on: eventLoop, path, flags: flags)
@@ -106,7 +106,8 @@ public extension FileSystemModule {
   /// Check whether we have access to the given path in the given mode.
   @inlinable
   static func access(_ path: String, _ mode: Int = F_OK,
-                     yield: @escaping ( Error? ) -> Void) {
+                     yield: @escaping ( Error? ) -> Void) 
+  {
     fs.access(path, mode, yield: yield)
   }
 
@@ -126,9 +127,10 @@ public extension FileSystemModule {
 
   // MARK: - Synchronous wrappers
 
-  // If you do a lot of FS operations in sequence, you might want to use a single
-  // (async) GCD call, instead of using the convenience async functions.
+  // If you do a lot of FS operations in sequence, you might want to use a
+  // single (async) GCD call, instead of using the convenience async functions.
   //
+  // TODO(2026-04-04): Update note for Macro, this was for Noze.io :-)
   // Example:
   //   FileSystemModule.workerQueue.async {
   //     statSync(...)
@@ -249,6 +251,31 @@ public extension FileSystemModule {
     try fs.writeFileSync(path, string, encoding)
   }
 
+  // MARK: - Async Callback Variants
+
+  @inlinable
+  static func mkdir(_ path: String, _ options: MakeDirOptions = .init(),
+                    yield: @escaping ( Error? ) -> Void)
+  {
+    fs.mkdir(path, options, yield: yield)
+  }
+  @inlinable
+  static func rmdir(_ path: String, yield: @escaping ( Error? ) -> Void) {
+    fs.rmdir(path, yield: yield)
+  }
+  @inlinable
+  static func unlink(_ path: String, yield: @escaping ( Error? ) -> Void) {
+    fs.unlink(path, yield: yield)
+  }
+  @inlinable
+  static func rename(_ oldPath: String, _ newPath: String,
+                     yield: @escaping ( Error? ) -> Void)
+  {
+    fs.rename(oldPath, newPath, yield: yield)
+  }
+
+  // MARK: - Sync Variants
+
   @inlinable
   static func mkdirSync(_ path: String, _ options: MakeDirOptions = .init())
                 throws
@@ -303,7 +330,7 @@ public extension FileSystemModule {
   /**
    * Check whether the path exists.
    *
-   * Use `fs.access()` instead.
+   * Use ``fs/access(_:_:yield:)`` instead.
    */
   @available(*, deprecated, message: "Using `access` is recommended.")
   @inlinable