@photostructure/fs-metadata 0.2.0 → 0.3.0

package/src/options.ts

@@ -41,7 +41,7 @@ export interface Options {
    *
    * @see {@link SystemFsTypesDefault} for the default value
    */
-  systemFsTypes: Set<string>;
+  systemFsTypes: string[];
 
   /**
    * On Linux, use the first mount point table in this array that is readable.
@@ -105,7 +105,7 @@ export const SystemPathPatternsDefault = [
 /**
  * Filesystem types that indicate system volumes
  */
-export const SystemFsTypesDefault = new Set([
+export const SystemFsTypesDefault = [
   "autofs",
   "binfmt_misc",
   "cgroup",
@@ -128,16 +128,16 @@ export const SystemFsTypesDefault = new Set([
   "squashfs",
   "sysfs",
   "tmpfs",
-]);
+] as const;
 
 export const LinuxMountTablePathsDefault = [
   "/proc/self/mounts",
   "/proc/mounts",
   "/etc/mtab",
-];
+] as const;
 
 /**
- * Should {@link getAllVolumeMetadata()} include system volumes by
+ * Should {@link getAllVolumeMetadata} include system volumes by
  * default?
  */
 export const IncludeSystemVolumesDefault = isWindows;
@@ -151,8 +151,8 @@ export const OptionsDefault: Options = {
   timeoutMs: TimeoutMsDefault,
   maxConcurrency: availableParallelism(),
   systemPathPatterns: [...SystemPathPatternsDefault],
-  systemFsTypes: new Set(SystemFsTypesDefault),
-  linuxMountTablePaths: LinuxMountTablePathsDefault,
+  systemFsTypes: [...SystemFsTypesDefault],
+  linuxMountTablePaths: [...LinuxMountTablePathsDefault],
   includeSystemVolumes: IncludeSystemVolumesDefault,
 } as const;
 

package/src/system_volume.ts

@@ -31,7 +31,6 @@ export function isSystemVolume(
   fstype: string | undefined,
   config: Partial<SystemVolumeConfig> = {},
 ): boolean {
-  debug("[isSystemVolume] checking %s (fstype: %s)", mountPoint, fstype);
   if (isWindows) {
     const systemDrive = normalizePath(process.env["SystemDrive"]);
     if (systemDrive != null && mountPoint === systemDrive) {
@@ -39,13 +38,22 @@ export function isSystemVolume(
       return true;
     }
   }
-  const result =
-    (isNotBlank(fstype) &&
-      (config.systemFsTypes ?? SystemFsTypesDefault).has(fstype)) ||
-    compileGlob(config.systemPathPatterns ?? SystemPathPatternsDefault).test(
-      mountPoint,
+  const isSystemFsType =
+    isNotBlank(fstype) &&
+    ((config.systemFsTypes ?? SystemFsTypesDefault) as string[]).includes(
+      fstype,
     );
-  debug("[isSystemVolume] %s -> %s", mountPoint, result);
+  const hasSystemPath = compileGlob(
+    config.systemPathPatterns ?? SystemPathPatternsDefault,
+  ).test(mountPoint);
+  const result = isSystemFsType || hasSystemPath;
+  debug("[isSystemVolume]", {
+    mountPoint,
+    fstype,
+    result,
+    isSystemFsType,
+    hasSystemPath,
+  });
   return result;
 }