@jsenv/filesystem 4.13.5 → 4.14.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsenv/filesystem",
-  "version": "4.13.5",
+  "version": "4.14.0",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -29,9 +29,9 @@
     "/src/"
   ],
   "dependencies": {
-    "@jsenv/urls": "2.6.0",
-    "@jsenv/url-meta": "8.5.3",
-    "@jsenv/abort": "4.3.0",
-    "@jsenv/utils": "2.1.3"
+    "@jsenv/urls": "2.6.1",
+    "@jsenv/url-meta": "8.5.4",
+    "@jsenv/abort": "4.3.1",
+    "@jsenv/utils": "2.2.0"
   }
 }

package/src/lifecycle/register_directory_lifecycle.js

@@ -249,50 +249,18 @@ export const registerDirectoryLifecycle = (
     handleEntryUpdated(entryInfo);
   };
   const handleEntryFound = (entryInfo, { notify = true } = {}) => {
-    infoMap.set(entryInfo.relativeUrl, entryInfo);
-    if (entryInfo.type === "directory") {
-      const directoryUrl = `${entryInfo.url}/`;
-      let entryNameArray;
-      try {
-        const directoryUrlObject = new URL(directoryUrl);
-        entryNameArray = readdirSync(directoryUrlObject);
-      } catch (e) {
-        if (
-          e.code === "ENOENT" ||
-          e.code === "EACCES" ||
-          e.code === "EPERM" ||
-          e.code === "ENOTDIR"
-        ) {
-          return;
-        }
-        throw e;
-      }
-      for (const entryName of entryNameArray) {
-        const childEntryUrl = new URL(entryName, directoryUrl).href;
-        const childEntryInfo = readEntryInfo(childEntryUrl);
-        if (childEntryInfo.type !== null && childEntryInfo.patternValue) {
-          handleEntryFound(childEntryInfo, { notify });
-        }
-      }
-      // we must watch manually every directory we find
-      if (!fsWatchSupportsRecursive) {
+    const seenSet = new Set();
+    const applyEntryDiscoveredEffects = (entryInfo) => {
+      seenSet.add(entryInfo.url);
+      infoMap.set(entryInfo.relativeUrl, entryInfo);
+      if (entryInfo.type === "directory") {
+        const directoryUrl = entryInfo.url.endsWith("/")
+          ? entryInfo.url
+          : `${entryInfo.url}/`;
+        let entryNameArray;
         try {
-          const watcher = createWatcher(urlToFileSystemPath(entryInfo.url), {
-            persistent: keepProcessAlive,
-          });
-          tracker.registerCleanupCallback(() => {
-            watcher.close();
-          });
-          watcher.on("change", (eventType, filename) => {
-            handleDirectoryEvent({
-              directoryRelativeUrl: entryInfo.relativeUrl,
-              filename: filename
-                ? // replace back slashes with slashes
-                  filename.replace(/\\/g, "/")
-                : "",
-              eventType,
-            });
-          });
+          const directoryUrlObject = new URL(directoryUrl);
+          entryNameArray = readdirSync(directoryUrlObject);
         } catch (e) {
           if (
             e.code === "ENOENT" ||
@@ -304,16 +272,59 @@ export const registerDirectoryLifecycle = (
           }
           throw e;
         }
+        for (const entryName of entryNameArray) {
+          const childEntryUrl = new URL(entryName, directoryUrl).href;
+          if (seenSet.has(childEntryUrl)) {
+            continue;
+          }
+          const childEntryInfo = readEntryInfo(childEntryUrl);
+          if (childEntryInfo.type !== null && childEntryInfo.patternValue) {
+            applyEntryDiscoveredEffects(childEntryInfo);
+          }
+        }
+        // we must watch manually every directory we find
+        if (!fsWatchSupportsRecursive) {
+          try {
+            const watcher = createWatcher(urlToFileSystemPath(entryInfo.url), {
+              persistent: keepProcessAlive,
+            });
+            tracker.registerCleanupCallback(() => {
+              watcher.close();
+            });
+            watcher.on("change", (eventType, filename) => {
+              handleDirectoryEvent({
+                directoryRelativeUrl: entryInfo.relativeUrl,
+                filename: filename
+                  ? // replace back slashes with slashes
+                    filename.replace(/\\/g, "/")
+                  : "",
+                eventType,
+              });
+            });
+          } catch (e) {
+            if (
+              e.code === "ENOENT" ||
+              e.code === "EACCES" ||
+              e.code === "EPERM" ||
+              e.code === "ENOTDIR"
+            ) {
+              return;
+            }
+            throw e;
+          }
+        }
       }
-    }
-    if (added && entryInfo.patternValue && notify) {
-      added({
-        relativeUrl: entryInfo.relativeUrl,
-        type: entryInfo.type,
-        patternValue: entryInfo.patternValue,
-        mtime: entryInfo.stat.mtimeMs,
-      });
-    }
+      if (added && entryInfo.patternValue && notify) {
+        added({
+          relativeUrl: entryInfo.relativeUrl,
+          type: entryInfo.type,
+          patternValue: entryInfo.patternValue,
+          mtime: entryInfo.stat.mtimeMs,
+        });
+      }
+    };
+    applyEntryDiscoveredEffects(entryInfo);
+    seenSet.clear();
   };
   const handleEntryLost = (entryInfo) => {
     infoMap.delete(entryInfo.relativeUrl);
@@ -339,16 +350,9 @@ export const registerDirectoryLifecycle = (
     }
   };
 
-  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) {
-      handleEntryFound(entryInfo, {
-        notify: notifyExistent,
-      });
-    }
-  }
+  handleEntryFound(readEntryInfo(sourceUrl), {
+    notify: notifyExistent,
+  });
   if (debug) {
     const relativeUrls = Array.from(infoMap.keys());
     if (relativeUrls.length === 0) {

package/src/main.js

@@ -19,6 +19,10 @@ export { comparePathnames } from "./path_and_url/compare_pathnames.js";
 export { ensureWindowsDriveLetter } from "./path_and_url/ensure_windows_drive_letter.js";
 export { getParentDirectoryUrl } from "./path_and_url/get_parent_directory_url.js";
 export { findAncestorDirectoryUrl } from "./path_and_url/find_ancestor_directory_url.js";
+// All other exports are agnostic and focused on the filesystem only
+// "lookupPackageDirectory" is an exception because it related to node module resolution
+// but it's very useful and it's not a problem to have it here (and useful to share this logic)
+export { lookupPackageDirectory } from "./path_and_url/lookup_package_directory.js";
 
 // list
 export { collectDirectoryMatchReport } from "./list/collect_directory_match_report.js";

package/src/path_and_url/lookup_package_directory.js

@@ -0,0 +1,9 @@
+import { existsSync } from "node:fs";
+import { findAncestorDirectoryUrl } from "./find_ancestor_directory_url.js";
+
+export const lookupPackageDirectory = (currentUrl) => {
+  return findAncestorDirectoryUrl(currentUrl, (ancestorDirectoryUrl) => {
+    const potentialPackageJsonFileUrl = `${ancestorDirectoryUrl}package.json`;
+    return existsSync(new URL(potentialPackageJsonFileUrl));
+  });
+};

package/src/read_write/read_symbolic_link_sync.js

@@ -5,7 +5,6 @@
 
 import { fileSystemPathToUrl, isFileSystemPath } from "@jsenv/urls";
 import { readlinkSync } from "node:fs";
-
 import { assertAndNormalizeFileUrl } from "../path_and_url/file_url_validation.js";
 
 export const readSymbolicLinkSync = (url) => {