move file stat utils to @fd_util

Author: Guest0x0

src/fs/dir.mbt

@@ -31,8 +31,8 @@ pub async fn rmdir(path : StringView, recursive? : Bool = false) -> Unit {
     let base = path.to_string()
     for file in readdir(base) {
       let child_path = base + "/" + file
-      let stat = Stat::from_path(child_path, follow_symlink=false, context~)
-      if stat.kind() is Directory {
+      let stat = @event_loop.stat(child_path, follow_symlink=false, context~)
+      if FileKind::from_int(stat.kind()) is Directory {
         rmdir(child_path, recursive=true)
       } else {
         @event_loop.remove(child_path, context~)

src/fs/dir_test.mbt

@@ -18,12 +18,7 @@ async test "read_all" {
   defer dir.close()
   let list = dir.read_all()
   list.sort()
-  @json.inspect(list, content=[
-    "fs.mbt", "stub.c", "dir.mbt", "stat.mbt", "README.md", "utils.mbt", "dir_test.mbt",
-    "eof_test.mbt", "README.mbt.md", "moon.pkg.json", "seek_test.mbt", "stat_test.mbt",
-    "walk_test.mbt", "mkdir_test.mbt", "access_test.mbt", "create_test.mbt", "read_all_test.mbt",
-    "realpath_test.mbt", "pkg.generated.mbti", "text_file_test.mbt", "timestamp_test.mbt",
-  ])
+  @json.inspect(list, content=(["fs.mbt","stub.c","dir.mbt","README.md","utils.mbt","dir_test.mbt","eof_test.mbt","README.mbt.md","moon.pkg.json","seek_test.mbt","stat_test.mbt","walk_test.mbt","mkdir_test.mbt","access_test.mbt","create_test.mbt","read_all_test.mbt","realpath_test.mbt","pkg.generated.mbti","text_file_test.mbt","timestamp_test.mbt"]))
 }
 
 ///|
@@ -46,13 +41,5 @@ async test "as_dir" {
     assert_eq(kind, @fs.kind(path))
     kinds.push("\{file}: \{kind}")
   }
-  @json.inspect(kinds, content=[
-    "fs.mbt: Regular", "stub.c: Regular", "dir.mbt: Regular", "stat.mbt: Regular",
-    "README.md: Regular", "utils.mbt: Regular", "dir_test.mbt: Regular", "eof_test.mbt: Regular",
-    "README.mbt.md: Regular", "moon.pkg.json: Regular", "seek_test.mbt: Regular",
-    "stat_test.mbt: Regular", "walk_test.mbt: Regular", "mkdir_test.mbt: Regular",
-    "access_test.mbt: Regular", "create_test.mbt: Regular", "read_all_test.mbt: Regular",
-    "realpath_test.mbt: Regular", "pkg.generated.mbti: Regular", "text_file_test.mbt: Regular",
-    "timestamp_test.mbt: Regular",
-  ])
+  @json.inspect(kinds, content=(["fs.mbt: Regular","stub.c: Regular","dir.mbt: Regular","README.md: Regular","utils.mbt: Regular","dir_test.mbt: Regular","eof_test.mbt: Regular","README.mbt.md: Regular","moon.pkg.json: Regular","seek_test.mbt: Regular","stat_test.mbt: Regular","walk_test.mbt: Regular","mkdir_test.mbt: Regular","access_test.mbt: Regular","create_test.mbt: Regular","read_all_test.mbt: Regular","realpath_test.mbt: Regular","pkg.generated.mbti: Regular","text_file_test.mbt: Regular","timestamp_test.mbt: Regular"]))
 }

src/fs/fs.mbt

@@ -12,6 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+///|
+using @fd_util {type Stat}
+
 ///|
 pub(all) enum FileKind {
   Unknown = 0
@@ -24,6 +27,9 @@ pub(all) enum FileKind {
   CharDevice = 7
 } derive(Eq, Show)
 
+///|
+fn FileKind::from_int(x : Int) -> FileKind = "%identity"
+
 ///|
 #valtype
 struct File {
@@ -115,7 +121,8 @@ pub async fn open(
     mode=user_mode,
     context="@fs.open()",
   )
-  { fd, kind: Stat::from_fd(fd, context="@fs.open()").kind() }
+  let kind = FileKind::from_int(Stat::from_fd(fd, context="@fs.open()").kind())
+  { fd, kind }
 }
 
 ///|

src/fs/moon.pkg.json

@@ -3,6 +3,7 @@
     "moonbitlang/async/os_error",
     "moonbitlang/async/io",
     "moonbitlang/async/internal/event_loop",
+    "moonbitlang/async/internal/fd_util",
     "moonbitlang/async",
     "moonbitlang/async/semaphore"
   ],

src/fs/utils.mbt

@@ -17,7 +17,8 @@
 /// If `path` is a symbolic link and `follow_symlink` is `true` (`true` by default),
 /// the kind of the target of the link will be returned.
 pub async fn kind(path : StringView, follow_symlink? : Bool = true) -> FileKind {
-  Stat::from_path(path, follow_symlink~, context="@fs.kind()").kind()
+  @event_loop.stat(path, follow_symlink~, context="@fs.kind()").kind()
+  |> FileKind::from_int
 }
 
 ///|
@@ -31,7 +32,7 @@ pub async fn atime(
   path : StringView,
   follow_symlink? : Bool = true,
 ) -> (Int64, Int) {
-  Stat::from_path(path, follow_symlink~, context="@fs.atime()").atime()
+  @event_loop.stat(path, follow_symlink~, context="@fs.atime()").atime()
 }
 
 ///|
@@ -45,7 +46,7 @@ pub async fn mtime(
   path : StringView,
   follow_symlink? : Bool = true,
 ) -> (Int64, Int) {
-  Stat::from_path(path, follow_symlink~, context="@fs.mtime()").mtime()
+  @event_loop.stat(path, follow_symlink~, context="@fs.mtime()").mtime()
 }
 
 ///|
@@ -59,7 +60,7 @@ pub async fn ctime(
   path : StringView,
   follow_symlink? : Bool = true,
 ) -> (Int64, Int) {
-  Stat::from_path(path, follow_symlink~, context="@fs.ctime()").ctime()
+  @event_loop.stat(path, follow_symlink~, context="@fs.ctime()").ctime()
 }
 
 ///|

src/internal/event_loop/fs.mbt

@@ -31,25 +31,14 @@ pub async fn open(
   perform_job_in_worker(JobForWorker::open(path, flags, mode), context~)
 }
 
-///|
-struct Stat(FixedArray[Byte])
-
-///|
-extern "C" fn sizeof_stat() -> Int = "moonbitlang_async_sizeof_stat"
-
-///|
-pub fn Stat::new() -> Stat {
-  FixedArray::make(sizeof_stat(), b'\x00')
-}
-
 ///|
 pub async fn stat(
   path : StringView,
   follow_symlink~ : Bool,
   context~ : String,
-) -> Stat {
+) -> @fd_util.Stat {
   let path = @encoding/utf8.encode(path)
-  let stat = Stat::new()
+  let stat = @fd_util.Stat::new()
   let _ = perform_job_in_worker(
     JobForWorker::stat(path, stat, follow_symlink~),
     context~,

src/internal/event_loop/pkg.generated.mbti

@@ -1,6 +1,10 @@
 // Generated using `moon info`, DON'T EDIT IT
 package "moonbitlang/async/internal/event_loop"
 
+import(
+  "moonbitlang/async/internal/fd_util"
+)
+
 // Values
 async fn accept(Int, Bytes, context~ : String) -> Int
 
@@ -38,7 +42,7 @@ async fn sleep(Int) -> Unit
 
 async fn spawn(Bytes, FixedArray[Bytes?], env~ : FixedArray[Bytes?], stdin~ : Int, stdout~ : Int, stderr~ : Int, cwd~ : Bytes?, context~ : String) -> Int
 
-async fn stat(StringView, follow_symlink~ : Bool, context~ : String) -> Stat
+async fn stat(StringView, follow_symlink~ : Bool, context~ : String) -> @fd_util.Stat
 
 async fn wait_pid(Int) -> Unit
 
@@ -58,9 +62,6 @@ pub type Directory
 #external
 pub type DirectoryEntry
 
-type Stat
-fn Stat::new() -> Self
-
 // Type aliases
 
 // Traits

src/internal/event_loop/thread_pool.mbt

@@ -78,7 +78,7 @@ extern "C" fn JobForWorker::open(
 #owned(path, out)
 extern "C" fn JobForWorker::stat(
   path : Bytes,
-  out : Stat,
+  out : @fd_util.Stat,
   follow_symlink~ : Bool,
 ) -> JobForWorker = "moonbitlang_async_make_stat_job"
 

src/internal/fd_util/pkg.generated.mbti

@@ -17,6 +17,13 @@ fn set_nonblocking(Int, context~ : String) -> Unit raise
 // Errors
 
 // Types and methods
+type Stat
+fn Stat::atime(Self) -> (Int64, Int)
+fn Stat::ctime(Self) -> (Int64, Int)
+fn Stat::from_fd(Int, context~ : String) -> Self raise
+fn Stat::kind(Self) -> Int
+fn Stat::mtime(Self) -> (Int64, Int)
+fn Stat::new() -> Self
 
 // Type aliases
 

src/fs/stat.mbt renamed to src/internal/fd_util/stat.mbt

@@ -13,33 +13,32 @@
 // limitations under the License.
 
 ///|
-typealias @event_loop.Stat
+struct Stat(FixedArray[Byte])
+
+///|
+extern "C" fn sizeof_stat() -> Int = "moonbitlang_async_sizeof_stat"
+
+///|
+pub fn Stat::new() -> Stat {
+  FixedArray::make(sizeof_stat(), b'\x00')
+}
 
 ///|
 #borrow(stat)
 extern "C" fn Stat::from_fd_ffi(fd : Int, stat : Stat) -> Int = "fstat"
 
 ///|
-fn Stat::from_fd(fd : Int, context~ : String) -> Stat raise {
+pub fn Stat::from_fd(fd : Int, context~ : String) -> Stat raise {
   let stat = Stat::new()
   if Stat::from_fd_ffi(fd, stat) < 0 {
     @os_error.check_errno(context)
   }
   stat
 }
 
-///|
-async fn Stat::from_path(
-  path : StringView,
-  follow_symlink~ : Bool,
-  context~ : String,
-) -> Stat {
-  @event_loop.stat(path, follow_symlink~, context~)
-}
-
 ///|
 #borrow(stat)
-extern "C" fn Stat::kind(stat : Stat) -> FileKind = "moonbitlang_async_file_kind_from_stat"
+pub extern "C" fn Stat::kind(stat : Stat) -> Int = "moonbitlang_async_file_kind_from_stat"
 
 ///|
 #borrow(stat, sec_out, nsec_out)
@@ -50,7 +49,7 @@ extern "C" fn Stat::atime_ffi(
 ) = "moonbitlang_async_atime_from_stat"
 
 ///|
-fn Stat::atime(stat : Stat) -> (Int64, Int) {
+pub fn Stat::atime(stat : Stat) -> (Int64, Int) {
   let sec = @ref.new(0L)
   let nsec = @ref.new(0)
   stat.atime_ffi(sec, nsec)
@@ -66,7 +65,7 @@ extern "C" fn Stat::mtime_ffi(
 ) = "moonbitlang_async_mtime_from_stat"
 
 ///|
-fn Stat::mtime(stat : Stat) -> (Int64, Int) {
+pub fn Stat::mtime(stat : Stat) -> (Int64, Int) {
   let sec = @ref.new(0L)
   let nsec = @ref.new(0)
   stat.mtime_ffi(sec, nsec)
@@ -82,7 +81,7 @@ extern "C" fn Stat::ctime_ffi(
 ) = "moonbitlang_async_ctime_from_stat"
 
 ///|
-fn Stat::ctime(stat : Stat) -> (Int64, Int) {
+pub fn Stat::ctime(stat : Stat) -> (Int64, Int) {
   let sec = @ref.new(0L)
   let nsec = @ref.new(0)
   stat.ctime_ffi(sec, nsec)