Revert "fix(ext/node): fs.stat and fs.statSync compatibility (#30… (#30741)

…637)"

This reverts commit 432761a.

The tests are causing flakes on Windows

Author: bartlomieju

cli/rt/file_system.rs

@@ -1443,13 +1443,13 @@ impl FileBackedVfsMetadata {
       blksize: 0,
       size: self.len,
       dev: 0,
-      ino: None,
+      ino: 0,
       mode: 0,
-      nlink: None,
+      nlink: 0,
       uid: 0,
       gid: 0,
       rdev: 0,
-      blocks: None,
+      blocks: 0,
       is_block_device: false,
       is_char_device: false,
       is_fifo: false,

cli/tsc/dts/lib.deno.ns.d.ts

@@ -3054,15 +3054,17 @@ declare namespace Deno {
     ctime: Date | null;
     /** ID of the device containing the file. */
     dev: number;
-    /** Corresponds to the inode number on Unix systems. On Windows, this is
-     * the file index number that is unique within a volume. This may not be
-     * available on all platforms. */
+    /** Inode number.
+     *
+     * _Linux/Mac OS only._ */
     ino: number | null;
     /** The underlying raw `st_mode` bits that contain the standard Unix
      * permissions for this file/directory.
      */
     mode: number | null;
-    /** Number of hard links pointing to this file. */
+    /** Number of hard links pointing to this file.
+     *
+     * _Linux/Mac OS only._ */
     nlink: number | null;
     /** User ID of the owner of this file.
      *
@@ -3080,7 +3082,9 @@ declare namespace Deno {
      *
      * _Linux/Mac OS only._ */
     blksize: number | null;
-    /** Number of blocks allocated to the file, in 512-byte units. */
+    /** Number of blocks allocated to the file, in 512-byte units.
+     *
+     * _Linux/Mac OS only._ */
     blocks: number | null;
     /**  True if this is info for a block device.
      *

ext/fs/30_fs.js

@@ -277,7 +277,7 @@ async function rename(oldpath, newpath) {
 // Extract the FsStat object from the encoded buffer.
 // See `runtime/ops/fs.rs` for the encoder.
 //
-// This is not a general purpose decoder. There are 5 types:
+// This is not a general purpose decoder. There are 4 types:
 //
 // 1. date
 //  offset += 4
@@ -294,14 +294,6 @@ async function rename(oldpath, newpath) {
 //
 // 4. ?u64 converts a zero u64 value to JS null on Windows.
 //    ?bool converts a false bool value to JS null on Windows.
-//
-// 5. !u64 persists the u64 value even if it's zero,
-//    only if the corresponding "_set" field is set to true.
-//    Unlike ?u64, this is OS agnostic.
-//    offset += 4
-//    1/0 | extra padding | high u32 | low u32
-//    if value[0] == 1, u64 else null
-//
 function createByteStruct(types) {
   // types can be "date", "bool" or "u64".
   let offset = 0;
@@ -311,32 +303,26 @@ function createByteStruct(types) {
   for (let i = 0; i < typeEntries.length; ++i) {
     let { 0: name, 1: type } = typeEntries[i];
 
-    const optionalLoose = StringPrototypeStartsWith(type, "?");
-    const optionalStrict = StringPrototypeStartsWith(type, "!");
-    if (optionalLoose || optionalStrict) type = StringPrototypeSlice(type, 1);
+    const optional = StringPrototypeStartsWith(type, "?");
+    if (optional) type = StringPrototypeSlice(type, 1);
 
     if (type == "u64") {
-      if (!optionalLoose && !optionalStrict) {
+      if (!optional) {
         str += `${name}: view[${offset}] + view[${offset + 1}] * 2**32,`;
-      } else if (optionalLoose) {
+      } else {
         str += `${name}: (unix ? (view[${offset}] + view[${
           offset + 1
         }] * 2**32) : (view[${offset}] + view[${
           offset + 1
         }] * 2**32) || null),`;
-      } else {
-        str += `${name}: (view[${offset}] === 1 ? (view[${offset + 2}] + view[${
-          offset + 3
-        }] * 2**32) : null),`;
-        offset += 2;
       }
     } else if (type == "date") {
       str += `${name}: view[${offset}] === 0 ? null : new Date(view[${
         offset + 2
       }] + view[${offset + 3}] * 2**32),`;
       offset += 2;
     } else {
-      if (!optionalLoose) {
+      if (!optional) {
         str += `${name}: !!(view[${offset}] + view[${offset + 1}] * 2**32),`;
       } else {
         str += `${name}: (unix ? !!((view[${offset}] + view[${
@@ -363,14 +349,14 @@ const { 0: statStruct, 1: statBuf } = createByteStruct({
   birthtime: "date",
   ctime: "date",
   dev: "u64",
-  ino: "!u64",
+  ino: "?u64",
   mode: "u64",
-  nlink: "!u64",
+  nlink: "?u64",
   uid: "?u64",
   gid: "?u64",
   rdev: "?u64",
   blksize: "?u64",
-  blocks: "!u64",
+  blocks: "?u64",
   isBlockDevice: "?bool",
   isCharDevice: "?bool",
   isFifo: "?bool",
@@ -396,13 +382,13 @@ function parseFileInfo(response) {
     ctime: response.ctimeSet === true ? new Date(Number(response.ctime)) : null,
     dev: response.dev,
     mode: response.mode,
-    ino: response.inoSet ? response.ino : null,
-    nlink: response.nlinkSet ? response.nlink : null,
+    ino: unix ? response.ino : null,
+    nlink: unix ? response.nlink : null,
     uid: unix ? response.uid : null,
     gid: unix ? response.gid : null,
     rdev: unix ? response.rdev : null,
     blksize: unix ? response.blksize : null,
-    blocks: response.blocksSet ? response.blocks : null,
+    blocks: unix ? response.blocks : null,
     isBlockDevice: unix ? response.isBlockDevice : null,
     isCharDevice: unix ? response.isCharDevice : null,
     isFifo: unix ? response.isFifo : null,

ext/fs/ops.rs

@@ -2059,21 +2059,15 @@ create_struct_writer! {
     birthtime: u64,
     ctime_set: bool,
     ctime: u64,
-    // Stats below are platform dependent.
-    // On Unix, they are always available.
-    // On Windows, the `*_set` fields are used
-    // to indicate if the corresponding field is resolved.
+    // Following are only valid under Unix.
     dev: u64,
-    ino_set: bool,
     ino: u64,
     mode: u32,
-    nlink_set: bool,
     nlink: u64,
     uid: u32,
     gid: u32,
     rdev: u64,
     blksize: u64,
-    blocks_set: bool,
     blocks: u64,
     is_block_device: bool,
     is_char_device: bool,
@@ -2100,17 +2094,14 @@ impl From<FsStat> for SerializableStat {
       ctime: stat.ctime.unwrap_or(0),
 
       dev: stat.dev,
-      ino_set: stat.ino.is_some(),
-      ino: stat.ino.unwrap_or(0),
+      ino: stat.ino,
       mode: stat.mode,
-      nlink_set: stat.nlink.is_some(),
-      nlink: stat.nlink.unwrap_or(0),
+      nlink: stat.nlink,
       uid: stat.uid,
       gid: stat.gid,
       rdev: stat.rdev,
       blksize: stat.blksize,
-      blocks_set: stat.blocks.is_some(),
-      blocks: stat.blocks.unwrap_or(0),
+      blocks: stat.blocks,
       is_block_device: stat.is_block_device,
       is_char_device: stat.is_char_device,
       is_fifo: stat.is_fifo,

ext/fs/std_fs.rs

@@ -1005,12 +1005,6 @@ fn stat_extra(file: &std::fs::File, fsstat: &mut FsStat) -> FsResult<()> {
           | ((libc::S_IREAD | libc::S_IWRITE) >> 6))
           as u32;
       }
-
-      /* The on-disk allocation size in 512-byte units. */
-      fsstat.blocks =
-        Some(file_info.StandardInformation.AllocationSize as u64 >> 9);
-      fsstat.ino = Some(file_info.InternalInformation.IndexNumber as u64);
-      fsstat.nlink = Some(file_info.StandardInformation.NumberOfLinks as u64);
     }
 
     Ok(())

ext/io/fs.rs

@@ -110,14 +110,14 @@ pub struct FsStat {
   pub ctime: Option<u64>,
 
   pub dev: u64,
-  pub ino: Option<u64>,
+  pub ino: u64,
   pub mode: u32,
-  pub nlink: Option<u64>,
+  pub nlink: u64,
   pub uid: u32,
   pub gid: u32,
   pub rdev: u64,
   pub blksize: u64,
-  pub blocks: Option<u64>,
+  pub blocks: u64,
   pub is_block_device: bool,
   pub is_char_device: bool,
   pub is_fifo: bool,
@@ -126,20 +126,6 @@ pub struct FsStat {
 
 impl FsStat {
   pub fn from_std(metadata: std::fs::Metadata) -> Self {
-    macro_rules! unix_some_or_none {
-      ($member:ident) => {{
-        #[cfg(unix)]
-        {
-          use std::os::unix::fs::MetadataExt;
-          Some(metadata.$member())
-        }
-        #[cfg(not(unix))]
-        {
-          None
-        }
-      }};
-    }
-
     macro_rules! unix_or_zero {
       ($member:ident) => {{
         #[cfg(unix)]
@@ -203,14 +189,14 @@ impl FsStat {
       ctime: get_ctime(unix_or_zero!(ctime)),
 
       dev: unix_or_zero!(dev),
-      ino: unix_some_or_none!(ino),
+      ino: unix_or_zero!(ino),
       mode: unix_or_zero!(mode),
-      nlink: unix_some_or_none!(nlink),
+      nlink: unix_or_zero!(nlink),
       uid: unix_or_zero!(uid),
       gid: unix_or_zero!(gid),
       rdev: unix_or_zero!(rdev),
       blksize: unix_or_zero!(blksize),
-      blocks: unix_some_or_none!(blocks),
+      blocks: unix_or_zero!(blocks),
       is_block_device: unix_or_false!(is_block_device),
       is_char_device: unix_or_false!(is_char_device),
       is_fifo: unix_or_false!(is_fifo),