@jsenv/filesystem 4.12.0 → 4.13.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsenv/filesystem",
-  "version": "4.12.0",
+  "version": "4.13.1",
   "license": "MIT",
   "repository": {
     "type": "git",

package/src/lifecycle/register_directory_lifecycle.js

@@ -339,7 +339,8 @@ export const registerDirectoryLifecycle = (
     }
   };
 
-  readdirSync(new URL(sourceUrl)).forEach((entry) => {
+  const entries = readdirSync(new URL(sourceUrl));
+  for (const entry of entries) {
     const entryUrl = new URL(entry, sourceUrl).href;
     const entryInfo = readEntryInfo(entryUrl);
     if (entryInfo.type !== null && entryInfo.patternValue) {
@@ -347,7 +348,7 @@ export const registerDirectoryLifecycle = (
         notify: notifyExistent,
       });
     }
-  });
+  }
   if (debug) {
     const relativeUrls = Array.from(infoMap.keys());
     if (relativeUrls.length === 0) {
@@ -381,11 +382,11 @@ const shouldCallUpdated = (entryInfo) => {
   if (!stat.atimeMs) {
     return true;
   }
-  if (stat.atimeMs < stat.mtimeMs) {
+  if (stat.atimeMs <= stat.mtimeMs) {
     return true;
   }
-  if (isLinux && stat.mtimeMs <= previousInfo.stat.mtimeMs) {
-    return false;
+  if (stat.mtimeMs !== previousInfo.stat.mtimeMs) {
+    return true;
   }
   return true;
 };

package/src/lifecycle/register_file_lifecycle.js

@@ -8,6 +8,10 @@ import { createWatcher } from "./create_watcher.js";
 import { guardTooFastSecondCall } from "./guard_second_call.js";
 import { trackResources } from "./track_resources.js";
 
+const isMacos = process.platform === "darwin";
+const isLinux = process.platform === "linux";
+const isFreeBSD = process.platform === "freebsd";
+
 export const registerFileLifecycle = (
   source,
   {
@@ -171,16 +175,13 @@ const watchFileMutation = (
   { updated, removed, keepProcessAlive, stat },
 ) => {
   let prevStat = stat;
-  let watcher = createWatcher(urlToFileSystemPath(sourceUrl), {
-    persistent: keepProcessAlive,
-  });
+  let watcher;
 
-  watcher.on("change", () => {
+  const onChange = () => {
     const { type, stat } = readFileInfo(sourceUrl);
 
     if (type === null) {
-      watcher.close();
-      watcher = undefined;
+      stopWatching();
       if (removed) {
         removed();
       }
@@ -188,25 +189,38 @@ const watchFileMutation = (
       if (updated && shouldCallUpdated(stat, prevStat)) {
         updated();
       }
+      if ((isMacos || isLinux || isFreeBSD) && prevStat.ino !== stat.ino) {
+        stopWatching();
+        watch();
+      }
     }
     prevStat = stat;
-  });
+  };
 
-  return () => {
+  const watch = () => {
+    watcher = createWatcher(urlToFileSystemPath(sourceUrl), {
+      persistent: keepProcessAlive,
+    });
+    watcher.on("change", onChange);
+  };
+  const stopWatching = () => {
     if (watcher) {
       watcher.close();
+      watcher = undefined;
     }
   };
+  watch();
+  return stopWatching;
 };
 
 const shouldCallUpdated = (stat, prevStat) => {
   if (!stat.atimeMs) {
     return true;
   }
-  if (stat.atimeMs < stat.mtimeMs) {
+  if (stat.atimeMs <= stat.mtimeMs) {
     return true;
   }
-  if (stat.mtimeMs > prevStat.mtimeMs) {
+  if (stat.mtimeMs !== prevStat.mtimeMs) {
     return true;
   }
   return false;

package/src/read_write/write_directory_sync.js

@@ -43,6 +43,7 @@ export const writeDirectorySync = (
               .slice(0, -1),
           ),
         );
+        destinationStats = null;
       } else {
         throw new Error(
           `cannot write directory at ${destinationPath} because there is a file at ${urlToFileSystemPath(
@@ -62,10 +63,14 @@ export const writeDirectorySync = (
       }
       throw new Error(`directory already exists at ${destinationPath}`);
     }
-    const destinationType = statsToType(destinationStats);
-    throw new Error(
-      `cannot write directory at ${destinationPath} because there is a ${destinationType}`,
-    );
+    if (force) {
+      unlinkSync(destinationPath);
+    } else {
+      const destinationType = statsToType(destinationStats);
+      throw new Error(
+        `cannot write directory at ${destinationPath} because there is a ${destinationType}`,
+      );
+    }
   }
 
   try {