@jsenv/filesystem 4.14.1 → 4.14.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsenv/filesystem",
-  "version": "4.14.1",
+  "version": "4.14.2",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -30,7 +30,7 @@
   ],
   "sideEffects": false,
   "dependencies": {
-    "@jsenv/urls": "2.6.2",
+    "@jsenv/urls": "2.6.3",
     "@jsenv/url-meta": "8.5.4",
     "@jsenv/abort": "4.3.1",
     "@jsenv/utils": "2.2.1"

package/src/main.js

@@ -22,7 +22,10 @@ export { findAncestorDirectoryUrl } from "./path_and_url/find_ancestor_directory
 // 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";
+export {
+  lookupPackageDirectory,
+  readPackageAtOrNull,
+} 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

@@ -1,4 +1,4 @@
-import { existsSync } from "node:fs";
+import { existsSync, readFileSync } from "node:fs";
 import { findAncestorDirectoryUrl } from "./find_ancestor_directory_url.js";
 
 export const lookupPackageDirectory = (currentUrl) => {
@@ -7,3 +7,16 @@ export const lookupPackageDirectory = (currentUrl) => {
     return existsSync(new URL(potentialPackageJsonFileUrl));
   });
 };
+
+export const readPackageAtOrNull = (packageDirectoryUrl) => {
+  try {
+    const packageFileContent = readFileSync(
+      new URL("./package.json", packageDirectoryUrl),
+      "utf8",
+    );
+    const packageJSON = JSON.parse(packageFileContent);
+    return packageJSON;
+  } catch {
+    return null;
+  }
+};

package/src/remove/clear_directory_sync.js

@@ -3,26 +3,59 @@ import { readdirSync } from "node:fs";
 import { readEntryStatSync } from "../read_write/stat/read_entry_stat_sync.js";
 import { removeEntrySync } from "./remove_entry_sync.js";
 
-export const clearDirectorySync = (initialDirectoryUrl, pattern = "**/*") => {
+export const clearDirectorySync = (
+  initialDirectoryUrl,
+  secondArg,
+  thirdArg,
+) => {
+  let removePatterns = {};
+  if (secondArg && typeof secondArg === "object") {
+    removePatterns = secondArg;
+  } else {
+    removePatterns = {};
+    let clearPatterns = secondArg || "**/*";
+    let keepPatterns = thirdArg || [];
+
+    if (typeof keepPatterns === "string") {
+      keepPatterns = [keepPatterns];
+    }
+    if (Array.isArray(keepPatterns)) {
+      for (const keepPattern of keepPatterns) {
+        Object.assign(removePatterns, {
+          [keepPattern]: false,
+        });
+      }
+    }
+    if (typeof clearPatterns === "string") {
+      clearPatterns = [clearPatterns];
+    }
+    if (Array.isArray(clearPatterns)) {
+      let someClearPatternHandleNodeModules = false;
+      for (const clearPattern of clearPatterns) {
+        Object.assign(removePatterns, {
+          [clearPatterns]: true,
+        });
+        if (
+          !someClearPatternHandleNodeModules &&
+          clearPattern.includes("node_modules")
+        ) {
+          someClearPatternHandleNodeModules = true;
+        }
+      }
+      Object.assign(removePatterns, {
+        "**/.*": false,
+        "**/.*/": false,
+      });
+      if (!someClearPatternHandleNodeModules) {
+        Object.assign(removePatterns, {
+          "**/node_modules/": false,
+        });
+      }
+    }
+  }
+
   const associations = URL_META.resolveAssociations(
-    {
-      clear:
-        typeof pattern === "string"
-          ? {
-              [pattern]: true,
-              "**/.*": false,
-              "**/.*/": false,
-              ...(pattern.includes("node_modules")
-                ? {}
-                : { "**/node_modules/": false }),
-            }
-          : {
-              "**/.*": false,
-              "**/.*/": false,
-              "**/node_modules/": false,
-              ...pattern,
-            },
-    },
+    { remove: removePatterns },
     initialDirectoryUrl,
   );
   const visitDirectory = (directoryUrl) => {
@@ -54,7 +87,7 @@ export const clearDirectorySync = (initialDirectoryUrl, pattern = "**/*") => {
           url: subDirectoryUrl,
           associations,
         });
-        if (meta.clear) {
+        if (meta.remove) {
           removeEntrySync(subDirectoryUrl, {
             recursive: true,
             allowUseless: true,
@@ -65,19 +98,20 @@ export const clearDirectorySync = (initialDirectoryUrl, pattern = "**/*") => {
           !URL_META.urlChildMayMatch({
             url: subDirectoryUrl,
             associations,
-            predicate: ({ clear }) => clear,
+            predicate: ({ remove }) => remove,
           })
         ) {
           continue;
         }
         visitDirectory(subDirectoryUrl);
+        continue;
       }
 
       const meta = URL_META.applyAssociations({
         url: entryUrl,
         associations,
       });
-      if (meta.clear) {
+      if (meta.remove) {
         removeEntrySync(entryUrl, { allowUseless: true });
         continue;
       }